Mercurial > dive4elements > website
changeset 24:98f602d1061b
Insert glyphicons in navigation bar.
Uncomment carousel captions.
| author | Ariane Broermann <ariane@intevation.de> |
|---|---|
| date | Wed, 26 Feb 2014 09:02:01 +0100 |
| parents | 3e4affecf43f |
| children | 509f9d13faf5 |
| files | contact.html index.html |
| diffstat | 2 files changed, 27 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/contact.html Mon Feb 17 10:34:45 2014 +0100 +++ b/contact.html Wed Feb 26 09:02:01 2014 +0100 @@ -38,10 +38,14 @@ </div> <div class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> - <li><a href="#">Demoanwendung</a></li> - <li><a href="http://wald.intevation.org/scm/?group_id=57">SCM-Repository</a></li> - <li><a href="http://lists.wald.intevation.org/mailman/listinfo/dive4elements-commits">Mailinglist</a></li> - <li class="active"><a href="contact.html">Kontakt</a></li> + <li><a href="#"><span class="glyphicon + glyphicon-cog"> Demoanwendung</a></li> + <li><a href="http://wald.intevation.org/scm/?group_id=57"><span class="glyphicon + glyphicon-folder-open"> SCM-Repository</a></li> + <li><a href="http://lists.wald.intevation.org/mailman/listinfo/dive4elements-commits"><span class="glyphicon + glyphicon-pencil"> Mailinglist</a></li> + <li class="active"><a href="contact.html"><span class="glyphicon + glyphicon-envelope"> Kontakt</a></li> </ul> </div> </div><!-- /navbar -->
--- a/index.html Mon Feb 17 10:34:45 2014 +0100 +++ b/index.html Wed Feb 26 09:02:01 2014 +0100 @@ -35,10 +35,14 @@ </div> <div class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> - <li><a href="#">Demoanwendung</a></li> - <li><a href="http://wald.intevation.org/scm/?group_id=57">SCM-Repository</a></li> - <li><a href="http://lists.wald.intevation.org/mailman/listinfo/dive4elements-commits">Mailinglist</a></li> - <li><a href="contact.html">Kontakt</a></li> + <li><a href="#"><span class="glyphicon + glyphicon-cog"> Demoanwendung</a></li> + <li><a href="http://wald.intevation.org/scm/?group_id=57"><span class="glyphicon + glyphicon-folder-open"> SCM-Repository</a></li> + <li><a href="http://lists.wald.intevation.org/mailman/listinfo/dive4elements-commits"><span class="glyphicon + glyphicon-pencil"> Mailinglist</a></li> + <li><a href="contact.html"><span class="glyphicon + glyphicon-envelope"> Kontakt</a></li> </ul> </div> </div><!-- /navbar --> @@ -74,33 +78,33 @@ <div class="carousel-inner"> <div class="item active"> <img src="img/einstieg.png" alt="Einstiegsseite" class="img-responsive"> - <div class="carousel-caption"> + <!--div class="carousel-caption"> <p>Einstiegsseite der Anwendung.</p> - </div> + </div--> </div> <div class="item"> <img src="img/w-info_lang.png" alt="w-info" class="img-responsive"> - <div class="carousel-caption"> + <!--div class="carousel-caption"> <p>Das Modul W-Info mit Wasserspiegellage bei HQ100 der Elbe, einem Wasserstand von HQ500 und dem Talweg(2004).</p> - </div> + </div--> </div> <div class="item"> <img src="img/m-info_fliess.png" alt="m-info" class="img-responsive"> - <div class="carousel-caption"> + <!--div class="carousel-caption"> <p>Das Modul M-Info mit der Fließgeschwindigkeit der Elbe bei HQ100 als Gesamtrinne.</p> - </div> + </div--> </div> <div class="item"> <img src="img/karte.png" alt="karte" class="img-responsive"> - <div class="carousel-caption"> + <!--div class="carousel-caption"> <p>Die Flußachse der Elbe mit aktuellen Querprofilspuren und der neuen OSM Hintergrundkarte.</p> - </div> + </div--> </div> </div> <!-- Carousel nav --> - <a class="left carousel-control" data-slide="prev" href="#myCarousel"><span class="prev"></span></a> - <a class="right carousel-control" data-slide="next" href="#myCarousel"><span class="next"></span></a> + <a class="left carousel-control" data-slide="prev" href="#myCarousel"><span class="glyphicon glyphicon-chevron-left"></span></a> + <a class="right carousel-control" data-slide="next" href="#myCarousel"><span class="glyphicon glyphicon-chevron-right"></span></a> </div><!-- /myCarousel --> </div><!-- /jumbobutton--> @@ -176,7 +180,7 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> - <script src="https://code.jquery.com/jquery.js"></script> + <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> <!-- Include all compiled plugins (below), or include individual files as needed --> <script src="bootstrap-3.1.0/dist/js/bootstrap.min.js"></script> <script src="js/dive4elements.js"></script>