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

dcm-nk · Jan 14, 2013 · 7bb1c6a · 7bb1c6a
2 parents 7ac8535 + 0a8de2c
commit 7bb1c6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scss/foundation/common/_forms.scss b/scss/foundation/common/_forms.scss
@@ -40,7 +40,7 @@
   select { width: 100%; }
 
   /* Fieldsets */
-  fieldset { border: solid 1px #ddd; @include border-radius($fieldsetBorderRadius); padding: 12px 12px 0; margin: 18px 0;
+  fieldset { border: solid 1px #ddd; @include border-radius($fieldsetBorderRadius); padding: 12px; margin: 18px 0;
 
     legend { font-weight: bold; background: $white; padding: 0 3px; margin: 0; margin-#{$defaultFloat}: -3px; }
   }

diff --git a/scss/foundation/components/modules/_mqueries.scss b/scss/foundation/components/modules/_mqueries.scss
@@ -218,7 +218,7 @@
     }
 
     .block-grid {
-      &>li { clear: none !important; }
+      &>li { clear: none; }
       @for $i from 1 through $blockGridElements {
         &.mobile-#{convert-number-to-word($i)}-up>li {
           width: 100%/$i;