aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-09 16:00:59 -0700
committerMark Otto <[email protected]>2011-09-09 16:00:59 -0700
commitdad058326e5aca45161887c246861e64d7192dca (patch)
treeb8d4448b973ac248d4f48f565c7d29724f6e0290
parent53135839f549a3278e39f912283b48180a2b6c8c (diff)
downloadbootstrap-dad058326e5aca45161887c246861e64d7192dca.tar.xz
bootstrap-dad058326e5aca45161887c246861e64d7192dca.zip
add version # to docs
-rw-r--r--bootstrap-1.3.0.css6
-rw-r--r--bootstrap-1.3.0.min.css4
-rw-r--r--docs/assets/css/docs.css4
-rw-r--r--docs/index.html3
-rw-r--r--lib/patterns.less4
5 files changed, 13 insertions, 8 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index d7e39b823..873df4c94 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: Fri Sep 9 00:02:14 PDT 2011
+ * Date: Fri Sep 9 10:06:26 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).
@@ -2006,6 +2006,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
box-shadow: inset 0 1px 0 #ffffff;
zoom: 1;
margin-bottom: 0;
+ text-align: right;
}
.modal-footer:before, .modal-footer:after {
display: table;
@@ -2015,8 +2016,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
clear: both;
}
.modal-footer .btn {
- float: right;
- margin-left: 10px;
+ margin-left: 5px;
}
.twipsy {
display: block;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index c0153cb1f..567922a54 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -277,9 +277,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.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;}
.modal-header{border-bottom:1px solid #eee;padding:5px 15px;}
.modal-body{padding:15px;}
-.modal-footer{background-color:#f5f5f5;padding:14px 15px 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;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer{background-color:#f5f5f5;padding:14px 15px 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;margin-bottom:0;text-align:right;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
.modal-footer:after{clear:both;}
-.modal-footer .btn{float:right;margin-left:10px;}
+.modal-footer .btn{margin-left:5px;}
.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;}.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;}
.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;}
.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 31ed82a7f..536446c23 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -111,6 +111,10 @@ section > .row {
margin-bottom: 9px;
color: #333;
}
+.quickstart .current-version,
+.quickstart .current-version a {
+ color: #999;
+}
.quickstart h6 {
color: #999;
}
diff --git a/docs/index.html b/docs/index.html
index 083e38b0b..4d722d867 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -97,6 +97,7 @@
<h6>Fork on GitHub</h6>
<p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
+ <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v1.2.0</a></p>
</div>
</div><!-- /row -->
</div>
@@ -1275,8 +1276,8 @@
<p>One fine body…</p>
</div>
<div class="modal-footer">
- <a href="#" class="btn primary">Primary</a>
<a href="#" class="btn secondary">Secondary</a>
+ <a href="#" class="btn primary">Primary</a>
</div>
</div>
</div>
diff --git a/lib/patterns.less b/lib/patterns.less
index f308e5ebf..0b72054f7 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -771,9 +771,9 @@ input[type=submit].btn {
.box-shadow(inset 0 1px 0 #fff);
.clearfix();
margin-bottom: 0;
+ text-align: right;
.btn {
- float: right;
- margin-left: 10px;
+ margin-left: 5px;
}
}