summaryrefslogtreecommitdiff
path: root/simplex
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 /simplex
parentc889a189f12d5b42d60a426badf9528e7a84aff4 (diff)
fixes #69, subnav-fixed position tweaks
Diffstat (limited to 'simplex')
-rw-r--r--simplex/bootstrap.css1
-rw-r--r--simplex/bootstrap.min.css2
-rwxr-xr-xsimplex/bootswatch.less1
3 files changed, 3 insertions, 1 deletions
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css
index 08393099..e417a6cc 100644
--- a/simplex/bootstrap.css
+++ b/simplex/bootstrap.css
@@ -5210,6 +5210,7 @@ div.subnav {
font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
}
div.subnav.subnav-fixed {
+ top: 41px;
-webkit-box-shadow: inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);
diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css
index d2289cd6..3062bc1a 100644
--- a/simplex/bootstrap.min.css
+++ b/simplex/bootstrap.min.css
@@ -863,7 +863,7 @@ hr{border-bottom:none;}
.navbar .dropdown-menu a{font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}
.navbar-inverse .navbar-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
.navbar-inverse .brand:hover{color:#ffffff;}
-@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#555555;}.navbar .nav-collapse .nav li>a:hover{background-image:none;background-color:#fbebe9;} .navbar .nav-collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.3);border-bottom:1px solid rgba(128, 128, 128, 0.3);} .navbar-inverse .nav-collapse .nav li>a{color:#ffffff;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(255, 255, 255, 0.1) !important;} .navbar-inverse .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.7);}}div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);}
+@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#555555;}.navbar .nav-collapse .nav li>a:hover{background-image:none;background-color:#fbebe9;} .navbar .nav-collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.3);border-bottom:1px solid rgba(128, 128, 128, 0.3);} .navbar-inverse .nav-collapse .nav li>a{color:#ffffff;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(255, 255, 255, 0.1) !important;} .navbar-inverse .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.7);}}div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}div.subnav.subnav-fixed{top:41px;-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);}
div.subnav .nav>li>a{padding:14px 12px 10px;border-left-color:transparent;border-right-color:transparent;color:#555555;font-weight:bold;}div.subnav .nav>li>a:hover{background-color:transparent;color:#d9230f;}
div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#d9230f;}
.nav .nav-header{font-size:13px;font-weight:normal;text-transform:none;}
diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less
index fef77ddf..62e8136f 100755
--- a/simplex/bootswatch.less
+++ b/simplex/bootswatch.less
@@ -137,6 +137,7 @@ div.subnav {
font-family: @headingsFontFamily;
&.subnav-fixed {
+ top: @navbarHeight + 1;
.box-shadow(inset 0 5px #fff~"," @boxShadow);
}