2.0.3 -> 2.0.4 closes thomaspark#24

kublaj · Jun 15, 2012 · 6636f09 · 6636f09
1 parent dd8b8d3
commit 6636f09
Show file tree

Hide file tree

Showing 48 changed files with 2,224 additions and 1,868 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
@@ -1,6 +1,6 @@
 // Bootswatch.less
 // Swatch: Amelia
-// Version: 2.0.3
+// Version: 2.0.4
 // -----------------------------------------------------
 
 // TYPOGRAPHY
@@ -43,9 +43,9 @@ hr {
 
 footer.footer {
 	border-top: 1px solid rgba(255, 255, 255, 0.3);
-	
+
 	p {
-		color: @textColor;	
+		color: @textColor;
 	}
 }
 
@@ -56,7 +56,7 @@ footer.footer {
 	.navbar-inner {
 		.border-radius(0);
 	}
-	
+
 	.brand {
 		padding: 12px 20px 14px;
 		font-size: 24px;
@@ -68,16 +68,16 @@ footer.footer {
 		padding-bottom: 14px;
 		text-shadow: none;
 	}
-	
+
 	.navbar-search {
 		margin-top: 10px;
-	}	
-	
+	}
+
 	.navbar-search .search-query {
 		border: 2px solid lighten(@navbarBackground, 10%);
 		.border-radius(0);
 		.box-shadow(none);
-		
+
 		&:focus, &.focus {
 			background-color: @grayLighter;
 			border-color: @grayLighter;
@@ -94,17 +94,17 @@ div.subnav {
 	border: 0px solid transparent;
 	.border-radius(0);
 	.box-shadow(none);
-	
+
 	.nav > li.open > a {
 		border-color: transparent;
 		background-color: rgba(255, 255, 255, 0.4);
 	}
-	
+
 	.nav > li > a {
 		color: @textColor;
 		border-color: transparent;
 	}
-	
+
 	.nav > li:first-child > a,
 	.nav > li:first-child > a:hover {
 		.border-radius(0);
@@ -116,15 +116,15 @@ div.subnav {
 		color: @textColor;
 		.box-shadow(none);
 	}
-	
+
 	.nav > .active > a:hover,
 	.nav > li > a:hover,
 	.nav > li.active > a:hover, {
 		border-right-color: transparent;
 		background-color: rgba(255, 255, 255, 0.4);
 		color: @textColor;
 	}
-	
+
 	.nav > li:first-child > a:hover {
 		border-left-color: rgba(255, 255, 255, 0.4);
 		border-left-width: 1px;
@@ -136,21 +136,21 @@ div.subnav-fixed {
 }
 
 .navbar .nav-collapse.in {
-	
+
 	.nav li > a {
 		color: @textColor;
 		.border-radius(0);
 	}
-	
+
 	li > a:hover {
 		background-color: lighten(@navbarBackground, 10%);
 	}
-	
+
 	.navbar-form, .navbar-search {
 		.box-shadow(none);
 		border-color: lighten(@navbarBackground, 10%);
 	}
-	
+
 	.navbar-search .search-query {
 		border: 2px solid @textColor;
 	}
@@ -168,7 +168,7 @@ div.subnav-fixed {
     background-color: darken(@color, 5%);
 	text-shadow: none;
   }
-  
+
   &:active, &.active {
     background-color: darken(@color, 15%);
 	.box-shadow(none);
@@ -343,11 +343,11 @@ input, textarea, .search-query, .uneditable-input,
 .breadcrumb {
 	background-color: #3CB9C6;
 	background-image: none;
-	
+
 	li {
 		text-shadow: none;
 	}
-	
+
 	.divider {
 		color: @linkColor;
 	}
@@ -362,7 +362,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .pagination {
-	
+
 	ul  {
 		background-color: #3CB9C6;
 		background-image: none;
@@ -375,12 +375,12 @@ input, textarea, .search-query, .uneditable-input,
 	.disabled a, .disabled a:hover {
 		color: @textColor;
 	}
-	
+
 	li a:hover {
 		background-color: rgba(255, 255, 255, 0.4);
 		color: @linkColor;
 	}
-	
+
 	.active a, .active a:hover {
 		background-color: rgba(255, 255, 255, 0.4);
 		color: @textColor;
@@ -403,20 +403,20 @@ input, textarea, .search-query, .uneditable-input,
 
 .nav-tabs, .nav-pills {
 	border-color: transparent;
-	
+
 	li > a {
 		border-color: transparent;
 		.border-radius(0);
 		.box-shadow(0);
 	}
-	
+
 	li.active > a,
 	li:active > a,
 	li.active > a:hover,
 	li:active > a:hover {
 		color: @textColor;
 	}
-	
+
 	li.active > a,
 	li:active > a,
 	li > a:hover,
@@ -442,7 +442,7 @@ input, textarea, .search-query, .uneditable-input,
 	li > a:last-child {
 		.border-radius(0);
 	}
-	
+
 	li > a,
 	li > a:hover,
 	li.active > a,
@@ -458,7 +458,7 @@ input, textarea, .search-query, .uneditable-input,
 		text-shadow: none;
 		color: @textColor;
 	}
-	
+
 	li > a {
 		text-shadow: none;
 	}
@@ -545,7 +545,7 @@ code, pre {
 .progress {
 	background-image: none;
 	background-color: #27666D;
-	
+
 	.bar {
 		.box-shadow(none);
 		background-image: none;

diff --git a/amelia/variables.less b/amelia/variables.less
@@ -1,7 +1,7 @@
 // Variables.less
 // Variables to customize the look and feel of Bootstrap
 // Swatch: Amelia
-// Version: 2.0.3
+// Version: 2.0.4
 // -----------------------------------------------------
 
 // GLOBAL VALUES
@@ -107,7 +107,8 @@
 @dropdownLinkColor:             @bodyBackground;
 @dropdownLinkColorHover:        @white;
 @dropdownLinkBackgroundHover:   rgba(0, 57, 59, 0.9);
-
+@dropdownDividerTop:            #e5e5e5;
+@dropdownDividerBottom:         @white;