Skip to content

Commit 1b4b97d

Browse files
committed
rebuild css, add preserve-3d for faster animations, fix whitespace in mixins.less
1 parent d811808 commit 1b4b97d

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

bootstrap.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9-
* Date: Wed Nov 2 00:03:55 PDT 2011
9+
* Date: Thu Nov 3 14:42:54 PDT 2011
1010
*/
1111
/* Reset.less
1212
* 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).
@@ -697,6 +697,7 @@ textarea {
697697
color: #bfbfbf;
698698
}
699699
input, textarea {
700+
-webkit-transform-style: preserve-3d;
700701
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
701702
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
702703
-ms-transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -1369,6 +1370,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
13691370
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
13701371
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
13711372
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
1373+
-webkit-transform-style: preserve-3d;
13721374
-webkit-transition: none;
13731375
-moz-transition: none;
13741376
-ms-transition: none;
@@ -1892,6 +1894,7 @@ footer {
18921894
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
18931895
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
18941896
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1897+
-webkit-transform-style: preserve-3d;
18951898
-webkit-transition: 0.1s linear all;
18961899
-moz-transition: 0.1s linear all;
18971900
-ms-transition: 0.1s linear all;
@@ -2196,6 +2199,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
21962199
margin-top: 7px;
21972200
}
21982201
.modal.fade {
2202+
-webkit-transform-style: preserve-3d;
21992203
-webkit-transition: opacity .3s linear, top .3s ease-out;
22002204
-moz-transition: opacity .3s linear, top .3s ease-out;
22012205
-ms-transition: opacity .3s linear, top .3s ease-out;
@@ -2391,6 +2395,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
23912395
margin-bottom: 0;
23922396
}
23932397
.fade {
2398+
-webkit-transform-style: preserve-3d;
23942399
-webkit-transition: opacity 0.15s linear;
23952400
-moz-transition: opacity 0.15s linear;
23962401
-ms-transition: opacity 0.15s linear;

bootstrap.min.css

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/javascript.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ <h4>$().button(string)</h4>
347347
$('.btn').button('complete')
348348
&lt;/scrip&gt;</pre>
349349
<h3>Demo</h3>
350-
<button id="fat-btn" data-loading-text="foo" class="btn danger">Loading Demo</button>
350+
<button id="fat-btn" data-loading-text="loading..." class="btn danger">Loading Demo</button>
351351
<button class="btn" data-toggle="toggle">Toggle Demo</button>
352352
<script>
353353
$(function() {

js/bootstrap-alerts.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
if ( $.support.transition ) {
4141
transitionEnd = "TransitionEnd"
4242
if ( $.browser.webkit ) {
43-
transitionEnd = "webkitTransitionEnd"
43+
transitionEnd = "webkitTransitionEnd"
4444
} else if ( $.browser.mozilla ) {
45-
transitionEnd = "transitionend"
45+
transitionEnd = "transitionend"
4646
} else if ( $.browser.opera ) {
47-
transitionEnd = "oTransitionEnd"
47+
transitionEnd = "oTransitionEnd"
4848
}
4949
}
5050

lib/mixins.less

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,12 @@
111111

112112
// Transitions
113113
.transition(@transition) {
114-
-webkit-transition: @transition;
115-
-moz-transition: @transition;
116-
-ms-transition: @transition;
117-
-o-transition: @transition;
118-
transition: @transition;
114+
-webkit-transform-style: e(%("preserve-3d"));
115+
-webkit-transition: @transition;
116+
-moz-transition: @transition;
117+
-ms-transition: @transition;
118+
-o-transition: @transition;
119+
transition: @transition;
119120
}
120121

121122
// Background clipping

0 commit comments

Comments
 (0)