Commit f5c13a3e authored by Mark Otto's avatar Mark Otto

revert an earlier change to move the component-animations.less file because it...

revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
parent f6fe62cd
...@@ -182,6 +182,12 @@ base_url: "../" ...@@ -182,6 +182,12 @@ base_url: "../"
<div class="col-xs-6 col-sm-4"> <div class="col-xs-6 col-sm-4">
<h3>JavaScript components</h3> <h3>JavaScript components</h3>
<div class="checkbox">
<label>
<input type="checkbox" checked value="component-animations.less">
Component animations (for JS)
</label>
</div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" checked value="dropdowns.less"> <input type="checkbox" checked value="dropdowns.less">
...@@ -226,12 +232,6 @@ base_url: "../" ...@@ -226,12 +232,6 @@ base_url: "../"
Responsive utilities Responsive utilities
</label> </label>
</div> </div>
<div class="checkbox">
<label>
<input type="checkbox" checked value="component-animations.less">
Component animations (for JS)
</label>
</div>
</div><!-- .col-xs-6 .col-sm-4 --> </div><!-- .col-xs-6 .col-sm-4 -->
</div><!-- /.row --> </div><!-- /.row -->
</div> </div>
......
...@@ -2266,6 +2266,27 @@ input[type="reset"].btn-block, ...@@ -2266,6 +2266,27 @@ input[type="reset"].btn-block,
input[type="button"].btn-block { input[type="button"].btn-block {
width: 100%; width: 100%;
} }
.fade {
opacity: 0;
-webkit-transition: opacity .15s linear;
transition: opacity .15s linear;
}
.fade.in {
opacity: 1;
}
.collapse {
display: none;
}
.collapse.in {
display: block;
}
.collapsing {
position: relative;
height: 0;
overflow: hidden;
-webkit-transition: height .35s ease;
transition: height .35s ease;
}
@font-face { @font-face {
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot');
...@@ -5418,27 +5439,6 @@ button.close { ...@@ -5418,27 +5439,6 @@ button.close {
bottom: 20px; bottom: 20px;
} }
} }
.fade {
opacity: 0;
-webkit-transition: opacity .15s linear;
transition: opacity .15s linear;
}
.fade.in {
opacity: 1;
}
.collapse {
display: none;
}
.collapse.in {
display: block;
}
.collapsing {
position: relative;
height: 0;
overflow: hidden;
-webkit-transition: height .35s ease;
transition: height .35s ease;
}
.clearfix:before, .clearfix:before,
.clearfix:after, .clearfix:after,
.container:before, .container:before,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
@import "buttons.less"; @import "buttons.less";
// Components // Components
@import "component-animations.less";
@import "glyphicons.less"; @import "glyphicons.less";
@import "dropdowns.less"; @import "dropdowns.less";
@import "button-groups.less"; @import "button-groups.less";
...@@ -44,6 +45,5 @@ ...@@ -44,6 +45,5 @@
@import "carousel.less"; @import "carousel.less";
// Utility classes // Utility classes
@import "component-animations.less";
@import "utilities.less"; @import "utilities.less";
@import "responsive-utilities.less"; @import "responsive-utilities.less";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment