Merge pull request #26 from himedlooff/gh-pages

Updates button padding to match design manual more exactly and to match new input heights.
cfpb · Aug 11, 2014 · 5980f3d · 5980f3d
2 parents 8dc9be3 + 4751f87
commit 5980f3d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "cf-buttons",
- "version": "1.0.0",
+ "version": "1.0.1",
  "description": "Button styles including default, secondary, destructive, disabled, super, and compound buttons, button links, buttons with icons, and button groups for Capital Framework.",
  "keywords": [
  "capital-framework",

diff --git a/demo/static/css/main.css b/demo/static/css/main.css
diff --git a/docs/index.html b/docs/index.html
@@ -96,7 +96,7 @@ <h3 class="docs-pattern_header">Active state</h3>
  -webkit-box-sizing: border-box;
  -moz-box-sizing: border-box;
  box-sizing: border-box;
- padding: 0.64285714em 1em;
+ padding: 0.57142857em 1em;
  border: 0;
  border-radius: 0.28571429em;
  margin: 0;
@@ -146,8 +146,8 @@ <h3 class="docs-pattern_header">Active state</h3>
 .lt-ie8 button.btn,
 .lt-ie8 input.btn {
  overflow: visible;
- padding-top: 0.51428571em;
- padding-bottom: 0.51428571em;
+ padding-top: 0.45714286em;
+ padding-bottom: 0.45714286em;
 }</code></pre>
  </div>
  </div>
@@ -376,7 +376,7 @@ <h3 class="docs-pattern_header">Active state</h3>
  </div>
  <div class="docs-css">
  <pre class="docs-code"><code data-language="css">.btn__super {
- padding: 0.83333333em 1.66666667em;
+ padding: 0.61111111em 1.61111111em;
  font-size: 1.125em;
 }
 .btn__super + .btn__super {
@@ -781,7 +781,7 @@ <h3 class="docs-pattern_header">Active state</h3>
  padding: 0;
  border-bottom: 1px dotted #0072ce;
  border-radius: 0;
- margin: 0.64285714em 0;
+ margin: 0.57142857em 0;
 }
 .btn__link,
 .btn__link:link,

diff --git a/docs/static/css/main.css b/docs/static/css/main.css
diff --git a/src/cf-buttons.less b/src/cf-buttons.less
@@ -24,7 +24,7 @@
 
 // Used across the various .btn styles
 @btn-font-size: 14px;
-@btn-v-padding: 9px;
+@btn-v-padding: 8px;
 
 // Used to fix the vertical padding bug in IE for <button>'s and <inputs>'s
 // across various .btn styles
@@ -325,8 +325,8 @@
 .btn__super {
 
  padding:
- unit( 15px / @super-btn-font-size, em )
- unit( 30px / @super-btn-font-size, em );
+ unit( 11px / @super-btn-font-size, em )
+ unit( 29px / @super-btn-font-size, em );
  font-size: unit( @super-btn-font-size / @base-font-size-px, em );
 
  & + & {