1
0
Fork 0
mirror of https://github.com/Findus23/Maturaball.git synced 2024-08-27 19:52:14 +02:00

News hinzugefügt

This commit is contained in:
Lukas Winkler 2014-06-18 20:54:32 +02:00
parent 769f5c9014
commit 4f1db8668c
7 changed files with 48 additions and 6 deletions

View file

@ -6,7 +6,7 @@ ErrorDocument 500 /maturaball/500.html
# Enable expirations
ExpiresActive On
# Default directive
ExpiresDefault "access plus 1 month"
ExpiresDefault "access plus 1 hour"
# My favicon
ExpiresByType image/x-icon "access plus 1 year"
# Images
@ -15,8 +15,8 @@ ExpiresByType image/png "access plus 1 week"
ExpiresByType image/jpg "access plus 1 week"
ExpiresByType image/jpeg "access plus 1 week"
# CSS
ExpiresByType text/css "access plus 1 week"
ExpiresByType text/css "access plus 1 day"
# Javascript
ExpiresByType application/javascript "access plus 1 week"
ExpiresByType application/javascript "access plus 1 day"
</IfModule>

BIN
images/druck/Flyer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

BIN
images/druck/Plakat.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

View file

@ -161,8 +161,8 @@
<nav id="my-sticky" class="ink-navigation ink-sticky bottom-space" data-offset-top="20" data-activate-In-Layouts="large,xlarge" data-change-hash="false">
<ul class="menu vertical black">
<li class="heading"><a href="#top" class="ink-smooth-scroll">News</a></li>
<li><a href="#n1" class="ink-smooth-scroll">Ü1</a></li>
<li><a href="#n2" class="ink-smooth-scroll">Ü2</a></li>
<li><a href="#druck" class="ink-smooth-scroll">Druck</a></li>
<li><a href="#foto" class="ink-smooth-scroll">Fotos</a></li>
<li><a href="#n3" class="ink-smooth-scroll">Ü3</a></li>
<li><a href="#n4" class="ink-smooth-scroll">Ü4</a></li>
</ul>
@ -171,7 +171,43 @@
<div id="main" class="all-80 tiny-100 small-100 medium-100 order-1 xlarge-order-2 large-order-2">
<h1>News</h1>
<!-- Für jede Neuigkeit eine eigene h2-Überschrift mit Anker. In der Seitenleiste eine Navigation mit allen Neuigkeiten, die beim Scrollen mitscrollt. -->
<h2 id="n1">Ü1</h2><br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test
<h2 id="druck">Druck</h2>
<p>Plakat und Flyer sind schon fertig und wurden heute in Druck geschickt.</p>
<a href="images/druck/Flyer.png" target="_blank"><img src="images/druck/Flyer_thumb.jpg" alt="Flyer" /></a>
<a href="images/druck/Plakat.png" target="_blank"><img src="images/druck/Plakat_thumb.jpg" alt="Flyer" /></a>
<h2 id="foto">Fotos</h2>
<div id="my-carousel-2" class="ink-carousel" data-pagination="#navigation1" data-center="true">
<ul class="stage column-group">
<li class="slide all-100">
<img src="http://lorempixel.com/1200/600">
</li>
<li class="slide all-100">
<img src="http://lorempixel.com/500/600">
</li>
<li class="slide all-100">
<img src="http://lorempixel.com/1200/600">
</li>
<li class="slide all-100">
<img src="http://lorempixel.com/1200/600">
</li>
<li class="slide all-100">
<img src="http://lorempixel.com/1200/600">
</li>
<li class="slide all-100">
<img src="http://lorempixel.com/1200/600">
</li>
</ul>
</div>
<nav id="navigation1" class="ink-navigation half-bottom-space">
<ul class="pagination black dotted">
</ul>
</nav>
<h2 id="n2">Ü2</h2><br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test
<h2 id="n3">Ü3</h2><br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test
<h2 id="n4">Ü4</h2><br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test<br>test

View file

@ -21,6 +21,9 @@ html {
float: left;
margin: 10px;
}
#hauptsponsoren img {
max-width: 250px;;
}
h2 {
clear: both;
}
@ -37,3 +40,6 @@ input:invalid {
#navigation nav ul li a:hover {
background-color: darkgray!important;
}
img {
margin: 20px;
}