diff options
| author | Jacob Thornton <[email protected]> | 2011-09-12 21:06:53 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-12 21:06:53 -0700 |
| commit | e34bc6e29400e12517fe215bf379f1bab13ab451 (patch) | |
| tree | 3d20f3e5a643c10456488366afba7cbc8e0abec8 /lib/bootstrap.less | |
| parent | 5ee11ec8bdba2e7d0d1cf95168f75905b61059fb (diff) | |
| parent | 206334ba70c22dc91ec9381f9693ed6356358994 (diff) | |
| download | bootstrap-e34bc6e29400e12517fe215bf379f1bab13ab451.tar.xz bootstrap-e34bc6e29400e12517fe215bf379f1bab13ab451.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'lib/bootstrap.less')
| -rw-r--r-- | lib/bootstrap.less | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 364dafa5d..2f9ee80b8 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -12,9 +12,11 @@ // CSS Reset @import "reset.less"; -// Core -@import "preboot.less"; -@import "theme.less"; +// Core variables and mixins +@import "variables.less"; // Modify this for custom colors, font-sizes, etc +@import "mixins.less"; + +// Grid system and page structure @import "scaffolding.less"; // Styled patterns and elements |