started changes to migrate to Bootstrap 3 (work in progress)

This commit is contained in:
Mic 2013-11-24 06:46:02 +05:30
parent 34d8ca46ac
commit c193916ea4
3 changed files with 26 additions and 18 deletions

View file

@ -59,7 +59,7 @@
<!-- Web dependencies -->
<webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
<webjars-bootstrap.version>3.0.1</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
<webjars-jquery.version>2.0.3-1</webjars-jquery.version>
<dandelion.datatables.version>0.9.2</dandelion.datatables.version>

View file

@ -4,21 +4,29 @@
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}"/>
<div class="navbar" style="width: 601px;">
<div class="navbar-inner">
<ul class="nav">
<li style="width: 100px;"><a href="<spring:url value="/" htmlEscape="true" />"><i class="icon-home"></i>
Home</a></li>
<li style="width: 130px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
class="icon-search"></i> Find owners</a></li>
<li style="width: 140px;"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i
class="icon-th-list"></i> Veterinarians</a></li>
<li style="width: 90px;"><a href="<spring:url value="/oups.html" htmlEscape="true" />"
title="trigger a RuntimeException to see how it is handled"><i
class="icon-warning-sign"></i> Error</a></li>
<li style="width: 80px;"><a href="#" title="not available yet. Work in progress!!"><i
class=" icon-question-sign"></i> Help</a></li>
</ul>
</div>
<div class="navbar navbar-default" style="width: 601px;">
<ul class="nav nav-pills">
<li style="width: 100px;"><a href="<spring:url value="/" htmlEscape="true" />">
<span class="glyphicon glyphicon-home"></span>
Home</a>
</li>
<li style="width: 130px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
class="glyphicon glyphicon-search"></i> Find owners</a></li>
<li style="width: 140px;">
<a href="<spring:url value="/vets.html" htmlEscape="true" />">
<span class="glyphicon glyphicon-th-list"></span> Veterinarians</a>
</li>
<li style="width: 90px;">
<a href="<spring:url value="/oups.html" htmlEscape="true" />"
title="trigger a RuntimeException to see how it is handled">
<i class="glyphicon glyphicon-warning-sign"></i> Error</a>
</li>
<li style="width: 80px;">
<a href="#" title="not available yet. Work in progress!!">
<i class=" glyphicon glyphicon-question-sign"></i>
Help
</a>
</li>
</ul>
</div>

View file

@ -9,7 +9,7 @@ PetClinic :: a Spring Framework demonstration
<title>PetClinic :: a Spring Framework demonstration</title>
<spring:url value="/webjars/bootstrap/2.3.0/css/bootstrap.min.css" var="bootstrapCss"/>
<spring:url value="/webjars/bootstrap/3.0.1/css/bootstrap.min.css" var="bootstrapCss"/>
<link href="${bootstrapCss}" rel="stylesheet"/>
<spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>