Merge branch 'hotfix/2.4.11'

GumbyFramework · Sep 10, 2013 · 20f5b1a · 20f5b1a
2 parents 9a386d2 + 8a5af33
commit 20f5b1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/css/gumby.css b/css/gumby.css
@@ -38,7 +38,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
 
 html { font-size: 16px; line-height: 1.625em; }
 
-html * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
+* { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
 
 body { background: white; font-family: "Open Sans"; font-weight: 400; color: #555555; position: relative; -webkit-font-smoothing: antialiased; }
 @media only screen and (max-width: 767px) { body { -webkit-text-size-adjust: none; -ms-text-size-adjust: none; width: 100%; min-width: 0; } }

diff --git a/sass/_base.scss b/sass/_base.scss
@@ -2,7 +2,7 @@
 
 @include establish-baseline;
 
-html * {
+* {
 	@include box-sizing(border-box);
 }