diff options
| author | Jacob Thornton <[email protected]> | 2012-01-28 15:15:38 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-28 15:15:38 -0800 |
| commit | ea1c21d62d66b929be9fcdf389d4d5835c1e6546 (patch) | |
| tree | e6ee3972b2283753e2b12c3924bc73c02c762b45 /less/bootstrap.less | |
| parent | 6493cd22c0c72c60354ebbd6d7887bcbbf4e263a (diff) | |
| parent | 23e076c1bb73c4950d473cb36218937b2607bc13 (diff) | |
| download | bootstrap-ea1c21d62d66b929be9fcdf389d4d5835c1e6546.tar.xz bootstrap-ea1c21d62d66b929be9fcdf389d4d5835c1e6546.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index 3dad408c9..ea84f4899 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -33,6 +33,11 @@ @import "component-animations.less"; @import "close.less"; +// Components: Buttons & Alerts +@import "buttons.less"; +@import "button-groups.less"; +@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less + // Components: Nav @import "navs.less"; @import "navbar.less"; @@ -45,11 +50,6 @@ @import "tooltip.less"; @import "popovers.less"; -// Components: Buttons & Alerts -@import "buttons.less"; -@import "button-groups.less"; -@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less - // Components: Misc @import "thumbnails.less"; @import "labels.less"; |