aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-11 22:02:26 -0700
committerMark Otto <[email protected]>2011-09-11 22:02:26 -0700
commit88f2f848b31f09dff025ee4270098a7c8f026000 (patch)
tree44914ebb82b03e1a135907fb4f314702677e5ae9
parentc73533ac73c5bed6f35576e8db2945ec11acb11c (diff)
downloadbootstrap-88f2f848b31f09dff025ee4270098a7c8f026000.tar.xz
bootstrap-88f2f848b31f09dff025ee4270098a7c8f026000.zip
change modal buttons back to be primary first
-rw-r--r--bootstrap-1.3.0.css4
-rw-r--r--bootstrap-1.3.0.min.css4
-rw-r--r--docs/index.html2
-rw-r--r--lib/patterns.less2
4 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index 9b4cf1d73..e4b74d6fe 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 21:42:35 PDT 2011
+ * Date: Sun Sep 11 22:02:16 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).
@@ -2113,7 +2113,6 @@ 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;
@@ -2125,6 +2124,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
clear: both;
}
.modal-footer .btn {
+ float: right;
margin-left: 5px;
}
.twipsy {
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index b97a2e0a3..adbcc16b4 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -299,9 +299,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.modal.fade.in{top:50%;}
.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;text-align:right;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;}
+.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:"";zoom:1;*display:inline;}
.modal-footer:after{clear:both;}
-.modal-footer .btn{margin-left:5px;}
+.modal-footer .btn{float:right;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.fade.in{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;}
diff --git a/docs/index.html b/docs/index.html
index 29ffa80bd..6c5096032 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1566,8 +1566,8 @@
<p>One fine body…</p>
</div>
<div class="modal-footer">
- <a href="#" class="btn secondary">Secondary</a>
<a href="#" class="btn primary">Primary</a>
+ <a href="#" class="btn secondary">Secondary</a>
</div>
</div>
</div>
diff --git a/lib/patterns.less b/lib/patterns.less
index 4fb1558e5..46c1b1cbd 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -779,8 +779,8 @@ input[type=submit].btn {
.box-shadow(inset 0 1px 0 #fff);
.clearfix();
margin-bottom: 0;
- text-align: right;
.btn {
+ float: right;
margin-left: 5px;
}
}