Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zurb/foundation
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordan Humphreys committed Feb 7, 2012
2 parents adf86eb + 81b6ddd commit 55aeb15
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions stylesheets/mobile.css
Expand Up @@ -78,15 +78,6 @@
.hide-on-tablets { display: block !important; }
.hide-on-desktops { display: none !important; }

@media only screen and (max-device-width: 800px), only screen and (device-width: 1024px) and (device-height: 600px), only screen and (width: 1280px) and (orientation: landscape), only screen and (device-width: 800px) {
.hide-on-phones { display: block !important; }
.hide-on-tablets { display: none !important; }
.hide-on-desktops { display: block !important; }

.show-on-phones { display: none !important; }
.show-on-tablets { display: block !important; }
.show-on-desktops { display: none !important; }
}

/* Modernizr-enabled tablet targeting */
@media only screen and (max-width: 1280px) and (min-width: 768px) {
Expand Down

0 comments on commit 55aeb15

Please sign in to comment.