2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	customize.html
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-18 20:15:45 -07:00
17 changed files with 179 additions and 179 deletions
+2
View File
@@ -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()