aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-18 23:36:36 -0700
committerMark Otto <[email protected]>2013-08-18 23:36:36 -0700
commit7eddb94fa67550d2b50843bd0c29d1a76c2e1076 (patch)
tree9afaebbea5e07e46b37caa8096c727f32a5e16c3 /assets
parent2234f0e333e140a4b8ee785c5198b6a67e92d70f (diff)
downloadbootstrap-7eddb94fa67550d2b50843bd0c29d1a76c2e1076.tar.xz
bootstrap-7eddb94fa67550d2b50843bd0c29d1a76c2e1076.zip
simpler customizer files section; adds glyphicons.less
Diffstat (limited to 'assets')
-rw-r--r--assets/css/docs.css8
-rw-r--r--assets/js/customizer.js9
2 files changed, 10 insertions, 7 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css
index 9608fc457..da107292d 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -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;
+}
/*
diff --git a/assets/js/customizer.js b/assets/js/customizer.js
index 039e10d94..9ecf52ee2 100644
--- a/assets/js/customizer.js
+++ b/assets/js/customizer.js
@@ -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