summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spacelab/bootstrap.css12
-rw-r--r--spacelab/bootstrap.min.css4
-rwxr-xr-xspacelab/bootswatch.less15
3 files changed, 21 insertions, 10 deletions
diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css
index d66b042e..71dbfabc 100644
--- a/spacelab/bootstrap.css
+++ b/spacelab/bootstrap.css
@@ -3570,14 +3570,18 @@ a.thumbnail:hover {
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5);
color: #333333;
}
-.navbar .nav-collapse > .nav > li > a > .caret {
+.navbar .nav-collapse > .nav li > a {
+ color: #333333;
+}
+.navbar .nav-collapse > .nav li > a .caret {
border-top-color: #999999;
}
-.navbar .nav-collapse > .nav > li > a:hover {
+.navbar .nav-collapse > .nav li > a:hover {
text-shadow: none;
- color: #ffffff;
+ color: #4183c4;
+ background-color: transparent;
}
-.navbar .nav-collapse > .nav > li > a:hover .caret {
+.navbar .nav-collapse > .nav li > a:hover .caret {
border-top-color: #ffffff;
}
.btn {
diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css
index f1d35322..28a08dde 100644
--- a/spacelab/bootstrap.min.css
+++ b/spacelab/bootstrap.min.css
@@ -642,8 +642,8 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.navbar-search .search-query,.navbar-search .search-query:hover{border:none;color:#999999;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);}.navbar-search .search-query :-moz-placeholder,.navbar-search .search-query:hover :-moz-placeholder{color:#999999;}
.navbar-search .search-query::-webkit-input-placeholder,.navbar-search .search-query:hover::-webkit-input-placeholder{color:#999999;}
.navbar-search .search-query:focus,.navbar-search .search-query:hover:focus,.navbar-search .search-query.focused,.navbar-search .search-query:hover.focused{-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);color:#333333;}
-.navbar .nav-collapse>.nav>li>a>.caret{border-top-color:#999999;}
-.navbar .nav-collapse>.nav>li>a:hover{text-shadow:none;color:#ffffff;}.navbar .nav-collapse>.nav>li>a:hover .caret{border-top-color:#ffffff;}
+.navbar .nav-collapse>.nav li>a{color:#333333;}.navbar .nav-collapse>.nav li>a .caret{border-top-color:#999999;}
+.navbar .nav-collapse>.nav li>a:hover{text-shadow:none;color:#4183c4;background-color:transparent;}.navbar .nav-collapse>.nav li>a:hover .caret{border-top-color:#ffffff;}
.btn{background-color:#f1f1f1;background-image:-moz-linear-gradient(top, #f4f4f4, #ececec);background-image:-ms-linear-gradient(top, #f4f4f4, #ececec);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec));background-image:-webkit-linear-gradient(top, #f4f4f4, #ececec);background-image:-o-linear-gradient(top, #f4f4f4, #ececec);background-image:linear-gradient(top, #f4f4f4, #ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#ececec', GradientType=0);border-color:#ececec #ececec #c6c6c6;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#ececec;}
.btn:active,.btn.active{background-color:#d3d3d3 \9;}
.btn-warning .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less
index 5425db89..bd11ada6 100755
--- a/spacelab/bootswatch.less
+++ b/spacelab/bootswatch.less
@@ -88,13 +88,20 @@
}
}
-.navbar .nav-collapse > .nav > li > a > .caret {
- border-top-color: @grayLight;
+.navbar .nav-collapse > .nav li > a {
+
+ color: @textColor;
+
+ .caret {
+ border-top-color: @grayLight;
+ }
}
-.navbar .nav-collapse > .nav > li > a:hover {
+
+.navbar .nav-collapse > .nav li > a:hover {
text-shadow: none;
- color: @white;
+ color: @linkColor;
+ background-color: transparent;
.caret {
border-top-color: @white;