summaryrefslogtreecommitdiff
path: root/cyborg
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2013-02-08 23:21:16 -0500
committerThomas Park <thomas@thomaspark.me>2013-02-08 23:21:16 -0500
commit078ff71c7d346ffa9db925ef07bbc90f2d7ec5ac (patch)
tree31438d6233a1b19852212f3fed7e9a65521a5a06 /cyborg
parentc889a189f12d5b42d60a426badf9528e7a84aff4 (diff)
fixes #69, subnav-fixed position tweaks
Diffstat (limited to 'cyborg')
-rw-r--r--cyborg/bootstrap.css8
-rw-r--r--cyborg/bootstrap.min.css4
-rwxr-xr-xcyborg/bootswatch.less15
3 files changed, 17 insertions, 10 deletions
diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
index 6459cb4c..ae6b8875 100644
--- a/cyborg/bootstrap.css
+++ b/cyborg/bootstrap.css
@@ -5262,14 +5262,12 @@ hr {
}
}
div.subnav {
+ margin: 0 1px;
background-color: #020202;
background-image: none;
border: none;
border-bottom: 1px solid #222222;
}
-div.subnav.subnav-fixed {
- top: 50px;
-}
div.subnav .nav > li > a,
div.subnav .nav > li:first-child > a,
div.subnav .nav > li:first-child > a:hover {
@@ -5291,6 +5289,10 @@ div.subnav .nav > li:first-child > a:hover {
div.subnav .nav li.nav-header {
text-shadow: none;
}
+div.subnav-fixed {
+ top: 50px;
+ margin: 0;
+}
.nav-tabs {
border-bottom: 1px solid #222222;
}
diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
index 8f0b8acf..722bc772 100644
--- a/cyborg/bootstrap.min.css
+++ b/cyborg/bootstrap.min.css
@@ -869,10 +869,10 @@ hr{border-bottom:none;}
.navbar .search-query,.navbar .search-query:focus,.navbar .search-query.focused{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;background-color:#222222;line-height:normal;color:#adafae;text-shadow:none;}.navbar .search-query:-moz-placeholder,.navbar .search-query:focus:-moz-placeholder,.navbar .search-query.focused:-moz-placeholder{color:#999999;}
.navbar .search-query:-ms-input-placeholder,.navbar .search-query:focus:-ms-input-placeholder,.navbar .search-query.focused:-ms-input-placeholder{color:#999999;}
.navbar .search-query::-webkit-input-placeholder,.navbar .search-query:focus::-webkit-input-placeholder,.navbar .search-query.focused::-webkit-input-placeholder{color:#999999;}
-@media (max-width:979px){.navbar .nav-collapse .nav li>a{border:none;color:#eeeeee;font-weight:normal;text-shadow:none;}.navbar .nav-collapse .nav li>a:hover{border:none;background-color:#33b5e5;} .navbar .nav-collapse .nav .active>a{border:none;background-color:#33b5e5;} .navbar .nav-collapse .dropdown-menu a:hover{background-color:#33b5e5;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar .nav-collapse .nav-header{color:rgba(128, 128, 128, 0.6);} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:#111;} .navbar-inverse .nav-collapse .nav .active>a{background-color:#111;} .navbar-inverse .nav-collapse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav-collapse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav-collapse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111;}}div.subnav{background-color:#020202;background-image:none;border:none;border-bottom:1px solid #222222;}div.subnav.subnav-fixed{top:50px;}
-div.subnav .nav>li>a,div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{padding:11px 12px;border:none;background-color:#020202;color:#adafae;}
+@media (max-width:979px){.navbar .nav-collapse .nav li>a{border:none;color:#eeeeee;font-weight:normal;text-shadow:none;}.navbar .nav-collapse .nav li>a:hover{border:none;background-color:#33b5e5;} .navbar .nav-collapse .nav .active>a{border:none;background-color:#33b5e5;} .navbar .nav-collapse .dropdown-menu a:hover{background-color:#33b5e5;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar .nav-collapse .nav-header{color:rgba(128, 128, 128, 0.6);} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:#111;} .navbar-inverse .nav-collapse .nav .active>a{background-color:#111;} .navbar-inverse .nav-collapse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav-collapse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav-collapse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111;}}div.subnav{margin:0 1px;background-color:#020202;background-image:none;border:none;border-bottom:1px solid #222222;}div.subnav .nav>li>a,div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{padding:11px 12px;border:none;background-color:#020202;color:#adafae;}
div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:first-child>a:hover{padding:11px 12px;background:transparent;border:none;border-bottom:1px solid #33b5e5;color:#ffffff;}
div.subnav .nav li.nav-header{text-shadow:none;}
+div.subnav-fixed{top:50px;margin:0;}
.nav-tabs{border-bottom:1px solid #222222;}.nav-tabs li>a:hover,.nav-tabs li.active>a,.nav-tabs li.active>a:hover{border-color:transparent;background-color:#33b5e5;color:#ffffff;}
.nav-tabs .open .dropdown-toggle{background-color:#060606;border-color:transparent;}
.nav-pills li>a:hover{background-color:#33b5e5;color:#ffffff;}
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
index b488c30e..a9accc44 100755
--- a/cyborg/bootswatch.less
+++ b/cyborg/bootswatch.less
@@ -165,16 +165,13 @@ hr {
}
div.subnav {
+
+ margin: 0 1px;
background-color: @grayDarker;
background-image: none;
border: none;
border-bottom: 1px solid @grayDark;
-
- &.subnav-fixed {
- top: @navbarHeight;
- }
-
.nav > li > a,
.nav > li:first-child > a,
.nav > li:first-child > a:hover {
@@ -198,6 +195,14 @@ div.subnav {
.nav li.nav-header {
text-shadow: none;
}
+
+
+
+
+ &-fixed {
+ top: @navbarHeight;
+ margin: 0;
+ }
}
// NAV