From: Mark Otto <markdotto@gmail.com>
Date: Tue, 28 Jun 2011 22:11:44 +0000 (-0700)
Subject: Merge branch 'master' of http://git.local.twitter.com/baseline
X-Git-Tag: v1.0.0~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a92aeda6a11e9d40300bad48766e0f3b5f9d9397;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of http://git.local.twitter.com/baseline
---

a92aeda6a11e9d40300bad48766e0f3b5f9d9397
diff --cc bootstrap-1.0.0.css
index 721698cb16,e50f79c664..8e70ac8e3f
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@@ -595,9 -628,48 +595,9 @@@ pre 
    border-radius: 3px;
    white-space: pre-wrap;
  }
 -pre.css, pre.html {
 -  background-color: #fff;
 -}
 -pre ol {
 -  background-color: #feeed6;
 -  list-style: decimal;
 -  margin: -19px;
 -  padding-left: 59px;
 -  -webkit-border-radius: 2px;
 -  -moz-border-radius: 2px;
 -  border-radius: 2px;
 -}
 -pre ol li {
 -  background-color: #fff;
 -  padding: 0 10px;
 -  border-left: 1px solid rgba(0, 0, 0, 0.1);
 -  border-left-color: #fddfb3;
 -  font-size: 11px;
 -  line-height: 20px;
 -  color: #b3b3b3;
 -  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
 -  word-wrap: break-word;
 -}
 -pre ol li:first-child {
 -  padding-top: 9px;
 -}
 -pre ol li:last-child {
 -  padding-bottom: 9px;
 -}
 -span.html__tag_start, span.html__tag_end {
 -  color: #277ac1;
 -  font-weight: normal;
 -}
 -span.html__attr_name {
 -  color: #d78b41;
 -}
 -span.html__attr_value {
 -  color: #de4a3f;
 -}
  /*
   * Forms.less
-  * Base line styles for various input types, form layouts, and states
+  * Base styles for various input types, form layouts, and states
   */
  /* Global form styles
  -------------------------------------------------- */