# HG changeset patch
# User Ariane Broermann <ariane@intevation.de>
# Date 1396527206 -7200
# Node ID c1c0f073b4e28f1602215264cbcb6370611ef0c6
# Parent  1387a5add21d0cd15c1a3379482367e15d286c43# Parent  e919bf9fc2c52499f622c96b38b30d561a1080db
Merged.

diff -r e919bf9fc2c5 -r c1c0f073b4e2 css/style.css
--- a/css/style.css	Thu Apr 03 13:34:51 2014 +0200
+++ b/css/style.css	Thu Apr 03 14:13:26 2014 +0200
@@ -74,9 +74,8 @@
     overflow: hidden;
 }
 
-.carousel-img {
-    width: 755px;
-    height: 525px;
+.carousel .item img {
+    margin: 0 auto;
 }
 
 .carousel-indicators {
diff -r e919bf9fc2c5 -r c1c0f073b4e2 ocean_carousel.html
--- a/ocean_carousel.html	Thu Apr 03 13:34:51 2014 +0200
+++ b/ocean_carousel.html	Thu Apr 03 14:13:26 2014 +0200
@@ -2,21 +2,35 @@
       <ol class="carousel-indicators">
         <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
         <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
       </ol>
       <!-- Carousel items -->
       <div class="carousel-inner">
         <div class="item active">
-          <img src="img/gnv_profil.png" alt="Profilschnitt" class="img-responsive">
+          <img src="img/gnv_profil_1.png" alt="Profilschnitt" class="img-responsive">
           <div class="carousel-caption">
             <p>Profilschnitt: klassifizierte Temperaturverteilung über die Tiefe in der Ostsee.</p>
           </div>
         </div>
         <div class="item">
-          <img src="img/gnv_karte.png" alt="Horizontalschnitt" class="img-responsive">
+          <img src="img/gnv_karte_1.png" alt="Horizontalschnitt" class="img-responsive">
           <div class="carousel-caption">
             <p>Karte: Horizontalschnitt der Temperaturverteilung in Nord- und Ostsee</p>
           </div>
         </div>
+        <div class="item">
+          <img src="img/gnv_marnet_1.png" alt="Marnet" class="img-responsive">
+          <div class="carousel-caption">
+            <p>TODO: Bildtitel eintragen!</p>
+          </div>
+        </div>
+        <div class="item">
+          <img src="img/gnv_modelldaten_1.png" alt="Modelldaten" class="img-responsive">
+          <div class="carousel-caption">
+            <p>TODO: Bildtitel eintragen!</p>
+          </div>
+        </div>
       </div>
       <!-- Carousel nav -->
       <a class="left carousel-control" data-slide="prev" href="#myCarousel"><span class="glyphicon glyphicon-chevron-left"></span></a>