Permalink
Browse files

CSS and JS changes from ZURB

  • Loading branch information...
drewkennelly committed Apr 13, 2012
1 parent 4c50941 commit 7a850d95bf95230e56b2612036055d15f1134e26
Showing with 128 additions and 101 deletions.
  1. +1 −1 css/grid.css
  2. +6 −0 css/mobile.css
  3. +6 −1 css/orbit.css
  4. +115 −99 js/jquery.orbit-1.4.0.js
View
@@ -114,7 +114,7 @@
/* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */
.block-grid.three-up { margin-left: -2% }
- .block-grid.three-up>li { margin-left: 2%; width: 31.3%; margin-bottom: 2%;}
+ .block-grid.three-up>li { margin-left: 2%; width: 31.2%; margin-bottom: 2%;}
/* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */
.block-grid.four-up { margin-left: -2% }
View
@@ -174,6 +174,12 @@
/* Nav Bar */
+ /* Modernizr-enabled tablet targeting */
+ @media only screen and (max-width: 1280px) and (min-width: 768px) {
+ .touch .nav-bar li a { font-size: 13px; font-size: 1.3rem; }
+ .touch .nav-bar li.has-flyout>a.flyout-toggle { padding: 20px; }
+ }
+
@media only screen and (max-width: 767px) {
.nav-bar { height: auto; }
.nav-bar>li { float: none; display: block; border-right: none; }
View
@@ -223,4 +223,9 @@ ul.orbit-bullets li.active {
ul.orbit-bullets li.active.has-thumb {
background-position: 0 0;
- border-top: 2px solid #000; }
+ border-top: 2px solid #000; }
+
+
+/* Correct timer in IE */
+ .timer { display: none !important; }
+ div.caption { background:transparent; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }
Oops, something went wrong.

0 comments on commit 7a850d9

Please sign in to comment.