From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 29 Jul 2011 20:10:33 +0000 (-0700)
Subject: resolve compiled css merge prob, refine few small things
X-Git-Tag: v1.0.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88bd6f72daaeb1cada7dab852e6f779af7b33823;p=thirdparty%2Fbootstrap.git

resolve compiled css merge prob, refine few small things
---

88bd6f72daaeb1cada7dab852e6f779af7b33823
diff --cc bootstrap-1.0.0.css
index c5eb05684e,126e8a1844..77a7276422
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.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: Sat Jul 23 22:37:22 PDT 2011
 - * Date: Thu Jul 28 17:49:29 PDT 2011
++ * Date: Fri Jul 29 13:03:43 PDT 2011
   */
  /*
   * Reset.less
@@@ -473,7 -473,7 +473,7 @@@ p 
    margin-bottom: 18px;
  }
  p small {
--  font-size: 12px;
++  font-size: 11px;
    color: #bfbfbf;
  }
  h1,
@@@ -1621,7 -1621,7 +1621,7 @@@ div.modal .modal-body 
    padding: 20px;
  }
  div.modal .modal-footer {
--  background-color: #eee;
++  background-color: #f5f5f5;
    padding: 14px 20px 15px;
    border-top: 1px solid #ddd;
    -webkit-border-radius: 0 0 6px 6px;
diff --cc bootstrap-1.0.0.min.css
index 1bedb844ba,bfe372ca6b..18283c4ad3
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@@ -50,7 -50,7 +50,7 @@@ a{color:#0069d6;text-decoration:none;li
  .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
  .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
  button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
--p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:12px;color:#bfbfbf;}
++p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:11px;color:#bfbfbf;}
  h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
  h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
  h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
@@@ -197,7 -197,7 +197,7 @@@ div.well{background:#f5f5f5;margin-bott
  div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
  div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
  div.modal .modal-body{padding:20px;}
--div.modal .modal-footer{background-color:#eee;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
++div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
  div.modal .modal-footer .btn{float:right;margin-left:10px;}
  div.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}div.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
  div.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
diff --cc lib/patterns.less
index b79438dea3,8e21655586..2163218f6f
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@@ -496,7 -496,7 +496,7 @@@ div.modal 
      padding: 20px;
    }
    .modal-footer {
--    background-color: #eee;
++    background-color: #f5f5f5;
      padding: 14px 20px 15px;
      border-top: 1px solid #ddd;
      .border-radius(0 0 6px 6px);