diff options
| author | Mark Otto <[email protected]> | 2012-12-20 14:02:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-20 14:02:54 -0800 |
| commit | be74ad7e0d44c30333b08e8200ce128b1ead5b38 (patch) | |
| tree | 6a62ee8e00a5eebebf682acae96d1778286f9589 /less/bootstrap.less | |
| parent | 28c928f01038a3edf61e7a3c9144a6456b929040 (diff) | |
| parent | 8eb1549842ef25e07cc062ba1d1c50c6b01381d7 (diff) | |
| download | bootstrap-be74ad7e0d44c30333b08e8200ce128b1ead5b38.tar.xz bootstrap-be74ad7e0d44c30333b08e8200ce128b1ead5b38.zip | |
Merge branch '3.0.0-wip' into bs3-normalize
Conflicts:
less/bootstrap.less
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index c4c72de83..d5710b6b4 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -52,11 +52,11 @@ // Components: Misc @import "thumbnails.less"; @import "media.less"; -@import "labels-badges.less"; +@import "badges.less"; @import "progress-bars.less"; @import "accordion.less"; @import "carousel.less"; -@import "hero-unit.less"; +@import "jumbotron.less"; // Utility classes @import "utilities.less"; // Has to be last to override when necessary |