From: Mark Otto <markdotto@gmail.com>
Date: Thu, 26 Jan 2012 23:25:19 +0000 (-0800)
Subject: Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins... 
X-Git-Tag: v2.0.0~6^2~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d67c3408465f44be7336abc6a00af870d2c18f8;p=thirdparty%2Fbootstrap.git

Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment

Conflicts:
	bootstrap.css
	bootstrap.min.css
---

2d67c3408465f44be7336abc6a00af870d2c18f8
diff --cc bootstrap.css
index 89a9303eb7,58757683c5..862b4c5b63
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Thu Jan 26 15:04:19 PST 2012
 - * Date: Thu Jan 26 16:14:59 EST 2012
++ * Date: Thu Jan 26 15:25:02 PST 2012
   */
  article,
  aside,
@@@ -2514,16 -2514,11 +2514,17 @@@ table .span12 
    -moz-border-radius: 5px;
    border-radius: 5px;
  }
 +.btn.large .icon {
 +  margin-top: 1px;
 +}
  .btn.small {
-   padding: 7px 9px 7px;
+   padding: 5px 9px 5px;
    font-size: 11px;
+   line-height: 16px;
  }
 +.btn.small .icon {
 +  margin-top: -2px;
 +}
  button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
    padding: 0;
    border: 0;
diff --cc bootstrap.min.css
index f2af57a449,26c3dfe945..c4b048f742
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@@ -470,9 -470,7 +470,9 @@@ table .span12{float:none;width:924px;ma
  .btn.disabled{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
  .btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
  .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 +.btn.large .icon{margin-top:1px;}
- .btn.small{padding:7px 9px 7px;font-size:11px;}
+ .btn.small{padding:5px 9px 5px;font-size:11px;line-height:16px;}
 +.btn.small .icon{margin-top:-2px;}
  button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
  .btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
  .btn-group:after{clear:both;}
diff --cc lib/buttons.less
index 2cbcc1d4fd,240e117e2b..d7f5337832
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@@ -128,16 -128,11 +128,17 @@@
      line-height: normal;
      .border-radius(5px);
    }
 +  &.large .icon {
 +    margin-top: 1px;
 +  }
    &.small {
-     padding: 7px 9px 7px;
+     padding: 5px 9px 5px;
      font-size: @baseFontSize - 2px;
+     line-height: @baseLineHeight - 2px;
    }
 +  &.small .icon {
 +    margin-top: -2px;
 +  }
  }
  
  // Help Firefox not be a jerk about adding extra padding to buttons