mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-10-04 01:01:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	_layouts/default.html
	components.html
This commit is contained in:
Mark Otto
2013-12-21 11:17:29 -08:00
parent 07705673b6 5f9695ae7c
commit 02c40ab991
29 changed files with 931 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs-assets/js/customize.js
View File

File diff suppressed because one or more lines are too long

6
docs-assets/js/customizer.js
View File

@@ -8,7 +8,11 @@
/* jshint multistr:true */
window.onload = function () { // wait for load in a dumb way because B-0
var cw = '/*!\n * Bootstrap v3.1.0 (http://getbootstrap.com)\n\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)\n */\n\n'
var cw = '/*!\n' +
' * Bootstrap v3.1.0 (http://getbootstrap.com)\n' +
' * Copyright 2013 Twitter, Inc.\n' +
' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
' */\n\n';
function showError(msg, err) {
$('<div id="bsCustomizerAlert" class="bs-customizer-alert">\