mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-03 10:23:05 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-07-26 22:18:16 -07:00
parent bed8e959b3 2cf1851d9f
commit 88dd20e6ac
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
less/mixins.less
View File

@@ -120,6 +120,12 @@
-webkit-transition-duration: @transition-duration;
transition-duration: @transition-duration;
}
.transition-transform(@transition) {
-webkit-transition: -webkit-transform @transition;
-moz-transition: -moz-transform @transition;
-o-transition: -o-transform @transition;
transition: transform @transition;
}
// Transformations
.rotate(@degrees) {

8
less/modals.less
View File

@@ -25,11 +25,11 @@
z-index: @zindex-modal-background;
// When fading in the modal, animate it to slide down
&.fade {
top: -25%;
.transition(~"opacity 0.3s linear, top 0.3s ease-out");
&.fade .modal-dialog {
.translate(0, -25%);
.transition-transform(~"0.3s ease-out");
}
&.fade.in { top: 0; }
&.fade.in .modal-dialog { .translate(0, 0)}
}
// Shell div to position the modal with bottom padding