mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

simpler customizer files section; adds glyphicons.less

Browse Source
This commit is contained in:
Mark Otto
2013-08-18 23:36:36 -07:00
parent 2234f0e333
commit 7eddb94fa6
3 changed files with 98 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/docs.css
+5 -3
View File
@@ -1032,13 +1032,15 @@ h3[id] {
border-bottom: 1px solid #b94441;
}
.bs-customizer-alert .close {
margin-top: -2px;
color: #fff;
text-shadow: none;
margin-top: -4px;
font-size: 24px;
}
.bs-customizer-alert p {
margin-bottom: 0;
}
.bs-customizer-alert .glyphicon {
margin-right: 3px;
}
/*
assets/js/customizer.js
+5 -4
View File
@@ -5,6 +5,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
$('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
<div class="container">\
<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</a>\
<span class="glyphicon glyphicon-warning-sign"></span>
<p class="bs-customizer-alert-text">' + msg + '</p>' +
(err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') + '\
</div>\
@@ -51,7 +52,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
history.replaceState(false, document.title, window.location.origin + window.location.pathname + '?id=' + result.id)
})
.error(function(err) {
showError('<strong>Error</strong> Could not save gist file, configuration not saved.', err)
showError('<strong>Ruh roh!</strong> Could not save gist file, configuration not saved.', err)
})
}
@@ -108,7 +109,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
}
function generateZip(css, js, complete) {
if (!css && !js) return showError('<strong>Error</strong> No Bootstrap files selected.', new Error('no Bootstrap'))
if (!css && !js) return showError('<strong>Ruh roh!</strong> No Bootstrap files selected.', new Error('no Bootstrap'))
var zip = new JSZip()
@@ -174,7 +175,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
, filename: 'bootstrap.css'
}).parse(css, function (err, tree) {
if (err) {
return showError('<strong>Error</strong> Could not parse less files.', err)
return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
}
result = {
'bootstrap.css' : cw + tree.toCSS(),
@@ -182,7 +183,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
}
})
} catch (err) {
return showError('<strong>Error</strong> Could not parse less files.', err)
return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
}
return result