Merge branch 'hotfix/2.2.17'

SergiArevalo · Jun 7, 2013 · 4c8f0d4 · 4c8f0d4
2 parents b08fc43 + dec84e7
commit 4c8f0d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/css/gumby.css b/css/gumby.css
@@ -1673,7 +1673,7 @@ form fieldset legend { padding: 5px 10px; }
 .field .radio, .field .checkbox { position: relative; }
 .field .radio input[type="radio"], .field .checkbox input[type="checkbox"] { display: none; }
 .field .input { position: relative; padding: 0 10px; background: #fff; border: 1px solid #d8d8d8; height: 36px; line-height: 34px; font-size: 16px; font-size: 1rem; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.field .input.search { height: 36px; line-height: 34px; -webkit-border-radius: 1000px; -moz-border-radius: 1000px; -ms-border-radius: 1000px; -o-border-radius: 1000px; border-radius: 1000px; }
+.field .input.search { height: 36px; line-height: 34px; -webkit-border-radius: 1000px; -moz-border-radius: 1000px; -ms-border-radius: 1000px; -o-border-radius: 1000px; border-radius: 1000px; padding-right: 0; }
 .field .input.textarea { height: auto; }
 .field .xnarrow { width: 13.33333%; }
 .field .narrow { width: 30.66667%; }

diff --git a/sass/ui/_forms.scss b/sass/ui/_forms.scss
@@ -75,6 +75,7 @@ form {
     &.search {
       @include line-and-height(height-calc($norm));
       @include border-radius(1000px);
+      padding-right: 0;
     }
   }
   .input.textarea {

diff --git a/sass/var/_settings.scss b/sass/var/_settings.scss
@@ -46,7 +46,7 @@ $rhythm-height: .711;
 // Modular Scale Settings
 // http://www.modularscale.com by Tim Brown
 // https://github.com/scottkellum/modular-scale
-$ratio: $golden !default;						// Ratio for Modular Scale
+$ratio: golden();						// Ratio for Modular Scale
 $base-font-size: 16px !default;
 $importantNum: 78px !default;
 $base-size: $base-font-size $importantNum;