aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-11 21:12:55 -0700
committerMark Otto <[email protected]>2011-09-11 21:12:55 -0700
commitb77e3e2f304bfe0cf99a72a627095c5aa8046978 (patch)
tree51813d9eb73b7ba6c760afe737a893992e957b29
parentc876835a029f4137dcd64cec8a445d47bc0cf00f (diff)
downloadbootstrap-b77e3e2f304bfe0cf99a72a627095c5aa8046978.tar.xz
bootstrap-b77e3e2f304bfe0cf99a72a627095c5aa8046978.zip
theme.less file cleanup; fixing blockquotes in wells
-rw-r--r--bootstrap-1.3.0.css6
-rw-r--r--bootstrap-1.3.0.min.css2
-rw-r--r--docs/index.html9
-rw-r--r--lib/patterns.less4
-rw-r--r--lib/theme.less4
5 files changed, 20 insertions, 5 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index 9ec8fed57..1a1d870f4 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.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: Sun Sep 11 20:47:25 PDT 2011
+ * Date: Sun Sep 11 21:11:10 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).
@@ -2035,6 +2035,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
}
+.well blockquote {
+ border-color: #ddd;
+ border-color: rgba(0, 0, 0, 0.15);
+}
.modal-backdrop {
background-color: #000;
position: fixed;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 3d6d8e6c8..dfcdd1b87 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -291,7 +291,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.pagination a:hover,.pagination .active a{background-color:#c7eefe;}
.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;}
.pagination .next a{border:0;}
-.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
+.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
.modal-backdrop{background-color:#000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}.modal-backdrop.fade{opacity:0;}
.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-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-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;}
diff --git a/docs/index.html b/docs/index.html
index b6e305f1d..ccd972b09 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -165,7 +165,14 @@
</div>
<div class="span4">
<h3>Theming Bootstrap</h3>
- <p>Starting with v1.3.0, Bootstrap comes equipped with a customizable Less file, Theme.less. It's designed to replace default values in the library and provide a one-stop-shop for adding-on.</p>
+ <p>Starting with v1.3.0, Bootstrap includes a customizable file, theme.less, to tweak variables and mixins, and add new stuff ones.</p>
+<pre class="prettyprint">// Fonts
+@baseFontSize: 13px;
+@baseLineHeight: 18px;
+
+// Link color
+@linkColor: #0069d6;
+</pre>
</div>
</div><!-- /row -->
</section>
diff --git a/lib/patterns.less b/lib/patterns.less
index e2ef83ce2..4fb1558e5 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -718,6 +718,10 @@ input[type=submit].btn {
border: 1px solid rgba(0,0,0,.05);
.border-radius(4px);
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+ blockquote {
+ border-color: #ddd;
+ border-color: rgba(0,0,0,.15);
+ }
}
diff --git a/lib/theme.less b/lib/theme.less
index b8daa7244..b56111c06 100644
--- a/lib/theme.less
+++ b/lib/theme.less
@@ -19,13 +19,13 @@
// Font face, size, weight, and more
-// -------------------------------------
+// ---------------------------------
@baseFontSize: 13px; // base font-size
@baseLineHeight: 18px; // base line-height of elements (incrementally increases with font-size)
// Link color
-// ---------------
+// ----------
@linkColor: #0069d6;
// No need to specify a link hover color because we'll automatically do that for you in Preboot