Customized Bootstrap CSS to collapse navbar at 1000px.

Author: arunkpatra

pom.xml

@@ -39,7 +39,7 @@
 	<properties>
 		<apache.commons.lang3.version>3.1</apache.commons.lang3.version>
 		<apache.dbcp.version>1.2.2</apache.dbcp.version>
-		<bootstrap.version>3.1.0</bootstrap.version>
+		<bootstrap.version>3.1.1</bootstrap.version>
 		<!-- <bootstrap.version>3.0.2</bootstrap.version> -->
 		<commons.collections.version>3.2</commons.collections.version>
 		<copyright.year>2014</copyright.year>
@@ -92,11 +92,11 @@
 
 	<dependencyManagement>
 		<dependencies>
-<!-- 			<dependency> -->
-<!-- 				<groupId>org.webjars</groupId> -->
-<!-- 				<artifactId>bootstrap</artifactId> -->
-<!-- 				<version>${bootstrap.version}</version> -->
-<!-- 			</dependency> -->
+			<dependency>
+				<groupId>org.webjars</groupId>
+				<artifactId>bootstrap</artifactId>
+				<version>${bootstrap.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -264,10 +264,10 @@
 	<!-- <version>1.0.10</version> -->
 	<!-- </dependency> -->
 		<!-- Add Bootstrap via WebJars -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.webjars</groupId> -->
-<!-- 			<artifactId>bootstrap</artifactId> -->
-<!-- 		</dependency> -->
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>bootstrap</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>bootstrap-datepicker</artifactId>
@@ -286,7 +286,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>bootswatch-flatly</artifactId>
-			<version>3.1.0</version>
+			<version>3.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

src/main/webapp/fonts/glyphicons-halflings-regular.eot

@@ -5,16 +5,15 @@
 <ui:composition>
 
 	<c:set var="base" value="#{request.contextPath}" />
-	<!-- 
-	<h:outputStylesheet library="webjars/bootswatch-flatly/3.1.0/css"
-		name="bootstrap.min.css" />		
-	<h:outputStylesheet library="webjars/bootstrap-datepicker/1.3.0/css"
-		name="datepicker.css" />
-	<h:outputStylesheet library="webjars/font-awesome/4.0.3/css"
-		name="font-awesome.min.css" />	
- -->
-	<h:outputStylesheet
-		name="webjars/bootswatch-flatly/3.1.0/css/bootstrap.min.css" />
+	<!-- This is a customized version of bootswatch-flatly. The navbar break to collapsed
+	state would happen at 1000px -->
+	<link rel="stylesheet" type="text/css" href="${base}/styles/bootstrap-flatly-custom-et.min.css" />
+
+
+<!-- 	<h:outputStylesheet -->
+<!-- 		name="webjars/bootstrap/3.1.1/css/bootstrap.min.css" /> -->
+<!-- 	<h:outputStylesheet -->
+<!-- 		name="webjars/bootswatch-flatly/3.1.1/css/bootstrap.min.css" /> -->
 	<h:outputStylesheet
 		name="webjars/bootstrap-datepicker/1.3.0/css/datepicker3.css" />
 	<h:outputStylesheet
@@ -28,9 +27,11 @@
 	<h:outputScript library="webjars/bootstrap-datepicker/1.3.0/js"
 		name="bootstrap-datepicker.js" />
 
-	<h:outputScript library="webjars/bootswatch-flatly/3.1.0/js"
+<!-- 	<h:outputScript library="webjars/bootstrap/3.1.1/js" -->
+<!-- 		name="bootstrap.min.js" /> -->
+	<h:outputScript library="webjars/bootswatch-flatly/3.1.1/js"
 		name="bootstrap.min.js" />
-
+		
 	<h:outputScript library="webjars/jquery-cookie/1.4.0"
 		name="jquery.cookie.js" />
 </ui:composition>