summaryrefslogtreecommitdiff
path: root/spruce/bootswatch.less
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2012-05-01 01:51:46 -0400
committerThomas Park <thomas@thomaspark.me>2012-05-01 01:51:46 -0400
commitf6bc5bee91809d50d1082743d9efc90ab25b81fb (patch)
tree3f458aa951ea9220974834c42e62509750b5c69b /spruce/bootswatch.less
parentf92ce0f8e3bf510ce012aa744f7e45263503812a (diff)
Revert "all: update to 2.0.3"
This reverts commit f92ce0f8e3bf510ce012aa744f7e45263503812a.
Diffstat (limited to 'spruce/bootswatch.less')
-rwxr-xr-xspruce/bootswatch.less262
1 files changed, 120 insertions, 142 deletions
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index 7b6de11e..3033e679 100755
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -1,6 +1,6 @@
// Bootswatch.less
// Swatch: Spruce
-// Version: 2.0.3
+// Version: 2.0.2
// -----------------------------------------------------
// TYPOGRAPHY
@@ -10,8 +10,7 @@
.navbar .brand, legend, .btn,
.navbar .nav > li > a,
-div.subnav li > a,
-.navbar-text {
+div.subnav li > a {
font-family: @headingsFontFamily;
font-weight: @headingsFontWeight;
}
@@ -62,75 +61,55 @@ code, pre {
// NAVBAR
// --------------------------------------------------
-.navbar {
-
- .navbar-inner {
- background-image: none;
- .box-shadow(none);
- }
-
- .brand {
- font-size: 26px;
- padding: 18px 20px 12px;
- }
-
- .nav > li > a {
- font-size: 20px;
- padding: 22px 10px 11px;
- }
-
- .nav .active > a,
- .nav .active > a:hover {
- color: @yellow;
- }
-
- .navbar-text {
- font-size: 20px;
- padding-top: 12px;
- }
-
- .navbar-search {
- margin-top: 12px;
- }
+.navbar-inner {
+ background-image: none;
+ .box-shadow(none);
+}
- .navbar-search .search-query {
- border-color: transparent;
- padding: 6px 9px 2px 9px;
- background-color: rgba(255, 255, 255, 0.4);
- }
+.navbar .brand {
+ font-size: 26px;
+ padding: 18px 20px 12px;
+ color: @linkColor;
+}
- .nav > .open > a {
+.navbar .nav > li > a, {
+ font-size: 20px;
+ padding: 22px 10px 11px;
+ color: @linkColor;
+
+ &:hover {
color: @yellow;
}
+}
- .nav > .open > .dropdown-menu {
- background-color: @linkColor;
- color: @textColor;
- border-color: transparent;
- }
+.navbar .nav .active > a,
+.navbar .nav .active > a:hover {
+ color: @yellow;
+}
- .nav > .open > .dropdown-menu a:hover {
- background-color: darken(#90A38F, 10%);
- color: @linkColor;
- }
+.navbar-search {
+ margin-top: 12px;
+}
- .btn-navbar {
- margin-top: 14px;
- }
+.navbar-search .search-query {
+ border-color: transparent;
+ padding: 6px 9px 2px 9px;
+ background-color: rgba(255, 255, 255, 0.4);
+}
- .nav-collapse.in .nav li > a {
- color: @linkColor;
+.navbar .nav > .dropdown.open > a {
+ color: @yellow;
+}
- &:hover {
- color: @yellow;
- background-color: @blue;
- }
- }
+.navbar .nav > .dropdown.open > .dropdown-menu {
+ background-color: @linkColor;
+ color: @textColor;
+ border-color: transparent;
+}
- .navbar-form, .navbar-search {
- border-color: transparent;
- .box-shadow(none);
- }
+.navbar .nav > .dropdown.open > .dropdown-menu a:hover {
+ background-color: darken(#90A38F, 10%);
+ color: @linkColor;
}
.dropdown-menu .divider {
@@ -144,44 +123,61 @@ div.subnav {
border-color: transparent;
.box-shadow(0 1px 5px rgba(0,0,0,.1));
font-size: 18px;
-
- .nav > li > a {
- color: @linkColor;
- border-color: transparent;
- background-color: transparent;
- }
+}
- .nav > li + li > a {
- border-color: transparent;
- }
+div.subnav .nav > li > a {
+ color: @linkColor;
+ border-color: transparent;
+ background-color: transparent;
+}
- .nav > li.active > a,
- .nav > li > a:hover,
- .nav > li.active > a:hover,
- .dropdown.open .dropdown-toggle,
- .dropdown.open.active .dropdown-toggle:hover {
- .box-shadow(none);
- background-color: transparent;
- border-color: transparent;
- color: @yellow;
- }
+div.subnav .nav > li.active > a,
+div.subnav .nav > li > a:hover,
+div.subnav .nav > li.active > a:hover,
+div.subnav .dropdown.open .dropdown-toggle {
+ .box-shadow(none);
+ background-color: transparent;
+ border-color: transparent;
+ color: @yellow;
+}
- .dropdown.open > .dropdown-menu {
- background-color: @linkColor;
- color: @textColor;
- border-color: transparent;
- }
+div.subnav .nav > li + li > a {
+ border-color: transparent;
+}
- .dropdown.open > .dropdown-menu a:hover {
- background-color: darken(#90A38F, 10%);
- color: @linkColor;
- }
+div.subnav .dropdown.open > .dropdown-menu {
+ background-color: @linkColor;
+ color: @textColor;
+ border-color: transparent;
+}
+
+div.subnav .dropdown.open > .dropdown-menu a:hover {
+ background-color: darken(#90A38F, 10%);
+ color: @linkColor;
+}
+
+div.subnav-fixed {
+ top: 54px;
+}
+
+.navbar .btn-navbar {
+ margin-top: 14px;
+}
- &.subnav-fixed {
- top: 54px;
+.navbar .nav-collapse.in .nav li > a {
+ color: @linkColor;
+
+ &:hover {
+ color: @yellow;
+ background-color: @blue;
}
}
+.navbar .navbar-form, .navbar .navbar-search {
+ border-color: transparent;
+ .box-shadow(none);
+}
+
// TABLES
// --------------------------------------------------
@@ -271,35 +267,28 @@ div.subnav {
// NAVIGATION
// --------------------------------------------------
-.breadcrumb {
+.breadcrumb, .pagination > ul {
background-color: darken(#90A38F, 10%);
background-image: none;
border-color: transparent;
.box-shadow(none);
+}
+
+.breadcrumb li {
+ color: @yellow;
+ text-shadow: none;
+
+ a {
+ color: @linkColor;
+ }
- li {
+ a:hover {
color: @yellow;
- text-shadow: none;
-
- a {
- color: @linkColor;
- }
-
- a:hover {
- color: @yellow;
- }
-
- .divider {
- color: @blue;
- }
}
-}
-
-.pagination > ul {
- background-color: darken(#90A38F, 10%);
- background-image: none;
- border-color: transparent;
- .box-shadow(none);
+
+ .divider {
+ color: @blue;
+ }
}
.pagination a {
@@ -322,27 +311,17 @@ div.subnav {
color: @blue;
}
-.nav-list {
-
- li > a,
- .nav-header {
- text-shadow: none;
- }
+.nav-list > li > a, .nav-list .nav-header {
+ text-shadow: none;
+}
- li > a:hover {
- background-color: transparent;
- }
-
- li.active > a,
- li.active > a:hover {
- background-color: #A2CDB5;
- text-shadow: none;
- }
-
- .divider {
- background-color: transparent;
- border-bottom: 1px solid @linkColor;
- }
+.nav-list .active > a, .nav-list .active > a:hover {
+ background-color: #A2CDB5;
+ text-shadow: none;
+}
+
+.nav-list li > a:hover {
+ background-color: transparent;
}
.nav-tabs {
@@ -404,14 +383,12 @@ div.subnav {
color: @blue;
}
-.tabbable {
- .nav-tabs,
- .nav-tabs > li > a,
- .nav-tabs > li > a:hover,
- .nav-tabs > li.active > a,
- .nav-tabs > li.active > a:hover {
- border-color: transparent;
- }
+.tabbable > .nav-tabs,
+.tabbable > .nav-tabs > li > a,
+.tabbable > .nav-tabs > li > a:hover,
+.tabbable > .nav-tabs > li.active > a,
+.tabbable > .nav-tabs > li.active > a:hover {
+ border-color: transparent;
}
.pager a {
@@ -448,6 +425,7 @@ legend {
}
.form-actions {
+ background-color: transparent;
border-top: none;
.border-radius(4px);
}