diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
| commit | a1db2d7a5ee452ee272f0d040aceec6f947a8b75 (patch) | |
| tree | 124eb3d18c886b08b725a2b6e0c41c44c3abcff0 /assets | |
| parent | 0615142834343af8c40cd7ad47c498431745f080 (diff) | |
| parent | 2e9184366129139bb9b64b679a0e75a3c556465e (diff) | |
| download | bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.tar.xz bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.zip | |
Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/js/customizer.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/assets/js/customizer.js b/assets/js/customizer.js index 04adb75a2..039e10d94 100644 --- a/assets/js/customizer.js +++ b/assets/js/customizer.js @@ -158,6 +158,8 @@ window.onload = function () { // wait for load in a dumb way because B-0 css += __less['variables.less'] if (vars) css += generateCustomCSS(vars) css += __less['mixins.less'] + css += __less['normalize.less'] + css += __less['scaffolding.less'] css += $checked .map(function () { return __less[this.value] }) .toArray() |