mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
Merge pull request #12318 from twbs/fscking-customizer
Template the customizer's nav sidebar too
This commit is contained in:
commit
ebc4f998dc
@ -292,7 +292,8 @@ module.exports = function (grunt) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
files: {
|
files: {
|
||||||
'docs/_includes/customizer-variables.html': 'docs/customizer-variables.jade'
|
'docs/_includes/customizer-variables.html': 'docs/customizer-variables.jade',
|
||||||
|
'docs/_includes/nav-customize.html': 'docs/customizer-nav.jade'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -363,7 +364,7 @@ module.exports = function (grunt) {
|
|||||||
var testSubtasks = [];
|
var testSubtasks = [];
|
||||||
// Skip core tests if running a different subset of the test suite
|
// Skip core tests if running a different subset of the test suite
|
||||||
if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'core') {
|
if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'core') {
|
||||||
testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-vars-form']);
|
testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-html']);
|
||||||
}
|
}
|
||||||
// Skip HTML validation if running a different subset of the test suite
|
// Skip HTML validation if running a different subset of the test suite
|
||||||
if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') {
|
if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') {
|
||||||
@ -407,8 +408,8 @@ module.exports = function (grunt) {
|
|||||||
grunt.registerTask('build-glyphicons-data', generateGlyphiconsData);
|
grunt.registerTask('build-glyphicons-data', generateGlyphiconsData);
|
||||||
|
|
||||||
// task for building customizer
|
// task for building customizer
|
||||||
grunt.registerTask('build-customizer', ['build-customizer-vars-form', 'build-raw-files']);
|
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
|
||||||
grunt.registerTask('build-customizer-vars-form', 'jade');
|
grunt.registerTask('build-customizer-html', 'jade');
|
||||||
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
|
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
|
||||||
var banner = grunt.template.process('<%= banner %>');
|
var banner = grunt.template.process('<%= banner %>');
|
||||||
generateRawFilesJs(banner);
|
generateRawFilesJs(banner);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.-->
|
<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
|
||||||
<h2 id="colors">Colors</h2>
|
<h2 id="colors">Colors</h2>
|
||||||
<p>Gray and brand colors for use across Bootstrap.</p>
|
<p>Gray and brand colors for use across Bootstrap.</p>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -1683,4 +1683,4 @@
|
|||||||
<p class="help-block">For <code>@screen-lg-min</code> and up.</p>
|
<p class="help-block">For <code>@screen-lg-min</code> and up.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.-->
|
<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
|
@ -1,40 +1,46 @@
|
|||||||
<li>
|
|
||||||
<a href="#less">Less components</a>
|
<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
|
||||||
</li>
|
<li><a href="#less">Less components</a></li>
|
||||||
<li>
|
<li><a href="#plugins">jQuery plugins</a></li>
|
||||||
<a href="#plugins">jQuery plugins</a>
|
<li><a href="#less-variables">Less variables</a>
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="#less-variables">Less variables</a>
|
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li><a href="#variables-basics">Basics</a></li>
|
<li><a href="#colors">Colors</a></li>
|
||||||
<li><a href="#variables-buttons">Buttons</a></li>
|
<li><a href="#scaffolding">Scaffolding</a></li>
|
||||||
<li><a href="#variables-form-states">Form states</a></li>
|
<li><a href="#typography">Typography</a></li>
|
||||||
<li><a href="#variables-alerts">Alerts</a></li>
|
<li><a href="#components">Components</a></li>
|
||||||
<li><a href="#variables-navbar">Navbar</a></li>
|
<li><a href="#tables">Tables</a></li>
|
||||||
<li><a href="#variables-nav">Nav</a></li>
|
<li><a href="#buttons">Buttons</a></li>
|
||||||
<li><a href="#variables-tables">Tables</a></li>
|
<li><a href="#forms">Forms</a></li>
|
||||||
<li><a href="#variables-forms">Forms</a></li>
|
<li><a href="#dropdowns">Dropdowns</a></li>
|
||||||
<li><a href="#variables-dropdowns">Dropdowns</a></li>
|
<li><a href="#media-queries-breakpoints">Media queries breakpoints</a></li>
|
||||||
<li><a href="#variables-panels-wells">Panels and wells</a></li>
|
<li><a href="#grid-system">Grid system</a></li>
|
||||||
<li><a href="#variables-accordion">Accordion</a></li>
|
<li><a href="#navbar">Navbar</a></li>
|
||||||
<li><a href="#variables-badges">Badges</a></li>
|
<li><a href="#navs">Navs</a></li>
|
||||||
<li><a href="#variables-breadcrumbs">Breadcrumbs</a></li>
|
<li><a href="#tabs">Tabs</a></li>
|
||||||
<li><a href="#variables-jumbotron">Jumbotron</a></li>
|
<li><a href="#pills">Pills</a></li>
|
||||||
<li><a href="#variables-modals">Modals</a></li>
|
<li><a href="#pagination">Pagination</a></li>
|
||||||
<li><a href="#variables-carousel">Carousel</a></li>
|
<li><a href="#pager">Pager</a></li>
|
||||||
<li><a href="#variables-list-group">List group</a></li>
|
<li><a href="#jumbotron">Jumbotron</a></li>
|
||||||
<li><a href="#variables-thumbnails">Thumbnails</a></li>
|
<li><a href="#form-states-and-alerts">Form states and alerts</a></li>
|
||||||
<li><a href="#variables-progress">Progress bars</a></li>
|
<li><a href="#tooltips">Tooltips</a></li>
|
||||||
<li><a href="#variables-pagination">Pagination</a></li>
|
<li><a href="#popovers">Popovers</a></li>
|
||||||
<li><a href="#variables-pager">Pager</a></li>
|
<li><a href="#labels">Labels</a></li>
|
||||||
<li><a href="#variables-labels">Labels</a></li>
|
<li><a href="#modals">Modals</a></li>
|
||||||
<li><a href="#variables-tooltips-popovers">Tooltips and popovers</a></li>
|
<li><a href="#alerts">Alerts</a></li>
|
||||||
<li><a href="#variables-close">Close button</a></li>
|
<li><a href="#progress-bars">Progress bars</a></li>
|
||||||
<li><a href="#variables-type">Type</a></li>
|
<li><a href="#list-group">List group</a></li>
|
||||||
<li><a href="#variables-other">Other</a></li>
|
<li><a href="#panels">Panels</a></li>
|
||||||
|
<li><a href="#thumbnails">Thumbnails</a></li>
|
||||||
|
<li><a href="#wells">Wells</a></li>
|
||||||
|
<li><a href="#badges">Badges</a></li>
|
||||||
|
<li><a href="#breadcrumbs">Breadcrumbs</a></li>
|
||||||
|
<li><a href="#carousel">Carousel</a></li>
|
||||||
|
<li><a href="#close">Close</a></li>
|
||||||
|
<li><a href="#code">Code</a></li>
|
||||||
|
<li><a href="#type">Type</a></li>
|
||||||
|
<li><a href="#miscellaneous">Miscellaneous</a></li>
|
||||||
|
<li><a href="#container-sizes">Container sizes</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li><a href="#download">Download</a></li>
|
||||||
<a href="#download">Download</a>
|
<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
|
||||||
</li>
|
|
15
docs/customizer-nav.jade
Normal file
15
docs/customizer-nav.jade
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.
|
||||||
|
li
|
||||||
|
a(href='#less') Less components
|
||||||
|
li
|
||||||
|
a(href='#plugins') jQuery plugins
|
||||||
|
li
|
||||||
|
a(href='#less-variables') Less variables
|
||||||
|
ul.nav
|
||||||
|
each section in sections
|
||||||
|
if section.customizable
|
||||||
|
li
|
||||||
|
a(href='#'+section.id)= section.heading
|
||||||
|
li
|
||||||
|
a(href='#download') Download
|
||||||
|
// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.
|
@ -1,4 +1,4 @@
|
|||||||
// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.
|
// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.
|
||||||
each section in sections
|
each section in sections
|
||||||
if section.customizable
|
if section.customizable
|
||||||
h2(id=section.id)= section.heading
|
h2(id=section.id)= section.heading
|
||||||
@ -18,4 +18,4 @@ each section in sections
|
|||||||
data-var=variable.name)
|
data-var=variable.name)
|
||||||
if variable.docstring
|
if variable.docstring
|
||||||
p.help-block!= variable.docstring.html
|
p.help-block!= variable.docstring.html
|
||||||
// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.
|
// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.
|
||||||
|
Loading…
Reference in New Issue
Block a user