From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 21 Aug 2011 03:19:03 +0000 (-0700)
Subject: merging in misc fixes to docs and css from other branch
X-Git-Tag: v1.1.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fcb67777a238581cd9c649c5455ca78c8370926;p=thirdparty%2Fbootstrap.git

merging in misc fixes to docs and css from other branch
---

2fcb67777a238581cd9c649c5455ca78c8370926
diff --cc bootstrap-1.0.0.css
index 2eb5d07de6,a2ba3c38f4..e2fb7da87b
--- 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 Aug 20 18:59:41 PDT 2011
 - * Date: Sat Aug 20 18:40:26 PDT 2011
++ * Date: Sat Aug 20 20:18:13 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
diff --cc lib/patterns.less
index db6f42bb45,eeb0107abd..69d747463c
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@@ -463,9 -480,10 +480,10 @@@ div.pagination 
    margin-bottom: 20px;
    padding: 19px;
    min-height: 20px;
-   border: 1px solid #ddd;
+   border: 1px solid #eee;
+   border: 1px solid rgba(0,0,0,.05);
    .border-radius(4px);
 -  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05);
 +  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
  }