make css after merge

diff --git a/bootstrap.css b/bootstrap.css
index f3ea6d0b92e4d63ad14dc8128ee69e0b03bdadce..89a9303eb7cd85da333d5deae6c55f9afc46d428 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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 14:52:24 PST 2012
+ * Date: Thu Jan 26 15:04:19 PST 2012
  */
 article,
 aside,
@@ -2514,6 +2514,9 @@ table .span12 {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
+.btn.large .icon {
+  margin-top: 1px;
+}
 .btn.small {
   padding: 7px 9px 7px;
   font-size: 11px;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 711e5c01efd8c27c779f689ddb1611ae941a1d94..f2af57a449b7249708882012759174a731567052 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -470,6 +470,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .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 .icon{margin-top:-2px;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}