summaryrefslogtreecommitdiff
path: root/spacelab
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2012-04-03 10:10:40 -0400
committerThomas Park <thomas@thomaspark.me>2012-04-03 10:10:40 -0400
commit03025c640f470ef654b112598c0bc8ed351a6789 (patch)
tree0ee1af43672f514dda6b2c454188800cd6b632af /spacelab
parent97816efd6252818b2964d13218735ae5e597ddeb (diff)
spacelab: removed borders of navbar-search in navbar-collapse
Diffstat (limited to 'spacelab')
-rw-r--r--spacelab/bootstrap.css4
-rw-r--r--spacelab/bootstrap.min.css1
-rwxr-xr-xspacelab/bootswatch.less7
3 files changed, 10 insertions, 2 deletions
diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css
index d2f17046..48950678 100644
--- a/spacelab/bootstrap.css
+++ b/spacelab/bootstrap.css
@@ -4073,6 +4073,10 @@ div.subnav .nav > li > .dropdown-toggle {
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5);
color: #333333;
}
+.navbar .nav-collapse.in .navbar-search {
+ border-top: none;
+ border-bottom: none;
+}
.navbar .nav-collapse.in > .nav li > a {
color: #333333;
}
diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css
index fa7792ae..1ef33450 100644
--- a/spacelab/bootstrap.min.css
+++ b/spacelab/bootstrap.min.css
@@ -700,6 +700,7 @@ div.subnav .nav>li>.dropdown-toggle{background-color:transparent;color:#4183c4;}
.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.in .navbar-search{border-top:none;border-bottom:none;}
.navbar .nav-collapse.in>.nav li>a{color:#333333;}.navbar .nav-collapse.in>.nav li>a .caret{border-top-color:#999999;}
.navbar .nav-collapse.in>.nav li>a:hover{text-shadow:none;color:#4183c4;background-color:transparent;}.navbar .nav-collapse.in>.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;}
diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less
index c4fbbe78..e33f2f33 100755
--- a/spacelab/bootswatch.less
+++ b/spacelab/bootswatch.less
@@ -21,13 +21,11 @@
}
}
-// navbar dropshadow
.navbar .navbar-inner {
.box-shadow(0 1px 0 rgba(255,255,255,0.4));
.box-shadow(0 0 10px rgba(0,0,0,0.1));
}
-// nav item typography
.navbar .nav > li > a {
font-weight: bold;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
@@ -94,6 +92,11 @@ div.subnav .nav > li > .dropdown-toggle {
}
}
+.navbar .nav-collapse.in .navbar-search {
+ border-top: none;
+ border-bottom: none;
+}
+
.navbar .nav-collapse.in > .nav li > a {
color: @textColor;