diff options
| author | Mark Otto <[email protected]> | 2013-03-01 13:53:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-01 13:53:21 -0800 |
| commit | 1f160d4c12e2801d5ede245099d74386f91214a8 (patch) | |
| tree | 5984bee820ad1f6eec6db7de511f1ad46fb51a45 /less/bootstrap.less | |
| parent | f59e4fdba32b99bdd4e6387f889dda4c9270f762 (diff) | |
| parent | e0647e8273aee5bd09d5461f6f974e36b3d0c3c9 (diff) | |
| download | bootstrap-1f160d4c12e2801d5ede245099d74386f91214a8.tar.xz bootstrap-1f160d4c12e2801d5ede245099d74386f91214a8.zip | |
Merge branch '3.0.0-wip' into bs3_makefile_separated_done
Conflicts:
Makefile
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index 0a4dd9ca5..461f9ecea 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,7 +1,7 @@ /*! * Bootstrap v3.0.0 * - * Copyright 2012 Twitter, Inc + * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * @@ -9,11 +9,12 @@ */ // Core variables and mixins -@import "variables.less"; // Modify this for custom colors, font-sizes, etc +@import "variables.less"; @import "mixins.less"; // Reset @import "normalize.less"; +@import "print.less"; // Core CSS @import "scaffolding.less"; @@ -49,7 +50,8 @@ @import "alerts.less"; @import "thumbnails.less"; @import "media.less"; -@import "counters.less"; +@import "labels.less"; +@import "badges.less"; @import "progress-bars.less"; @import "accordion.less"; @import "carousel.less"; |