Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of https://github.com/zurb/foundation

  • Loading branch information...
commit 175de5a3c9e06308482911259e61f1a43551e205 2 parents 0e2ce2e + fedf969
@mrsweaters mrsweaters authored
View
6 marketing/sass/docs/presentation.scss
@@ -64,7 +64,9 @@ header .subheader { position: relative; top: -18px; }
.top-bar .attached > ul.right > li.download:hover > a { background-color: #2284A1; }
.top-bar .attached > .name span > a:hover { color: $white; }
.top-bar .attached > .name > span > a.toggle-nav { right: -45px !important; }
-@media only screen and (-moz-min-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) { .top-bar .attached > .name span > a.toggle-nav { background-image: url('../images/plus-toggle-2-retina.png?1340846519'); background-size: 100% 100%; } }
+@media only screen and (-moz-min-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
+ .top-bar .attached > .name span > a.toggle-nav { background-image: url('../images/plus-toggle-2-retina.png?1340846519'); background-size: 100% 100%; }
+}
@media only screen and (max-width: 1024px) and (min-width: 768px) {
.top-bar { height: 45px !important; }
.top-bar .attached { height: auto; }
@@ -92,7 +94,7 @@ header .subheader { position: relative; top: -18px; }
.top-bar .attached > .name > span > a.toggle-nav { right: -45px !important; }
}
@media only screen and (orientation: portrait) and (min-device-width: 768px) {
- .top-bar { overflow: hidden; height: 45px; }
+ .top-bar { height: 45px !important; }
.top-bar.expanded { height: auto !important; }
.touch .top-bar .attached { height: 45px !important; }
.touch .top-bar .attached > ul.right { overflow: hidden; height: 45px !important; }
View
2  marketing/stylesheets/docs/presentation.css
@@ -1012,7 +1012,7 @@ header .subheader { position: relative; top: -18px; }
.top-bar .attached > ul > li > a, .top-bar .attached > ul > li > span { padding-left: 0px; padding-right: 0px; }
.top-bar .attached > ul > li.download a { margin-bottom: 30px !important; margin-top: 10px; }
.top-bar .attached > .name > span > a.toggle-nav { right: -45px !important; } }
-@media only screen and (orientation: portrait) and (min-device-width: 768px) { .top-bar { overflow: hidden; height: 45px; }
+@media only screen and (orientation: portrait) and (min-device-width: 768px) { .top-bar { height: 45px !important; }
.top-bar.expanded { height: auto !important; }
.touch .top-bar .attached { height: 45px !important; }
.touch .top-bar .attached > ul.right { overflow: hidden; height: 45px !important; } }
Please sign in to comment.
Something went wrong with that request. Please try again.