cerulean: tidy up

3 files changed, 57 insertions, 32 deletions

diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
index 50cd3e30..29f45a16 100644
--- a/cerulean/bootstrap.css
+++ b/cerulean/bootstrap.css
@@ -4175,11 +4175,10 @@ a.badge:hover {
 .invisible {
   visibility: hidden;
 }
-.navbar,
-.subnav {
+.navbar {
   font-family: 'Telex', sans-serif;
 }
-.navbar-inner {
+.navbar .navbar-inner {
   background-color: #3f9fd9;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#369bd7), color-stop(90%, #369bd7), to(#61b0df));
   background-image: -webkit-linear-gradient(#369bd7, #369bd7 90%, #61b0df);
@@ -4209,9 +4208,12 @@ a.badge:hover {
 .navbar .nav-collapse.in .nav li > a:hover {
   background-color: #2B7CAC;
 }
-.btn-navbar:hover {
+.navbar .btn-navbar:hover {
   background-color: #cccccc;
 }
+div.subnav {
+  font-family: 'Telex', sans-serif;
+}
 .btn {
   background-color: #ffffff;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(5%, #ffffff), to(#ffffff));
@@ -4406,3 +4408,18 @@ a.badge:hover {
 i[class^="icon-"] {
   opacity: 0.8;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}
diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css
index 16189466..42590b1b 100644
--- a/cerulean/bootstrap.min.css
+++ b/cerulean/bootstrap.min.css
@@ -714,13 +714,13 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .hide{display:none;}
 .show{display:block;}
 .invisible{visibility:hidden;}
-.navbar,.subnav{font-family:'Telex',sans-serif;}
-.navbar-inner{background-color:#3f9fd9;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#369bd7), color-stop(90%, #369bd7), to(#61b0df));background-image:-webkit-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:-moz-linear-gradient(top, #369bd7, #369bd7 90%, #61b0df);background-image:-ms-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:-o-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#369bd7', endColorstr='#61b0df', GradientType=0);}
+.navbar{font-family:'Telex',sans-serif;}.navbar .navbar-inner{background-color:#3f9fd9;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#369bd7), color-stop(90%, #369bd7), to(#61b0df));background-image:-webkit-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:-moz-linear-gradient(top, #369bd7, #369bd7 90%, #61b0df);background-image:-ms-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:-o-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#369bd7', endColorstr='#61b0df', GradientType=0);}
 .navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.active.open>.dropdown-toggle{background-color:rgba(0, 0, 0, 0.2);}
 .navbar .search-query{border:1px solid #2480b6;}
 .navbar .nav-collapse.in>.nav>li .dropdown-menu a{color:#ffffff;}.navbar .nav-collapse.in>.nav>li .dropdown-menu a:hover{color:#ffffff;}
 .navbar .nav-collapse.in .nav li>a{color:#ffffff;}.navbar .nav-collapse.in .nav li>a:hover{background-color:#2B7CAC;}
-.btn-navbar:hover{background-color:#cccccc;}
+.navbar .btn-navbar:hover{background-color:#cccccc;}
+div.subnav{font-family:'Telex',sans-serif;}
 .btn{background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(5%, #ffffff), to(#ffffff));background-image:-webkit-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 5%, #ffffff);background-image:-ms-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-o-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ffffff', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 0;}
 .btn-primary{background-color:#43a1da;background-image:-moz-linear-gradient(top, #4ba6db, #369bd7);background-image:-ms-linear-gradient(top, #4ba6db, #369bd7);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4ba6db), to(#369bd7));background-image:-webkit-linear-gradient(top, #4ba6db, #369bd7);background-image:-o-linear-gradient(top, #4ba6db, #369bd7);background-image:linear-gradient(top, #4ba6db, #369bd7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4ba6db', endColorstr='#369bd7', GradientType=0);border-color:#369bd7 #369bd7 #2071a1;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#369bd7;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#369bd7;*background-color:#288ecb;}
 .btn-primary:active,.btn-primary.active{background-color:#2480b6 \9;}
@@ -735,3 +735,8 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .btn-inverse{background-color:#f8b93b;background-image:-moz-linear-gradient(top, #f8bd45, #f7b42c);background-image:-ms-linear-gradient(top, #f8bd45, #f7b42c);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f8bd45), to(#f7b42c));background-image:-webkit-linear-gradient(top, #f8bd45, #f7b42c);background-image:-o-linear-gradient(top, #f8bd45, #f7b42c);background-image:linear-gradient(top, #f8bd45, #f7b42c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8bd45', endColorstr='#f7b42c', GradientType=0);border-color:#f7b42c #f7b42c #cf8d08;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f7b42c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#f7b42c;*background-color:#f6ab13;}
 .btn-inverse:active,.btn-inverse.active{background-color:#e79e09 \9;}
 i[class^="icon-"]{opacity:0.8;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less
index 9e5c8993..174d894b 100755
--- a/cerulean/bootswatch.less
+++ b/cerulean/bootswatch.less
@@ -3,51 +3,54 @@
 // Version: 2.0.3
 // -----------------------------------------------------
 
-// TYPOGRAPHY
+// IMPORTS
 // -----------------------------------------------------
 
 @import url(https://fonts.googleapis.com/css?family=Telex);
 
-.navbar, .subnav {
-	font-family: @headingsFontFamily;
-}
-
 // NAVBAR
 // -----------------------------------------------------
 
-.navbar-inner {
-  #gradient > .vertical-three-colors(@navbarBackground, @navbarBackground, 90%, @navbarBackgroundHighlight);
-}
-
+.navbar {
+	
+	font-family: @headingsFontFamily;
+	
+	.navbar-inner {
+		#gradient > .vertical-three-colors(@navbarBackground, @navbarBackground, 90%, @navbarBackgroundHighlight);
+	}
+	
 	.nav li.dropdown.active > .dropdown-toggle,
 	.nav li.dropdown.active.open > .dropdown-toggle {
 		background-color: @navbarLinkBackgroundActive;
 	}
+	
+	.search-query {
+		border: 1px solid darken(@linkColor, 10%);
+	}
 
-.navbar .search-query {
-	border: 1px solid darken(@linkColor, 10%);
-}
+	.nav-collapse.in > .nav > li .dropdown-menu a {
+		color: @white;
 
-// responsive menu colors
+		&:hover {
+			color: @white;
+		}
+	}
 
-.navbar .nav-collapse.in > .nav > li .dropdown-menu a {
-	color: @white;
-	
-	&:hover {
+	.nav-collapse.in .nav li > a {
 		color: @white;
+
+		&:hover {
+			background-color: #2B7CAC;
+		}
 	}
-}
 
-.navbar .nav-collapse.in .nav li > a {
-	color: @white;
-	
-	&:hover {
-		background-color: #2B7CAC;
+	.btn-navbar:hover {
+	    background-color: darken(@white, 20%);
 	}
 }
 
-.btn-navbar:hover {
-    background-color: darken(@white, 20%);
+div.subnav {
+	font-family: @headingsFontFamily;
 }
 
 // BUTTONS