Skip to content

B
bootstrap
Commit 12500047 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' into pr/11750 

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
parents b92bee99 475bbd4d
Hide whitespace changes
Inline Side-by-side
Showing with 1967 additions and 983 deletions
Gruntfile.js
View file @ 12500047
/* jshint node: true */ /* jshint node: true */
module.exports = function(grunt) { module.exports = function (grunt) {
"use strict"; "use strict";
// Force use of Unix newlines // Force use of Unix newlines
...@@ -40,6 +40,21 @@ module.exports = function(grunt) { ...@@ -40,6 +40,21 @@ module.exports = function(grunt) {
} }
}, },
jscs: {
options: {
config: 'js/.jscs.json',
},
gruntfile: {
src: ['Gruntfile.js']
},
src: {
src: ['js/*.js']
},
test: {
src: ['js/tests/unit/*.js']
}
},
concat: { concat: {
options: { options: {
banner: '<%= banner %><%= jqueryCheck %>', banner: '<%= banner %><%= jqueryCheck %>',
...@@ -72,6 +87,16 @@ module.exports = function(grunt) { ...@@ -72,6 +87,16 @@ module.exports = function(grunt) {
bootstrap: { bootstrap: {
src: ['<%= concat.bootstrap.dest %>'], src: ['<%= concat.bootstrap.dest %>'],
dest: 'dist/js/<%= pkg.name %>.min.js' dest: 'dist/js/<%= pkg.name %>.min.js'
},
customize: {
src: [
'docs-assets/js/less.js',
'docs-assets/js/jszip.js',
'docs-assets/js/uglify.js',
'docs-assets/js/filesaver.js',
'docs-assets/js/customizer.js'
],
dest: 'docs-assets/js/customize.js'
} }
}, },
...@@ -278,6 +303,7 @@ module.exports = function(grunt) { ...@@ -278,6 +303,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-html-validation'); grunt.loadNpmTasks('grunt-html-validation');
grunt.loadNpmTasks('grunt-jekyll'); grunt.loadNpmTasks('grunt-jekyll');
grunt.loadNpmTasks('grunt-jscs-checker');
grunt.loadNpmTasks('grunt-recess'); grunt.loadNpmTasks('grunt-recess');
grunt.loadNpmTasks('grunt-saucelabs'); grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadNpmTasks('grunt-sed'); grunt.loadNpmTasks('grunt-sed');
...@@ -286,7 +312,7 @@ module.exports = function(grunt) { ...@@ -286,7 +312,7 @@ module.exports = function(grunt) {
grunt.registerTask('validate-html', ['jekyll', 'validation']); grunt.registerTask('validate-html', ['jekyll', 'validation']);
// Test task. // Test task.
var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html']; var testSubtasks = ['dist-css', 'jshint', 'jscs', 'qunit', 'validate-html'];
// Only run Sauce Labs tests if there's a Sauce access key // Only run Sauce Labs tests if there's a Sauce access key
if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined') { if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined') {
testSubtasks.push('connect'); testSubtasks.push('connect');
......
README.md
View file @ 12500047
...@@ -123,7 +123,6 @@ Keep track of development and community news. ...@@ -123,7 +123,6 @@ Keep track of development and community news.
* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap). * Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). * Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
* Have a question that's not a feature request or bug report? [Ask on the mailing list.](http://groups.google.com/group/twitter-bootstrap)
* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel. * Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
......
_includes/footer.html
View file @ 12500047
...@@ -2,19 +2,15 @@ ...@@ -2,19 +2,15 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="{{ page.base_url }}dist/js/bootstrap.js"></script> <script src="{{ page.base_url }}dist/js/bootstrap.min.js"></script>
<script src="{{ page.base_url }}docs-assets/js/holder.js"></script> <script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
<script src="{{ page.base_url }}docs-assets/js/application.js"></script> <script src="{{ page.base_url }}docs-assets/js/application.js"></script>
{% if page.slug == "customize" %} {% if page.slug == "customize" %}
<script src="{{ page.base_url }}docs-assets/js/less.js"></script>
<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script>
<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script>
<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script>
<script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script> <script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script> <script src="{{ page.base_url }}docs-assets/js/customize.js"></script>
{% endif %} {% endif %}
{% comment %} {% comment %}
......
_includes/header.html
View file @ 12500047
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.">
<meta name="author" content=""> <meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development">
<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contibutors">
<title> <title>
{% if page.title == "Bootstrap" %} {% if page.title == "Bootstrap" %}
......
_includes/nav-components.html
View file @ 12500047
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
<li><a href="#list-group-basic">Basic example</a></li> <li><a href="#list-group-basic">Basic example</a></li>
<li><a href="#list-group-badges">Badges</a></li> <li><a href="#list-group-badges">Badges</a></li>
<li><a href="#list-group-linked">Linked items</a></li> <li><a href="#list-group-linked">Linked items</a></li>
<li><a href="#list-group-contextual-classes">Contextual classes</a></li>
<li><a href="#list-group-custom-content">Custom content</a></li> <li><a href="#list-group-custom-content">Custom content</a></li>
</ul> </ul>
</li> </li>
......
_includes/nav-css.html
View file @ 12500047
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<li><a href="#grid-media-queries">Media queries</a></li> <li><a href="#grid-media-queries">Media queries</a></li>
<li><a href="#grid-options">Grid options</a></li> <li><a href="#grid-options">Grid options</a></li>
<li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li> <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
<li><a href="#grid-example-fluid">Ex: Fluid container</a></li>
<li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li> <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
<li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li> <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
<li><a href="#grid-responsive-resets">Responsive column resets</a></li> <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
...@@ -37,7 +38,14 @@ ...@@ -37,7 +38,14 @@
<li><a href="#type-lists">Lists</a></li> <li><a href="#type-lists">Lists</a></li>
</ul> </ul>
</li> </li>
<li><a href="#code">Code</a></li> <li>
<a href="#code">Code</a>
<ul class="nav">
<li><a href="#code-inline">Inline code</a></li>
<li><a href="#code-user-input">User input</a></li>
<li><a href="#code-block">Blocks of code</a></li>
</ul>
</li>
<li> <li>
<a href="#tables">Tables</a> <a href="#tables">Tables</a>
<ul class="nav"> <ul class="nav">
......
about.html
View file @ 12500047
...@@ -69,7 +69,6 @@ base_url: "../" ...@@ -69,7 +69,6 @@ base_url: "../"
<p class="lead">Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.</p> <p class="lead">Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.</p>
<ul> <ul>
<li>Read and subscribe to <a href="http://blog.getbootstrap.com/">The Official Bootstrap Blog</a>.</li> <li>Read and subscribe to <a href="http://blog.getbootstrap.com/">The Official Bootstrap Blog</a>.</li>
<li>Have a question that's not a feature request or bug report? <a href="http://groups.google.com/group/twitter-bootstrap">Ask on the mailing list.</a></li>
<li>Chat with fellow Bootstrappers using IRC in the <code>irc.freenode.net</code> server, in the <a href="irc://irc.freenode.net/#twitter-bootstrap">##twitter-bootstrap channel</a>.</li> <li>Chat with fellow Bootstrappers using IRC in the <code>irc.freenode.net</code> server, in the <a href="irc://irc.freenode.net/#twitter-bootstrap">##twitter-bootstrap channel</a>.</li>
<li>Find inspiring examples of people building with Bootstrap at the <a href="http://expo.getbootstrap.com">Bootstrap Expo</a>.</li> <li>Find inspiring examples of people building with Bootstrap at the <a href="http://expo.getbootstrap.com">Bootstrap Expo</a>.</li>
</ul> </ul>
...@@ -89,6 +88,7 @@ base_url: "../" ...@@ -89,6 +88,7 @@ base_url: "../"
<li><a href="http://www.oneskyapp.com/docs/bootstrap/ru">Bootstrap по-русски (Russian)</a></li> <li><a href="http://www.oneskyapp.com/docs/bootstrap/ru">Bootstrap по-русски (Russian)</a></li>
<li><a href="http://www.oneskyapp.com/docs/bootstrap/es">Bootstrap en Español (Spanish)</a></li> <li><a href="http://www.oneskyapp.com/docs/bootstrap/es">Bootstrap en Español (Spanish)</a></li>
<li><a href="http://twbs.site-konstruktor.com.ua">Bootstrap ua Українською (Ukrainian)</a></li> <li><a href="http://twbs.site-konstruktor.com.ua">Bootstrap ua Українською (Ukrainian)</a></li>
<li><a href="http://www.oneskyapp.com/docs/bootstrap/fr">Bootstrap en Français (French)</a></li>
</ul> </ul>
<p>Have another language to add, or perhaps a different or better translation? Let us know by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a>.</p> <p>Have another language to add, or perhaps a different or better translation? Let us know by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a>.</p>
</div> </div>
bower.json
View file @ 12500047
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name": "bootstrap", "name": "bootstrap",
"version": "3.0.3", "version": "3.0.3",
"main": [ "main": [
"./dist/js/bootstrap.js", "./dist/js/bootstrap.js",
"./dist/css/bootstrap.css", "./dist/css/bootstrap.css",
"./dist/fonts/glyphicons-halflings-regular.eot", "./dist/fonts/glyphicons-halflings-regular.eot",
"./dist/fonts/glyphicons-halflings-regular.svg", "./dist/fonts/glyphicons-halflings-regular.svg",
"./dist/fonts/glyphicons-halflings-regular.ttf", "./dist/fonts/glyphicons-halflings-regular.ttf",
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
"CNAME", "CNAME",
"CONTRIBUTING.md", "CONTRIBUTING.md",
"Gruntfile.js", "Gruntfile.js",
"browserstack.json",
"composer.json", "composer.json",
"package.json", "package.json",
"*.html" "*.html"
......
components.html
View file @ 12500047
...@@ -16,808 +16,810 @@ base_url: "../" ...@@ -16,808 +16,810 @@ base_url: "../"
<h2 id="glyphicons-glyphs">Available glyphs</h2> <h2 id="glyphicons-glyphs">Available glyphs</h2>
<p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p> <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
<ul class="bs-glyphicons"> <div class="bs-glyphicons">
<li> <ul class="bs-glyphicons-list">
<span class="glyphicon glyphicon-adjust"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-adjust</span> <span class="glyphicon glyphicon-adjust"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-adjust</span>
<li> </li>
<span class="glyphicon glyphicon-align-center"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-align-center</span> <span class="glyphicon glyphicon-align-center"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-align-center</span>
<li> </li>
<span class="glyphicon glyphicon-align-justify"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-align-justify</span> <span class="glyphicon glyphicon-align-justify"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-align-justify</span>
<li> </li>
<span class="glyphicon glyphicon-align-left"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-align-left</span> <span class="glyphicon glyphicon-align-left"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-align-left</span>
<li> </li>
<span class="glyphicon glyphicon-align-right"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-align-right</span> <span class="glyphicon glyphicon-align-right"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-align-right</span>
<li> </li>
<span class="glyphicon glyphicon-arrow-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-arrow-down</span> <span class="glyphicon glyphicon-arrow-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-down</span>
<li> </li>
<span class="glyphicon glyphicon-arrow-left"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-arrow-left</span> <span class="glyphicon glyphicon-arrow-left"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-left</span>
<li> </li>
<span class="glyphicon glyphicon-arrow-right"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-arrow-right</span> <span class="glyphicon glyphicon-arrow-right"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-right</span>
<li> </li>
<span class="glyphicon glyphicon-arrow-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-arrow-up</span> <span class="glyphicon glyphicon-arrow-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-up</span>
<li> </li>
<span class="glyphicon glyphicon-asterisk"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-asterisk</span> <span class="glyphicon glyphicon-asterisk"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-asterisk</span>
<li> </li>
<span class="glyphicon glyphicon-backward"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-backward</span> <span class="glyphicon glyphicon-backward"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-backward</span>
<li> </li>
<span class="glyphicon glyphicon-ban-circle"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-ban-circle</span> <span class="glyphicon glyphicon-ban-circle"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-ban-circle</span>
<li> </li>
<span class="glyphicon glyphicon-barcode"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-barcode</span> <span class="glyphicon glyphicon-barcode"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-barcode</span>
<li> </li>
<span class="glyphicon glyphicon-bell"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-bell</span> <span class="glyphicon glyphicon-bell"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-bell</span>
<li> </li>
<span class="glyphicon glyphicon-bold"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-bold</span> <span class="glyphicon glyphicon-bold"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-bold</span>
<li> </li>
<span class="glyphicon glyphicon-book"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-book</span> <span class="glyphicon glyphicon-book"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-book</span>
<li> </li>
<span class="glyphicon glyphicon-bookmark"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-bookmark</span> <span class="glyphicon glyphicon-bookmark"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-bookmark</span>
<li> </li>
<span class="glyphicon glyphicon-briefcase"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-briefcase</span> <span class="glyphicon glyphicon-briefcase"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-briefcase</span>
<li> </li>
<span class="glyphicon glyphicon-bullhorn"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-bullhorn</span> <span class="glyphicon glyphicon-bullhorn"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-bullhorn</span>
<li> </li>
<span class="glyphicon glyphicon-calendar"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-calendar</span> <span class="glyphicon glyphicon-calendar"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-calendar</span>
<li> </li>
<span class="glyphicon glyphicon-camera"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-camera</span> <span class="glyphicon glyphicon-camera"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-camera</span>
<li> </li>
<span class="glyphicon glyphicon-certificate"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-certificate</span> <span class="glyphicon glyphicon-certificate"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-certificate</span>
<li> </li>
<span class="glyphicon glyphicon-check"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-check</span> <span class="glyphicon glyphicon-check"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-check</span>
<li> </li>
<span class="glyphicon glyphicon-chevron-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-chevron-down</span> <span class="glyphicon glyphicon-chevron-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-down</span>
<li> </li>
<span class="glyphicon glyphicon-chevron-left"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-chevron-left</span> <span class="glyphicon glyphicon-chevron-left"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-left</span>
<li> </li>
<span class="glyphicon glyphicon-chevron-right"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-chevron-right</span> <span class="glyphicon glyphicon-chevron-right"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-right</span>
<li> </li>
<span class="glyphicon glyphicon-chevron-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-chevron-up</span> <span class="glyphicon glyphicon-chevron-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-up</span>
<li> </li>
<span class="glyphicon glyphicon-circle-arrow-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-down</span> <span class="glyphicon glyphicon-circle-arrow-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-down</span>
<li> </li>
<span class="glyphicon glyphicon-circle-arrow-left"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-left</span> <span class="glyphicon glyphicon-circle-arrow-left"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-left</span>
<li> </li>
<span class="glyphicon glyphicon-circle-arrow-right"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-right</span> <span class="glyphicon glyphicon-circle-arrow-right"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-right</span>
<li> </li>
<span class="glyphicon glyphicon-circle-arrow-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-up</span> <span class="glyphicon glyphicon-circle-arrow-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-up</span>
<li> </li>
<span class="glyphicon glyphicon-cloud"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-cloud</span> <span class="glyphicon glyphicon-cloud"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-cloud</span>
<li> </li>
<span class="glyphicon glyphicon-cloud-download"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-cloud-download</span> <span class="glyphicon glyphicon-cloud-download"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-cloud-download</span>
<li> </li>
<span class="glyphicon glyphicon-cloud-upload"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-cloud-upload</span> <span class="glyphicon glyphicon-cloud-upload"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-cloud-upload</span>
<li> </li>
<span class="glyphicon glyphicon-cog"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-cog</span> <span class="glyphicon glyphicon-cog"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-cog</span>
<li> </li>
<span class="glyphicon glyphicon-collapse-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-collapse-down</span> <span class="glyphicon glyphicon-collapse-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-collapse-down</span>
<li> </li>
<span class="glyphicon glyphicon-collapse-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-collapse-up</span> <span class="glyphicon glyphicon-collapse-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-collapse-up</span>
<li> </li>
<span class="glyphicon glyphicon-comment"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-comment</span> <span class="glyphicon glyphicon-comment"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-comment</span>
<li> </li>
<span class="glyphicon glyphicon-compressed"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-compressed</span> <span class="glyphicon glyphicon-compressed"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-compressed</span>
<li> </li>
<span class="glyphicon glyphicon-copyright-mark"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-copyright-mark</span> <span class="glyphicon glyphicon-copyright-mark"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-copyright-mark</span>
<li> </li>
<span class="glyphicon glyphicon-credit-card"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-credit-card</span> <span class="glyphicon glyphicon-credit-card"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-credit-card</span>
<li> </li>
<span class="glyphicon glyphicon-cutlery"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-cutlery</span> <span class="glyphicon glyphicon-cutlery"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-cutlery</span>
<li> </li>
<span class="glyphicon glyphicon-dashboard"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-dashboard</span> <span class="glyphicon glyphicon-dashboard"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-dashboard</span>
<li> </li>
<span class="glyphicon glyphicon-download"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-download</span> <span class="glyphicon glyphicon-download"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-download</span>
<li> </li>
<span class="glyphicon glyphicon-download-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-download-alt</span> <span class="glyphicon glyphicon-download-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-download-alt</span>
<li> </li>
<span class="glyphicon glyphicon-earphone"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-earphone</span> <span class="glyphicon glyphicon-earphone"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-earphone</span>
<li> </li>
<span class="glyphicon glyphicon-edit"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-edit</span> <span class="glyphicon glyphicon-edit"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-edit</span>
<li> </li>
<span class="glyphicon glyphicon-eject"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-eject</span> <span class="glyphicon glyphicon-eject"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-eject</span>
<li> </li>
<span class="glyphicon glyphicon-envelope"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-envelope</span> <span class="glyphicon glyphicon-envelope"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-envelope</span>
<li> </li>
<span class="glyphicon glyphicon-euro"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-euro</span> <span class="glyphicon glyphicon-euro"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-euro</span>
<li> </li>
<span class="glyphicon glyphicon-exclamation-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-exclamation-sign</span> <span class="glyphicon glyphicon-exclamation-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-exclamation-sign</span>
<li> </li>
<span class="glyphicon glyphicon-expand"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-expand</span> <span class="glyphicon glyphicon-expand"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-expand</span>
<li> </li>
<span class="glyphicon glyphicon-export"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-export</span> <span class="glyphicon glyphicon-export"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-export</span>
<li> </li>
<span class="glyphicon glyphicon-eye-close"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-eye-close</span> <span class="glyphicon glyphicon-eye-close"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-eye-close</span>
<li> </li>
<span class="glyphicon glyphicon-eye-open"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-eye-open</span> <span class="glyphicon glyphicon-eye-open"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-eye-open</span>
<li> </li>
<span class="glyphicon glyphicon-facetime-video"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-facetime-video</span> <span class="glyphicon glyphicon-facetime-video"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-facetime-video</span>
<li> </li>
<span class="glyphicon glyphicon-fast-backward"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-fast-backward</span> <span class="glyphicon glyphicon-fast-backward"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-fast-backward</span>
<li> </li>
<span class="glyphicon glyphicon-fast-forward"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-fast-forward</span> <span class="glyphicon glyphicon-fast-forward"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-fast-forward</span>
<li> </li>
<span class="glyphicon glyphicon-file"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-file</span> <span class="glyphicon glyphicon-file"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-file</span>
<li> </li>
<span class="glyphicon glyphicon-film"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-film</span> <span class="glyphicon glyphicon-film"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-film</span>
<li> </li>
<span class="glyphicon glyphicon-filter"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-filter</span> <span class="glyphicon glyphicon-filter"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-filter</span>
<li> </li>
<span class="glyphicon glyphicon-fire"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-fire</span> <span class="glyphicon glyphicon-fire"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-fire</span>
<li> </li>
<span class="glyphicon glyphicon-flag"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-flag</span> <span class="glyphicon glyphicon-flag"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-flag</span>
<li> </li>
<span class="glyphicon glyphicon-flash"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-flash</span> <span class="glyphicon glyphicon-flash"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-flash</span>
<li> </li>
<span class="glyphicon glyphicon-floppy-disk"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-floppy-disk</span> <span class="glyphicon glyphicon-floppy-disk"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-floppy-disk</span>
<li> </li>
<span class="glyphicon glyphicon-floppy-open"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-floppy-open</span> <span class="glyphicon glyphicon-floppy-open"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-floppy-open</span>
<li> </li>
<span class="glyphicon glyphicon-floppy-remove"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-floppy-remove</span> <span class="glyphicon glyphicon-floppy-remove"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-floppy-remove</span>
<li> </li>
<span class="glyphicon glyphicon-floppy-save"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-floppy-save</span> <span class="glyphicon glyphicon-floppy-save"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-floppy-save</span>
<li> </li>
<span class="glyphicon glyphicon-floppy-saved"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-floppy-saved</span> <span class="glyphicon glyphicon-floppy-saved"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-floppy-saved</span>
<li> </li>
<span class="glyphicon glyphicon-folder-close"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-folder-close</span> <span class="glyphicon glyphicon-folder-close"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-folder-close</span>
<li> </li>
<span class="glyphicon glyphicon-folder-open"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-folder-open</span> <span class="glyphicon glyphicon-folder-open"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-folder-open</span>
<li> </li>
<span class="glyphicon glyphicon-font"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-font</span> <span class="glyphicon glyphicon-font"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-font</span>
<li> </li>
<span class="glyphicon glyphicon-forward"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-forward</span> <span class="glyphicon glyphicon-forward"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-forward</span>
<li> </li>
<span class="glyphicon glyphicon-fullscreen"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-fullscreen</span> <span class="glyphicon glyphicon-fullscreen"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-fullscreen</span>
<li> </li>
<span class="glyphicon glyphicon-gbp"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-gbp</span> <span class="glyphicon glyphicon-gbp"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-gbp</span>
<li> </li>
<span class="glyphicon glyphicon-gift"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-gift</span> <span class="glyphicon glyphicon-gift"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-gift</span>
<li> </li>
<span class="glyphicon glyphicon-glass"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-glass</span> <span class="glyphicon glyphicon-glass"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-glass</span>
<li> </li>
<span class="glyphicon glyphicon-globe"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-globe</span> <span class="glyphicon glyphicon-globe"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-globe</span>
<li> </li>
<span class="glyphicon glyphicon-hand-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-hand-down</span> <span class="glyphicon glyphicon-hand-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-hand-down</span>
<li> </li>
<span class="glyphicon glyphicon-hand-left"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-hand-left</span> <span class="glyphicon glyphicon-hand-left"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-hand-left</span>
<li> </li>
<span class="glyphicon glyphicon-hand-right"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-hand-right</span> <span class="glyphicon glyphicon-hand-right"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-hand-right</span>
<li> </li>
<span class="glyphicon glyphicon-hand-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-hand-up</span> <span class="glyphicon glyphicon-hand-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-hand-up</span>
<li> </li>
<span class="glyphicon glyphicon-hd-video"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-hd-video</span> <span class="glyphicon glyphicon-hd-video"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-hd-video</span>
<li> </li>
<span class="glyphicon glyphicon-hdd"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-hdd</span> <span class="glyphicon glyphicon-hdd"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-hdd</span>
<li> </li>
<span class="glyphicon glyphicon-header"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-header</span> <span class="glyphicon glyphicon-header"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-header</span>
<li> </li>
<span class="glyphicon glyphicon-headphones"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-headphones</span> <span class="glyphicon glyphicon-headphones"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-headphones</span>
<li> </li>
<span class="glyphicon glyphicon-heart"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-heart</span> <span class="glyphicon glyphicon-heart"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-heart</span>
<li> </li>
<span class="glyphicon glyphicon-heart-empty"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-heart-empty</span> <span class="glyphicon glyphicon-heart-empty"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-heart-empty</span>
<li> </li>
<span class="glyphicon glyphicon-home"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-home</span> <span class="glyphicon glyphicon-home"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-home</span>
<li> </li>
<span class="glyphicon glyphicon-import"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-import</span> <span class="glyphicon glyphicon-import"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-import</span>
<li> </li>
<span class="glyphicon glyphicon-inbox"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-inbox</span> <span class="glyphicon glyphicon-inbox"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-inbox</span>
<li> </li>
<span class="glyphicon glyphicon-indent-left"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-indent-left</span> <span class="glyphicon glyphicon-indent-left"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-indent-left</span>
<li> </li>
<span class="glyphicon glyphicon-indent-right"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-indent-right</span> <span class="glyphicon glyphicon-indent-right"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-indent-right</span>
<li> </li>
<span class="glyphicon glyphicon-info-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-info-sign</span> <span class="glyphicon glyphicon-info-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-info-sign</span>
<li> </li>
<span class="glyphicon glyphicon-italic"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-italic</span> <span class="glyphicon glyphicon-italic"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-italic</span>
<li> </li>
<span class="glyphicon glyphicon-leaf"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-leaf</span> <span class="glyphicon glyphicon-leaf"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-leaf</span>
<li> </li>
<span class="glyphicon glyphicon-link"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-link</span> <span class="glyphicon glyphicon-link"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-link</span>
<li> </li>
<span class="glyphicon glyphicon-list"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-list</span> <span class="glyphicon glyphicon-list"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-list</span>
<li> </li>
<span class="glyphicon glyphicon-list-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-list-alt</span> <span class="glyphicon glyphicon-list-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-list-alt</span>
<li> </li>
<span class="glyphicon glyphicon-lock"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-lock</span> <span class="glyphicon glyphicon-lock"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-lock</span>
<li> </li>
<span class="glyphicon glyphicon-log-in"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-log-in</span> <span class="glyphicon glyphicon-log-in"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-log-in</span>
<li> </li>
<span class="glyphicon glyphicon-log-out"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-log-out</span> <span class="glyphicon glyphicon-log-out"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-log-out</span>
<li> </li>
<span class="glyphicon glyphicon-magnet"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-magnet</span> <span class="glyphicon glyphicon-magnet"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-magnet</span>
<li> </li>
<span class="glyphicon glyphicon-map-marker"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-map-marker</span> <span class="glyphicon glyphicon-map-marker"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-map-marker</span>
<li> </li>
<span class="glyphicon glyphicon-minus"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-minus</span> <span class="glyphicon glyphicon-minus"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-minus</span>
<li> </li>
<span class="glyphicon glyphicon-minus-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-minus-sign</span> <span class="glyphicon glyphicon-minus-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-minus-sign</span>
<li> </li>
<span class="glyphicon glyphicon-move"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-move</span> <span class="glyphicon glyphicon-move"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-move</span>
<li> </li>
<span class="glyphicon glyphicon-music"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-music</span> <span class="glyphicon glyphicon-music"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-music</span>
<li> </li>
<span class="glyphicon glyphicon-new-window"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-new-window</span> <span class="glyphicon glyphicon-new-window"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-new-window</span>
<li> </li>
<span class="glyphicon glyphicon-off"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-off</span> <span class="glyphicon glyphicon-off"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-off</span>
<li> </li>
<span class="glyphicon glyphicon-ok"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-ok</span> <span class="glyphicon glyphicon-ok"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-ok</span>
<li> </li>
<span class="glyphicon glyphicon-ok-circle"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-ok-circle</span> <span class="glyphicon glyphicon-ok-circle"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-ok-circle</span>
<li> </li>
<span class="glyphicon glyphicon-ok-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-ok-sign</span> <span class="glyphicon glyphicon-ok-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-ok-sign</span>
<li> </li>
<span class="glyphicon glyphicon-open"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-open</span> <span class="glyphicon glyphicon-open"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-open</span>
<li> </li>
<span class="glyphicon glyphicon-paperclip"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-paperclip</span> <span class="glyphicon glyphicon-paperclip"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-paperclip</span>
<li> </li>
<span class="glyphicon glyphicon-pause"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-pause</span> <span class="glyphicon glyphicon-pause"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-pause</span>
<li> </li>
<span class="glyphicon glyphicon-pencil"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-pencil</span> <span class="glyphicon glyphicon-pencil"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-pencil</span>
<li> </li>
<span class="glyphicon glyphicon-phone"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-phone</span> <span class="glyphicon glyphicon-phone"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-phone</span>
<li> </li>
<span class="glyphicon glyphicon-phone-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-phone-alt</span> <span class="glyphicon glyphicon-phone-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-phone-alt</span>
<li> </li>
<span class="glyphicon glyphicon-picture"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-picture</span> <span class="glyphicon glyphicon-picture"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-picture</span>
<li> </li>
<span class="glyphicon glyphicon-plane"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-plane</span> <span class="glyphicon glyphicon-plane"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-plane</span>
<li> </li>
<span class="glyphicon glyphicon-play"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-play</span> <span class="glyphicon glyphicon-play"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-play</span>
<li> </li>
<span class="glyphicon glyphicon-play-circle"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-play-circle</span> <span class="glyphicon glyphicon-play-circle"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-play-circle</span>
<li> </li>
<span class="glyphicon glyphicon-plus"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-plus</span> <span class="glyphicon glyphicon-plus"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-plus</span>
<li> </li>
<span class="glyphicon glyphicon-plus-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-plus-sign</span> <span class="glyphicon glyphicon-plus-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-plus-sign</span>
<li> </li>
<span class="glyphicon glyphicon-print"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-print</span> <span class="glyphicon glyphicon-print"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-print</span>
<li> </li>
<span class="glyphicon glyphicon-pushpin"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-pushpin</span> <span class="glyphicon glyphicon-pushpin"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-pushpin</span>
<li> </li>
<span class="glyphicon glyphicon-qrcode"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-qrcode</span> <span class="glyphicon glyphicon-qrcode"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-qrcode</span>
<li> </li>
<span class="glyphicon glyphicon-question-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-question-sign</span> <span class="glyphicon glyphicon-question-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-question-sign</span>
<li> </li>
<span class="glyphicon glyphicon-random"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-random</span> <span class="glyphicon glyphicon-random"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-random</span>
<li> </li>
<span class="glyphicon glyphicon-record"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-record</span> <span class="glyphicon glyphicon-record"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-record</span>
<li> </li>
<span class="glyphicon glyphicon-refresh"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-refresh</span> <span class="glyphicon glyphicon-refresh"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-refresh</span>
<li> </li>
<span class="glyphicon glyphicon-registration-mark"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-registration-mark</span> <span class="glyphicon glyphicon-registration-mark"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-registration-mark</span>
<li> </li>
<span class="glyphicon glyphicon-remove"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-remove</span> <span class="glyphicon glyphicon-remove"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-remove</span>
<li> </li>
<span class="glyphicon glyphicon-remove-circle"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-remove-circle</span> <span class="glyphicon glyphicon-remove-circle"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-remove-circle</span>
<li> </li>
<span class="glyphicon glyphicon-remove-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-remove-sign</span> <span class="glyphicon glyphicon-remove-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-remove-sign</span>
<li> </li>
<span class="glyphicon glyphicon-repeat"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-repeat</span> <span class="glyphicon glyphicon-repeat"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-repeat</span>
<li> </li>
<span class="glyphicon glyphicon-resize-full"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-resize-full</span> <span class="glyphicon glyphicon-resize-full"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-resize-full</span>
<li> </li>
<span class="glyphicon glyphicon-resize-horizontal"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-resize-horizontal</span> <span class="glyphicon glyphicon-resize-horizontal"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-resize-horizontal</span>
<li> </li>
<span class="glyphicon glyphicon-resize-small"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-resize-small</span> <span class="glyphicon glyphicon-resize-small"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-resize-small</span>
<li> </li>
<span class="glyphicon glyphicon-resize-vertical"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-resize-vertical</span> <span class="glyphicon glyphicon-resize-vertical"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-resize-vertical</span>
<li> </li>
<span class="glyphicon glyphicon-retweet"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-retweet</span> <span class="glyphicon glyphicon-retweet"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-retweet</span>
<li> </li>
<span class="glyphicon glyphicon-road"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-road</span> <span class="glyphicon glyphicon-road"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-road</span>
<li> </li>
<span class="glyphicon glyphicon-save"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-save</span> <span class="glyphicon glyphicon-save"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-save</span>
<li> </li>
<span class="glyphicon glyphicon-saved"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-saved</span> <span class="glyphicon glyphicon-saved"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-saved</span>
<li> </li>
<span class="glyphicon glyphicon-screenshot"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-screenshot</span> <span class="glyphicon glyphicon-screenshot"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-screenshot</span>
<li> </li>
<span class="glyphicon glyphicon-sd-video"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sd-video</span> <span class="glyphicon glyphicon-sd-video"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sd-video</span>
<li> </li>
<span class="glyphicon glyphicon-search"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-search</span> <span class="glyphicon glyphicon-search"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-search</span>
<li> </li>
<span class="glyphicon glyphicon-send"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-send</span> <span class="glyphicon glyphicon-send"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-send</span>
<li> </li>
<span class="glyphicon glyphicon-share"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-share</span> <span class="glyphicon glyphicon-share"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-share</span>
<li> </li>
<span class="glyphicon glyphicon-share-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-share-alt</span> <span class="glyphicon glyphicon-share-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-share-alt</span>
<li> </li>
<span class="glyphicon glyphicon-shopping-cart"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-shopping-cart</span> <span class="glyphicon glyphicon-shopping-cart"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-shopping-cart</span>
<li> </li>
<span class="glyphicon glyphicon-signal"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-signal</span> <span class="glyphicon glyphicon-signal"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-signal</span>
<li> </li>
<span class="glyphicon glyphicon-sort"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort</span> <span class="glyphicon glyphicon-sort"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort</span>
<li> </li>
<span class="glyphicon glyphicon-sort-by-alphabet"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet</span> <span class="glyphicon glyphicon-sort-by-alphabet"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet</span>
<li> </li>
<span class="glyphicon glyphicon-sort-by-alphabet-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet-alt</span> <span class="glyphicon glyphicon-sort-by-alphabet-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet-alt</span>
<li> </li>
<span class="glyphicon glyphicon-sort-by-attributes"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes</span> <span class="glyphicon glyphicon-sort-by-attributes"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes</span>
<li> </li>
<span class="glyphicon glyphicon-sort-by-attributes-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes-alt</span> <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes-alt</span>
<li> </li>
<span class="glyphicon glyphicon-sort-by-order"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-order</span> <span class="glyphicon glyphicon-sort-by-order"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort-by-order</span>
<li> </li>
<span class="glyphicon glyphicon-sort-by-order-alt"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-order-alt</span> <span class="glyphicon glyphicon-sort-by-order-alt"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sort-by-order-alt</span>
<li> </li>
<span class="glyphicon glyphicon-sound-5-1"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sound-5-1</span> <span class="glyphicon glyphicon-sound-5-1"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sound-5-1</span>
<li> </li>
<span class="glyphicon glyphicon-sound-6-1"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sound-6-1</span> <span class="glyphicon glyphicon-sound-6-1"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sound-6-1</span>
<li> </li>
<span class="glyphicon glyphicon-sound-7-1"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sound-7-1</span> <span class="glyphicon glyphicon-sound-7-1"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sound-7-1</span>
<li> </li>
<span class="glyphicon glyphicon-sound-dolby"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sound-dolby</span> <span class="glyphicon glyphicon-sound-dolby"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sound-dolby</span>
<li> </li>
<span class="glyphicon glyphicon-sound-stereo"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-sound-stereo</span> <span class="glyphicon glyphicon-sound-stereo"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-sound-stereo</span>
<li> </li>
<span class="glyphicon glyphicon-star"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-star</span> <span class="glyphicon glyphicon-star"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-star</span>
<li> </li>
<span class="glyphicon glyphicon-star-empty"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-star-empty</span> <span class="glyphicon glyphicon-star-empty"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-star-empty</span>
<li> </li>
<span class="glyphicon glyphicon-stats"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-stats</span> <span class="glyphicon glyphicon-stats"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-stats</span>
<li> </li>
<span class="glyphicon glyphicon-step-backward"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-step-backward</span> <span class="glyphicon glyphicon-step-backward"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-step-backward</span>
<li> </li>
<span class="glyphicon glyphicon-step-forward"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-step-forward</span> <span class="glyphicon glyphicon-step-forward"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-step-forward</span>
<li> </li>
<span class="glyphicon glyphicon-stop"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-stop</span> <span class="glyphicon glyphicon-stop"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-stop</span>
<li> </li>
<span class="glyphicon glyphicon-subtitles"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-subtitles</span> <span class="glyphicon glyphicon-subtitles"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-subtitles</span>
<li> </li>
<span class="glyphicon glyphicon-tag"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tag</span> <span class="glyphicon glyphicon-tag"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tag</span>
<li> </li>
<span class="glyphicon glyphicon-tags"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tags</span> <span class="glyphicon glyphicon-tags"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tags</span>
<li> </li>
<span class="glyphicon glyphicon-tasks"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tasks</span> <span class="glyphicon glyphicon-tasks"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tasks</span>
<li> </li>
<span class="glyphicon glyphicon-text-height"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-text-height</span> <span class="glyphicon glyphicon-text-height"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-text-height</span>
<li> </li>
<span class="glyphicon glyphicon-text-width"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-text-width</span> <span class="glyphicon glyphicon-text-width"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-text-width</span>
<li> </li>
<span class="glyphicon glyphicon-th"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-th</span> <span class="glyphicon glyphicon-th"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-th</span>
<li> </li>
<span class="glyphicon glyphicon-th-large"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-th-large</span> <span class="glyphicon glyphicon-th-large"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-th-large</span>
<li> </li>
<span class="glyphicon glyphicon-th-list"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-th-list</span> <span class="glyphicon glyphicon-th-list"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-th-list</span>
<li> </li>
<span class="glyphicon glyphicon-thumbs-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-thumbs-down</span> <span class="glyphicon glyphicon-thumbs-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-thumbs-down</span>
<li> </li>
<span class="glyphicon glyphicon-thumbs-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-thumbs-up</span> <span class="glyphicon glyphicon-thumbs-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-thumbs-up</span>
<li> </li>
<span class="glyphicon glyphicon-time"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-time</span> <span class="glyphicon glyphicon-time"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-time</span>
<li> </li>
<span class="glyphicon glyphicon-tint"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tint</span> <span class="glyphicon glyphicon-tint"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tint</span>
<li> </li>
<span class="glyphicon glyphicon-tower"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tower</span> <span class="glyphicon glyphicon-tower"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tower</span>
<li> </li>
<span class="glyphicon glyphicon-transfer"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-transfer</span> <span class="glyphicon glyphicon-transfer"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-transfer</span>
<li> </li>
<span class="glyphicon glyphicon-trash"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-trash</span> <span class="glyphicon glyphicon-trash"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-trash</span>
<li> </li>
<span class="glyphicon glyphicon-tree-conifer"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tree-conifer</span> <span class="glyphicon glyphicon-tree-conifer"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tree-conifer</span>
<li> </li>
<span class="glyphicon glyphicon-tree-deciduous"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-tree-deciduous</span> <span class="glyphicon glyphicon-tree-deciduous"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-tree-deciduous</span>
<li> </li>
<span class="glyphicon glyphicon-unchecked"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-unchecked</span> <span class="glyphicon glyphicon-unchecked"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-unchecked</span>
<li> </li>
<span class="glyphicon glyphicon-upload"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-upload</span> <span class="glyphicon glyphicon-upload"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-upload</span>
<li> </li>
<span class="glyphicon glyphicon-usd"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-usd</span> <span class="glyphicon glyphicon-usd"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-usd</span>
<li> </li>
<span class="glyphicon glyphicon-user"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-user</span> <span class="glyphicon glyphicon-user"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-user</span>
<li> </li>
<span class="glyphicon glyphicon-volume-down"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-volume-down</span> <span class="glyphicon glyphicon-volume-down"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-volume-down</span>
<li> </li>
<span class="glyphicon glyphicon-volume-off"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-volume-off</span> <span class="glyphicon glyphicon-volume-off"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-volume-off</span>
<li> </li>
<span class="glyphicon glyphicon-volume-up"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-volume-up</span> <span class="glyphicon glyphicon-volume-up"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-volume-up</span>
<li> </li>
<span class="glyphicon glyphicon-warning-sign"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-warning-sign</span> <span class="glyphicon glyphicon-warning-sign"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-warning-sign</span>
<li> </li>
<span class="glyphicon glyphicon-wrench"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-wrench</span> <span class="glyphicon glyphicon-wrench"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-wrench</span>
<li> </li>
<span class="glyphicon glyphicon-zoom-in"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-zoom-in</span> <span class="glyphicon glyphicon-zoom-in"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-zoom-in</span>
<li> </li>
<span class="glyphicon glyphicon-zoom-out"></span> <li>
<span class="glyphicon-class">glyphicon glyphicon-zoom-out</span> <span class="glyphicon glyphicon-zoom-out"></span>
</li> <span class="glyphicon-class">glyphicon glyphicon-zoom-out</span>
</ul> </li>
</ul>
</div>
<h2 id="glyphicons-how-to-use">How to use</h2> <h2 id="glyphicons-how-to-use">How to use</h2>
...@@ -1172,7 +1174,7 @@ base_url: "../" ...@@ -1172,7 +1174,7 @@ base_url: "../"
<a class="btn btn-default" role="button">Middle</a> <a class="btn btn-default" role="button">Middle</a>
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <a class="btn btn-default dropdown-toggle" data-toggle="dropdown">
Right dropdown <span class="caret"></span> Dropdown <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li> <li><a href="#">Action</a></li>
...@@ -3354,6 +3356,43 @@ body { padding-bottom: 70px; } ...@@ -3354,6 +3356,43 @@ body { padding-bottom: 70px; }
<a href="#" class="list-group-item">Porta ac consectetur ac</a> <a href="#" class="list-group-item">Porta ac consectetur ac</a>
<a href="#" class="list-group-item">Vestibulum at eros</a> <a href="#" class="list-group-item">Vestibulum at eros</a>
</div> </div>
{% endhighlight %}
<h3 id="list-group-contextual-classes">Contextual classes</h3>
<p>Use contextual classes to style list items, default or linked. Also includes <code>.active</code> state.</p>
<div class="bs-example">
<div class="row">
<div class="col-sm-6">
<ul class="list-group">
<li class="list-group-item list-group-item-success">Dapibus ac facilisis in</li>
<li class="list-group-item list-group-item-warning">Porta ac consectetur ac</li>
<li class="list-group-item list-group-item-danger">Vestibulum at eros</li>
<li class="list-group-item list-group-item-info">Cras sit amet nibh libero</li>
</ul>
</div>
<div class="col-sm-6">
<div class="list-group">
<a href="#" class="list-group-item list-group-item-success">Dapibus ac facilisis in</a>
<a href="#" class="list-group-item list-group-item-warning">Porta ac consectetur ac</a>
<a href="#" class="list-group-item list-group-item-danger">Vestibulum at eros</a>
<a href="#" class="list-group-item list-group-item-info">Cras sit amet nibh libero</a>
</div>
</div>
</div>
</div>
{% highlight html %}
<ul class="list-group">
<li class="list-group-item list-group-item-success">Dapibus ac facilisis in</li>
<li class="list-group-item list-group-item-warning">Porta ac consectetur ac</li>
<li class="list-group-item list-group-item-danger">Vestibulum at eros</li>
<li class="list-group-item list-group-item-info">Cras sit amet nibh libero</li>
</ul>
<div class="list-group">
<a href="#" class="list-group-item list-group-item-success">Dapibus ac facilisis in</a>
<a href="#" class="list-group-item list-group-item-warning">Porta ac consectetur ac</a>
<a href="#" class="list-group-item list-group-item-danger">Vestibulum at eros</a>
<a href="#" class="list-group-item list-group-item-info">Cras sit amet nibh libero</a>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="list-group-custom-content">Custom content</h3> <h3 id="list-group-custom-content">Custom content</h3>
......
css.html
View file @ 12500047
...@@ -76,7 +76,7 @@ base_url: "../" ...@@ -76,7 +76,7 @@ base_url: "../"
<h3 id="grid-intro">Introduction</h3> <h3 id="grid-intro">Introduction</h3>
<p>Grid systems are used for creating page layouts through a series of rows and columns that house your content. Here's how the Bootstrap grid system works:</p> <p>Grid systems are used for creating page layouts through a series of rows and columns that house your content. Here's how the Bootstrap grid system works:</p>
<ul> <ul>
<li>Rows must be placed within a <code>.container</code> for proper alignment and padding.</li> <li>Rows must be placed within a <code>.container</code> (fixed-width) or <code>.container-fluid</code> (full-width) for proper alignment and padding.</li>
<li>Use rows to create horizontal groups of columns.</li> <li>Use rows to create horizontal groups of columns.</li>
<li>Content should be placed within columns, and only columns may be immediate children of rows.</li> <li>Content should be placed within columns, and only columns may be immediate children of rows.</li>
<li>Predefined grid classes like <code>.row</code> and <code>.col-xs-4</code> are available for quickly making grid layouts. LESS mixins can also be used for more semantic layouts.</li> <li>Predefined grid classes like <code>.row</code> and <code>.col-xs-4</code> are available for quickly making grid layouts. LESS mixins can also be used for more semantic layouts.</li>
...@@ -249,6 +249,16 @@ base_url: "../" ...@@ -249,6 +249,16 @@ base_url: "../"
<div class="col-md-6">.col-md-6</div> <div class="col-md-6">.col-md-6</div>
<div class="col-md-6">.col-md-6</div> <div class="col-md-6">.col-md-6</div>
</div> </div>
{% endhighlight %}
<h3 id="grid-example-fluid">Example: Fluid container</h3>
<p>Turn any fixed-width grid layout into a full-width layout by changing your outermost <code>.container</code> to <code>.container-fluid</code>.</p>
{% highlight html %}
<div class="container-fluid">
<div class="row">
...
</div>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="grid-example-mixed">Example: Mobile and desktop</h3> <h3 id="grid-example-mixed">Example: Mobile and desktop</h3>
...@@ -1047,7 +1057,7 @@ base_url: "../" ...@@ -1047,7 +1057,7 @@ base_url: "../"
<h1 id="code">Code</h1> <h1 id="code">Code</h1>
</div> </div>
<h2>Inline</h2> <h2 id="code-inline">Inline</h2>
<p>Wrap inline snippets of code with <code>&lt;code&gt;</code>.</p> <p>Wrap inline snippets of code with <code>&lt;code&gt;</code>.</p>
<div class="bs-example"> <div class="bs-example">
For example, <code>&lt;section&gt;</code> should be wrapped as inline. For example, <code>&lt;section&gt;</code> should be wrapped as inline.
...@@ -1056,7 +1066,16 @@ base_url: "../" ...@@ -1056,7 +1066,16 @@ base_url: "../"
For example, <code>&lt;section&gt;</code> should be wrapped as inline. For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% endhighlight %} {% endhighlight %}
<h2>Basic block</h2> <h2 id="code-user-input">User input</h2>
<p>Use the <code>&lt;kbd&gt;</code> to indicate input that is typically entered via keyboard.</p>
<div class="bs-example">
To switch directories, type <kbd>cd</kbd> followed the name of the directory.
</div>
{% highlight html %}
To switch directories, type <kbd>cd</kbd> followed the name of the directory.
{% endhighlight %}
<h2 id="code-block">Basic block</h2>
<p>Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.</p> <p>Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.</p>
<div class="bs-example"> <div class="bs-example">
<pre>&lt;p&gt;Sample text here...&lt;/p&gt;</pre> <pre>&lt;p&gt;Sample text here...&lt;/p&gt;</pre>
...@@ -1327,6 +1346,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1327,6 +1346,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</td> </td>
<td>Indicates a dangerous or potentially negative action</td> <td>Indicates a dangerous or potentially negative action</td>
</tr> </tr>
<tr>
<td>
<code>.info</code>
</td>
<td>Indicates a neutral informative change or action</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -1383,6 +1408,18 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1383,6 +1408,18 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<td>Column content</td> <td>Column content</td>
<td>Column content</td> <td>Column content</td>
</tr> </tr>
<tr>
<td>8</td>
<td>Column content</td>
<td>Column content</td>
<td>Column content</td>
</tr>
<tr class="info">
<td>9</td>
<td>Column content</td>
<td>Column content</td>
<td>Column content</td>
</tr>
</tbody> </tbody>
</table> </table>
</div><!-- /example --> </div><!-- /example -->
...@@ -1392,6 +1429,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1392,6 +1429,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<tr class="success">...</tr> <tr class="success">...</tr>
<tr class="warning">...</tr> <tr class="warning">...</tr>
<tr class="danger">...</tr> <tr class="danger">...</tr>
<tr class="info">...</tr>
<!-- On cells (`td` or `th`) --> <!-- On cells (`td` or `th`) -->
<tr> <tr>
...@@ -1399,6 +1437,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1399,6 +1437,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<td class="success">...</td> <td class="success">...</td>
<td class="warning">...</td> <td class="warning">...</td>
<td class="danger">...</td> <td class="danger">...</td>
<td class="info">...</td>
</tr> </tr>
{% endhighlight %} {% endhighlight %}
......
dist/css/bootstrap.css
View file @ 12500047
...@@ -576,6 +576,10 @@ cite { ...@@ -576,6 +576,10 @@ cite {
text-align: center; text-align: center;
} }
.text-justify {
text-align: justify;
}
.page-header { .page-header {
padding-bottom: 9px; padding-bottom: 9px;
margin: 40px 0 20px; margin: 40px 0 20px;
...@@ -753,6 +757,15 @@ code { ...@@ -753,6 +757,15 @@ code {
border-radius: 4px; border-radius: 4px;
} }
kbd {
padding: 2px 4px;
font-size: 90%;
color: #ffffff;
background-color: #333333;
border-radius: 3px;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
}
pre { pre {
display: block; display: block;
padding: 9.5px; padding: 9.5px;
...@@ -826,6 +839,33 @@ pre code { ...@@ -826,6 +839,33 @@ pre code {
} }
} }
.container-fluid {
padding-right: 15px;
padding-left: 15px;
margin-right: auto;
margin-left: auto;
}
.container-fluid:before,
.container-fluid:after {
display: table;
content: " ";
}
.container-fluid:after {
clear: both;
}
.container-fluid:before,
.container-fluid:after {
display: table;
content: " ";
}
.container-fluid:after {
clear: both;
}
.row { .row {
margin-right: -15px; margin-right: -15px;
margin-left: -15px; margin-left: -15px;
...@@ -1775,6 +1815,28 @@ table th[class*="col-"] { ...@@ -1775,6 +1815,28 @@ table th[class*="col-"] {
background-color: #d0e9c6; background-color: #d0e9c6;
} }
.table > thead > tr > td.warning,
.table > tbody > tr > td.warning,
.table > tfoot > tr > td.warning,
.table > thead > tr > th.warning,
.table > tbody > tr > th.warning,
.table > tfoot > tr > th.warning,
.table > thead > tr.warning > td,
.table > tbody > tr.warning > td,
.table > tfoot > tr.warning > td,
.table > thead > tr.warning > th,
.table > tbody > tr.warning > th,
.table > tfoot > tr.warning > th {
background-color: #fcf8e3;
}
.table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover,
.table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr.warning:hover > th {
background-color: #faf2cc;
}
.table > thead > tr > td.danger, .table > thead > tr > td.danger,
.table > tbody > tr > td.danger, .table > tbody > tr > td.danger,
.table > tfoot > tr > td.danger, .table > tfoot > tr > td.danger,
...@@ -1797,26 +1859,26 @@ table th[class*="col-"] { ...@@ -1797,26 +1859,26 @@ table th[class*="col-"] {
background-color: #ebcccc; background-color: #ebcccc;
} }
.table > thead > tr > td.warning, .table > thead > tr > td.info,
.table > tbody > tr > td.warning, .table > tbody > tr > td.info,
.table > tfoot > tr > td.warning, .table > tfoot > tr > td.info,
.table > thead > tr > th.warning, .table > thead > tr > th.info,
.table > tbody > tr > th.warning, .table > tbody > tr > th.info,
.table > tfoot > tr > th.warning, .table > tfoot > tr > th.info,
.table > thead > tr.warning > td, .table > thead > tr.info > td,
.table > tbody > tr.warning > td, .table > tbody > tr.info > td,
.table > tfoot > tr.warning > td, .table > tfoot > tr.info > td,
.table > thead > tr.warning > th, .table > thead > tr.info > th,
.table > tbody > tr.warning > th, .table > tbody > tr.info > th,
.table > tfoot > tr.warning > th { .table > tfoot > tr.info > th {
background-color: #fcf8e3; background-color: #d9edf7;
} }
.table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > td.info:hover,
.table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr > th.info:hover,
.table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr.info:hover > td,
.table-hover > tbody > tr.warning:hover > th { .table-hover > tbody > tr.info:hover > th {
background-color: #faf2cc; background-color: #c4e3f3;
} }
@media (max-width: 767px) { @media (max-width: 767px) {
...@@ -2360,7 +2422,7 @@ fieldset[disabled] .btn-default.active { ...@@ -2360,7 +2422,7 @@ fieldset[disabled] .btn-default.active {
.btn-default .badge { .btn-default .badge {
color: #ffffff; color: #ffffff;
background-color: #fff; background-color: #333333;
} }
.btn-primary { .btn-primary {
...@@ -2406,7 +2468,53 @@ fieldset[disabled] .btn-primary.active { ...@@ -2406,7 +2468,53 @@ fieldset[disabled] .btn-primary.active {
.btn-primary .badge { .btn-primary .badge {
color: #428bca; color: #428bca;
background-color: #fff; background-color: #ffffff;
}
.btn-success {
color: #ffffff;
background-color: #5cb85c;
border-color: #4cae4c;
}
.btn-success:hover,
.btn-success:focus,
.btn-success:active,
.btn-success.active,
.open .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #47a447;
border-color: #398439;
}
.btn-success:active,
.btn-success.active,
.open .dropdown-toggle.btn-success {
background-image: none;
}
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #5cb85c;
border-color: #4cae4c;
}
.btn-success .badge {
color: #5cb85c;
background-color: #ffffff;
} }
.btn-warning { .btn-warning {
...@@ -2452,7 +2560,7 @@ fieldset[disabled] .btn-warning.active { ...@@ -2452,7 +2560,7 @@ fieldset[disabled] .btn-warning.active {
.btn-warning .badge { .btn-warning .badge {
color: #f0ad4e; color: #f0ad4e;
background-color: #fff; background-color: #ffffff;
} }
.btn-danger { .btn-danger {
...@@ -2498,53 +2606,7 @@ fieldset[disabled] .btn-danger.active { ...@@ -2498,53 +2606,7 @@ fieldset[disabled] .btn-danger.active {
.btn-danger .badge { .btn-danger .badge {
color: #d9534f; color: #d9534f;
background-color: #fff; background-color: #ffffff;
}
.btn-success {
color: #ffffff;
background-color: #5cb85c;
border-color: #4cae4c;
}
.btn-success:hover,
.btn-success:focus,
.btn-success:active,
.btn-success.active,
.open .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #47a447;
border-color: #398439;
}
.btn-success:active,
.btn-success.active,
.open .dropdown-toggle.btn-success {
background-image: none;
}
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #5cb85c;
border-color: #4cae4c;
}
.btn-success .badge {
color: #5cb85c;
background-color: #fff;
} }
.btn-info { .btn-info {
...@@ -2590,7 +2652,7 @@ fieldset[disabled] .btn-info.active { ...@@ -2590,7 +2652,7 @@ fieldset[disabled] .btn-info.active {
.btn-info .badge { .btn-info .badge {
color: #5bc0de; color: #5bc0de;
background-color: #fff; background-color: #ffffff;
} }
.btn-link { .btn-link {
...@@ -4452,14 +4514,18 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4452,14 +4514,18 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
.container > .navbar-header, .container > .navbar-header,
.container > .navbar-collapse { .container-fluid > .navbar-header,
.container > .navbar-collapse,
.container-fluid > .navbar-collapse {
margin-right: -15px; margin-right: -15px;
margin-left: -15px; margin-left: -15px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.container > .navbar-header, .container > .navbar-header,
.container > .navbar-collapse { .container-fluid > .navbar-header,
.container > .navbar-collapse,
.container-fluid > .navbar-collapse {
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
...@@ -4515,7 +4581,8 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4515,7 +4581,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar > .container .navbar-brand { .navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -15px; margin-left: -15px;
} }
} }
...@@ -4770,7 +4837,7 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4770,7 +4837,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
.navbar-default .navbar-toggle .icon-bar { .navbar-default .navbar-toggle .icon-bar {
background-color: #cccccc; background-color: #888888;
} }
.navbar-default .navbar-collapse, .navbar-default .navbar-collapse,
...@@ -5597,6 +5664,114 @@ a.list-group-item.active:focus .list-group-item-text { ...@@ -5597,6 +5664,114 @@ a.list-group-item.active:focus .list-group-item-text {
color: #e1edf7; color: #e1edf7;
} }
.list-group-item-success {
color: #3c763d;
background-color: #dff0d8;
}
a.list-group-item-success {
color: #3c763d;
}
a.list-group-item-success .list-group-item-heading {
color: inherit;
}
a.list-group-item-success:hover,
a.list-group-item-success:focus {
color: #3c763d;
background-color: #d0e9c6;
}
a.list-group-item-success.active,
a.list-group-item-success.active:hover,
a.list-group-item-success.active:focus {
color: #fff;
background-color: #3c763d;
border-color: #3c763d;
}
.list-group-item-warning {
color: #8a6d3b;
background-color: #fcf8e3;
}
a.list-group-item-warning {
color: #8a6d3b;
}
a.list-group-item-warning .list-group-item-heading {
color: inherit;
}
a.list-group-item-warning:hover,
a.list-group-item-warning:focus {
color: #8a6d3b;
background-color: #faf2cc;
}
a.list-group-item-warning.active,
a.list-group-item-warning.active:hover,
a.list-group-item-warning.active:focus {
color: #fff;
background-color: #8a6d3b;
border-color: #8a6d3b;
}
.list-group-item-danger {
color: #a94442;
background-color: #f2dede;
}
a.list-group-item-danger {
color: #a94442;
}
a.list-group-item-danger .list-group-item-heading {
color: inherit;
}
a.list-group-item-danger:hover,
a.list-group-item-danger:focus {
color: #a94442;
background-color: #ebcccc;
}
a.list-group-item-danger.active,
a.list-group-item-danger.active:hover,
a.list-group-item-danger.active:focus {
color: #fff;
background-color: #a94442;
border-color: #a94442;
}
.list-group-item-info {
color: #31708f;
background-color: #d9edf7;
}
a.list-group-item-info {
color: #31708f;
}
a.list-group-item-info .list-group-item-heading {
color: inherit;
}
a.list-group-item-info:hover,
a.list-group-item-info:focus {
color: #31708f;
background-color: #c4e3f3;
}
a.list-group-item-info.active,
a.list-group-item-info.active:hover,
a.list-group-item-info.active:focus {
color: #fff;
background-color: #31708f;
border-color: #31708f;
}
.list-group-item-heading { .list-group-item-heading {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
......
dist/css/bootstrap.min.css
View file @ 12500047
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/bootstrap.js
View file @ 12500047
...@@ -763,7 +763,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -763,7 +763,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index=0 if (!~index) index = 0
$items.eq(index).focus() $items.eq(index).focus()
} }
...@@ -1013,7 +1013,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -1013,7 +1013,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
} else if (!this.isShown && this.$backdrop) { } else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in') this.$backdrop.removeClass('in')
$.support.transition && this.$element.hasClass('fade')? $.support.transition && this.$element.hasClass('fade') ?
this.$backdrop this.$backdrop
.one($.support.transition.end, callback) .one($.support.transition.end, callback)
.emulateTransitionEnd(150) : .emulateTransitionEnd(150) :
...@@ -1213,7 +1213,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -1213,7 +1213,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
} }
Tooltip.prototype.show = function () { Tooltip.prototype.show = function () {
var e = $.Event('show.bs.'+ this.type) var e = $.Event('show.bs.' + this.type)
if (this.hasContent() && this.enabled) { if (this.hasContent() && this.enabled) {
this.$element.trigger(e) this.$element.trigger(e)
...@@ -1272,7 +1272,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -1272,7 +1272,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
} }
} }
Tooltip.prototype.applyPlacement = function(offset, placement) { Tooltip.prototype.applyPlacement = function (offset, placement) {
var replace var replace
var $tip = this.tip() var $tip = this.tip()
var width = $tip[0].offsetWidth var width = $tip[0].offsetWidth
...@@ -1323,7 +1323,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -1323,7 +1323,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (replace) $tip.offset(offset) if (replace) $tip.offset(offset)
} }
Tooltip.prototype.replaceArrow = function(delta, dimension, position) { Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
} }
......
docs-assets/css/docs.css
View file @ 12500047
...@@ -921,7 +921,6 @@ h1[id] { ...@@ -921,7 +921,6 @@ h1[id] {
*/ */
.highlight { .highlight {
display: none; /* hidden by default, until >480px */
padding: 9px 14px; padding: 9px 14px;
margin-bottom: 14px; margin-bottom: 14px;
background-color: #f7f7f9; background-color: #f7f7f9;
...@@ -949,13 +948,6 @@ h1[id] { ...@@ -949,13 +948,6 @@ h1[id] {
color: #bebec5; color: #bebec5;
} }
/* Show code snippets when we have the space */
@media (min-width: 481px) {
.highlight {
display: block;
}
}
/* /*
* Responsive tests * Responsive tests
...@@ -1037,11 +1029,12 @@ h1[id] { ...@@ -1037,11 +1029,12 @@ h1[id] {
*/ */
.bs-glyphicons { .bs-glyphicons {
margin: 0 -19px 20px -16px;
overflow: hidden;
}
.bs-glyphicons-list {
padding-left: 0; padding-left: 0;
padding-bottom: 1px;
margin-bottom: 20px;
list-style: none; list-style: none;
overflow: hidden;
} }
.bs-glyphicons li { .bs-glyphicons li {
float: left; float: left;
...@@ -1049,7 +1042,7 @@ h1[id] { ...@@ -1049,7 +1042,7 @@ h1[id] {
height: 115px; height: 115px;
padding: 10px; padding: 10px;
margin: 0 -1px -1px 0; margin: 0 -1px -1px 0;
font-size: 12px; font-size: 10px;
line-height: 1.4; line-height: 1.4;
text-align: center; text-align: center;
border: 1px solid #ddd; border: 1px solid #ddd;
...@@ -1069,8 +1062,13 @@ h1[id] { ...@@ -1069,8 +1062,13 @@ h1[id] {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.bs-glyphicons {
margin-left: 0;
margin-right: 0;
}
.bs-glyphicons li { .bs-glyphicons li {
width: 12.5%; width: 12.5%;
font-size: 12px;
} }
} }
......
docs-assets/js/customize.js 0 → 100644
View file @ 12500047
This source diff could not be displayed because it is too large. You can view the blob instead.
docs-assets/js/raw-files.js
View file @ 12500047
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/cover/cover.css 0 → 100644
View file @ 12500047
/*
* Globals
*/
/* Links */
a,
a:focus,
a:hover {
color: #fff;
}
/* Custom default button */
.btn-default,
.btn-default:hover,
.btn-default:focus {
color: #333;
text-shadow: none; /* Prevent inheritence from `body` */
background-color: #fff;
border: 1px solid #fff;
}
/*
* Base structure
*/
html,
body {
height: 100%;
background-color: #333;
}
body {
color: #fff;
text-align: center;
text-shadow: 0 1px 3px rgba(0,0,0,.5);
box-shadow: inset 0 0 100px rgba(0,0,0,.5);
}
/* Extra markup and styles for table-esque vertical and horizontal centering */
.site-wrapper {
display: table;
width: 100%;
min-height: 100%;
}
.site-wrapper-inner {
display: table-cell;
vertical-align: top;
}
.cover-container {
margin-left: auto;
margin-right: auto;
}
/* Padding for spacing */
.inner {
padding: 30px;
}
/*
* Header
*/
.masthead-brand {
margin-top: 10px;
margin-bottom: 10px;
}
.masthead-nav > li {
display: inline-block;
}
.masthead-nav > li + li {
margin-left: 20px;
}
.masthead-nav > li > a {
padding-left: 0;
padding-right: 0;
font-size: 16px;
font-weight: bold;
color: #fff; /* IE8 proofing */
color: rgba(255,255,255,.75);
border-bottom: 2px solid transparent;
}
.masthead-nav > li > a:hover,
.masthead-nav > li > a:focus {
background-color: transparent;
border-bottom-color: rgba(255,255,255,.25);
}
.masthead-nav > .active > a,
.masthead-nav > .active > a:hover,
.masthead-nav > .active > a:focus {
color: #fff;
border-bottom-color: #fff;
}
@media (min-width: 768px) {
.masthead-brand {
float: left;
}
.masthead-nav {
float: right;
}
}
/*
* Cover
*/
.cover {
padding: 0 20px;
}
.cover .btn-lg {
padding: 10px 20px;
font-weight: bold;
}
/*
* Footer
*/
.mastfoot {
color: #999; /* IE8 proofing */
color: rgba(255,255,255,.5);
}
/*
* Affix and center
*/
@media (min-width: 768px) {
/* Pull out the header and footer */
.masthead {
position: fixed;
top: 0;
}
.mastfoot {
position: fixed;
bottom: 0;
}
/* Start the vertical centering */
.site-wrapper-inner {
vertical-align: middle;
}
/* Handle the widths */
.masthead,
.mastfoot,
.cover-container {
width: 100%; /* Must be percentage or pixels for horizontal alignment */
}
}
@media (min-width: 992px) {
.masthead,
.mastfoot,
.cover-container {
width: 700px;
}
}
examples/cover/index.html 0 → 100644
View file @ 12500047
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
<title>Cover Template for Bootstrap</title>
<!-- Bootstrap core CSS -->
<link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="cover.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
</head>
<body>
<div class="site-wrapper">
<div class="site-wrapper-inner">
<div class="cover-container">
<div class="masthead clearfix">
<div class="inner">
<h3 class="masthead-brand">Cover</h3>
<ul class="nav masthead-nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Features</a></li>
<li><a href="#">Contact</a></li>
</ul>
</div>
</div>
<div class="inner cover">
<h1 class="cover-heading">Cover your page.</h1>
<p class="lead">Cover is a one-page template for building simple and beautiful home pages. Download, edit the text, and add your own fullscreen background photo to make it your own.</p>
<p class="lead">
<a href="#" class="btn btn-lg btn-default">Learn more</a>
</p>
</div>
<div class="mastfoot">
<div class="inner">
<p>Cover template for <a href="http://getbootstrap.com">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
</div>
</div>
</div>
</div>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../docs-assets/js/holder.js"></script>
</body>
</html>
examples/dashboard/dashboard.css 0 → 100644
View file @ 12500047
/*
* Base structure
*/
/* Move down content because we have a fixed navbar that is 50px tall */
body {
padding-top: 50px;
}
/*
* Global add-ons
*/
.sub-header {
padding-bottom: 10px;
border-bottom: 1px solid #eee;
}
/*
* Sidebar
*/
/* Hide for mobile, show later */
.sidebar {
display: none;
}
@media (min-width: 768px) {
.sidebar {
position: fixed;
top: 0;
left: 0;
bottom: 0;
z-index: 1000;
display: block;
padding: 70px 20px 20px;
background-color: #f5f5f5;
border-right: 1px solid #eee;
}
}
/* Sidebar navigation */
.nav-sidebar {
margin-left: -20px;
margin-right: -21px; /* 20px padding + 1px border */
margin-bottom: 20px;
}
.nav-sidebar > li > a {
padding-left: 20px;
padding-right: 20px;
}
.nav-sidebar > .active > a {
color: #fff;
background-color: #428bca;
}
/*
* Main content
*/
.main {
padding: 20px;
}
@media (min-width: 768px) {
.main {
padding-left: 40px;
pading-right: 40px;
}
}
.main .page-header {
margin-top: 0;
}
/*
* Placeholder dashboard ideas
*/
.placeholders {
margin-bottom: 30px;
text-align: center;
}
.placeholders h4 {
margin-bottom: 0;
}
.placeholder {
margin-bottom: 20px;
}
.placeholder img {
border-radius: 50%;
}
examples/dashboard/index.html 0 → 100644
View file @ 12500047
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
<title>Dashboard Template for Bootstrap</title>
<!-- Bootstrap core CSS -->
<link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="dashboard.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Dashboard</a></li>
<li><a href="#">Settings</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Help</a></li>
</ul>
<form action="" class="navbar-form navbar-right">
<input type="text" class="form-control" placeholder="Search...">
</form>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 sidebar">
<ul class="nav nav-sidebar">
<li class="active"><a href="#">Overview</a></li>
<li><a href="#">Reports</a></li>
<li><a href="#">Analytics</a></li>
<li><a href="#">Export</a></li>
</ul>
<ul class="nav nav-sidebar">
<li><a href="">Nav item</a></li>
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
<li><a href="">More navigation</a></li>
</ul>
<ul class="nav nav-sidebar">
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
</ul>
</div>
<div class="col-sm-9 col-sm-offset-3 main">
<h1 class="page-header">Dashboard</h1>
<div class="row placeholders">
<div class="col-xs-6 col-sm-3 placeholder">
<img data-src="holder.js/200x200/auto/sky" class="img-responsive" alt="Generic placeholder thumbnail">
<h4>Label</h4>
<span class="text-muted">Something else</span>
</div>
<div class="col-xs-6 col-sm-3 placeholder">
<img data-src="holder.js/200x200/auto/vine" class="img-responsive" alt="Generic placeholder thumbnail">
<h4>Label</h4>
<span class="text-muted">Something else</span>
</div>
<div class="col-xs-6 col-sm-3 placeholder">
<img data-src="holder.js/200x200/auto/sky" class="img-responsive" alt="Generic placeholder thumbnail">
<h4>Label</h4>
<span class="text-muted">Something else</span>
</div>
<div class="col-xs-6 col-sm-3 placeholder">
<img data-src="holder.js/200x200/auto/vine" class="img-responsive" alt="Generic placeholder thumbnail">
<h4>Label</h4>
<span class="text-muted">Something else</span>
</div>
</div>
<h2 class="sub-header">Section title</h2>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>#</th>
<th>Header</th>
<th>Header</th>
<th>Header</th>
<th>Header</th>
</tr>
</thead>
<tbody>
<tr>
<td>1,001</td>
<td>Lorem</td>
<td>ipsum</td>
<td>dolor</td>
<td>sit</td>
</tr>
<tr>
<td>1,002</td>
<td>amet</td>
<td>consectetur</td>
<td>adipiscing</td>
<td>elit</td>
</tr>
<tr>
<td>1,003</td>
<td>Integer</td>
<td>nec</td>
<td>odio</td>
<td>Praesent</td>
</tr>
<tr>
<td>1,003</td>
<td>libero</td>
<td>Sed</td>
<td>cursus</td>
<td>ante</td>
</tr>
<tr>
<td>1,004</td>
<td>dapibus</td>
<td>diam</td>
<td>Sed</td>
<td>nisi</td>
</tr>
<tr>
<td>1,005</td>
<td>Nulla</td>
<td>quis</td>
<td>sem</td>
<td>at</td>
</tr>
<tr>
<td>1,006</td>
<td>nibh</td>
<td>elementum</td>
<td>imperdiet</td>
<td>Duis</td>
</tr>
<tr>
<td>1,007</td>
<td>sagittis</td>
<td>ipsum</td>
<td>Praesent</td>
<td>mauris</td>
</tr>
<tr>
<td>1,008</td>
<td>Fusce</td>
<td>nec</td>
<td>tellus</td>
<td>sed</td>
</tr>
<tr>
<td>1,009</td>
<td>augue</td>
<td>semper</td>
<td>porta</td>
<td>Mauris</td>
</tr>
<tr>
<td>1,010</td>
<td>massa</td>
<td>Vestibulum</td>
<td>lacinia</td>
<td>arcu</td>
</tr>
<tr>
<td>1,011</td>
<td>eget</td>
<td>nulla</td>
<td>Class</td>
<td>aptent</td>
</tr>
<tr>
<td>1,012</td>
<td>taciti</td>
<td>sociosqu</td>
<td>ad</td>
<td>litora</td>
</tr>
<tr>
<td>1,013</td>
<td>torquent</td>
<td>per</td>
<td>conubia</td>
<td>nostra</td>
</tr>
<tr>
<td>1,014</td>
<td>per</td>
<td>inceptos</td>
<td>himenaeos</td>
<td>Curabitur</td>
</tr>
<tr>
<td>1,015</td>
<td>sodales</td>
<td>ligula</td>
<td>in</td>
<td>libero</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../docs-assets/js/holder.js"></script>
</body>
</html>
examples/screenshots/jumbotron.jpg
View replaced file @ b92bee99 View file @ 12500047
examples/screenshots/jumbotron.jpg

119 KB | W: | H:

examples/screenshots/jumbotron.jpg

98.8 KB | W: | H:

examples/screenshots/jumbotron.jpg
examples/screenshots/jumbotron.jpg
examples/screenshots/jumbotron.jpg
examples/screenshots/jumbotron.jpg
  • 2-up
  • Swipe
  • Onion skin
examples/screenshots/theme.jpg
View replaced file @ b92bee99 View file @ 12500047
examples/screenshots/theme.jpg

93.2 KB | W: | H:

examples/screenshots/theme.jpg

83.5 KB | W: | H:

examples/screenshots/theme.jpg
examples/screenshots/theme.jpg
examples/screenshots/theme.jpg
examples/screenshots/theme.jpg
  • 2-up
  • Swipe
  • Onion skin
getting-started.html
View file @ 12500047
...@@ -17,7 +17,7 @@ base_url: "../" ...@@ -17,7 +17,7 @@ base_url: "../"
<h3 id="download-compiled">Compiled CSS, JS, and fonts</h3> <h3 id="download-compiled">Compiled CSS, JS, and fonts</h3>
<p>The fastest way to get Bootstrap is to download the precompiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source code files are included.</p> <p>The fastest way to get Bootstrap is to download the precompiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source code files are included.</p>
<p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);" role="button">Download precompiled Bootstrap</a></p> <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);" role="button">Download Bootstrap</a></p>
<h3 id="download-additional">Additional downloads</h3> <h3 id="download-additional">Additional downloads</h3>
<div class="bs-docs-dl-options"> <div class="bs-docs-dl-options">
...@@ -261,6 +261,22 @@ bootstrap/ ...@@ -261,6 +261,22 @@ bootstrap/
<h4>Carousel</h4> <h4>Carousel</h4>
<p>Customize the navbar and carousel, then add some new components.</p> <p>Customize the navbar and carousel, then add some new components.</p>
</div> </div>
<div class="col-xs-6 col-md-4">
<a class="thumbnail" href="../examples/cover/">
<img src="../examples/screenshots/cover.jpg" alt="">
</a>
<h4>Cover</h4>
<p>A one-page template for building simple and beautiful home pages.</p>
</div>
<div class="clearfix visible-xs"></div>
<div class="col-xs-6 col-md-4">
<a class="thumbnail" href="../examples/dashboard/">
<img src="../examples/screenshots/dashboard.jpg" alt="">
</a>
<h4>Dashboard</h4>
<p>Basic structure for a admin dashboard with fixed sidebar and navbar.</p>
</div>
<div class="col-xs-6 col-md-4"> <div class="col-xs-6 col-md-4">
<a class="thumbnail" href="../examples/non-responsive/"> <a class="thumbnail" href="../examples/non-responsive/">
<img src="../examples/screenshots/non-responsive.jpg" alt=""> <img src="../examples/screenshots/non-responsive.jpg" alt="">
...@@ -805,7 +821,8 @@ bootstrap/ ...@@ -805,7 +821,8 @@ bootstrap/
{% highlight html %} {% highlight html %}
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
{% endhighlight %} {% endhighlight %}
<p>This tag is included in all docs pages and examples to ensure the best rendering possible in each supported version of Internet Explorer.</p> <p>Confirm the document mode by opening the debugging tools: press <kbd>F12</kbd> and check the "Document Mode".</p>
<p>This tag is included in all Bootstrap's documentation and examples to ensure the best rendering possible in each supported version of Internet Explorer.</p>
<p>See <a href="http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge">this StackOverflow question</a> for more information.</p> <p>See <a href="http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge">this StackOverflow question</a> for more information.</p>
<h3 id="ie-10-width">Internet Explorer 10 in Windows 8 and Windows Phone 8</h3> <h3 id="ie-10-width">Internet Explorer 10 in Windows 8 and Windows Phone 8</h3>
......
javascript.html
View file @ 12500047
...@@ -30,7 +30,7 @@ base_url: "../" ...@@ -30,7 +30,7 @@ base_url: "../"
<h3 id="js-data-attrs">Data attributes</h3> <h3 id="js-data-attrs">Data attributes</h3>
<p>You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first-class API and should be your first consideration when using a plugin.</p> <p>You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first-class API and should be your first consideration when using a plugin.</p>
<p>That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the document namespaced with <code>data-api</code>. This looks like this: <p>That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the document namespaced with <code>data-api</code>. This looks like this:</p>
{% highlight js %} {% highlight js %}
$(document).off('.data-api') $(document).off('.data-api')
{% endhighlight %} {% endhighlight %}
...@@ -50,7 +50,7 @@ $('.btn.danger').button('toggle').addClass('fat') ...@@ -50,7 +50,7 @@ $('.btn.danger').button('toggle').addClass('fat')
{% highlight js %} {% highlight js %}
$('#myModal').modal() // initialized with defaults $('#myModal').modal() // initialized with defaults
$('#myModal').modal({ keyboard: false }) // initialized with no keyboard $('#myModal').modal({ keyboard: false }) // initialized with no keyboard
$('#myModal').modal('show') // initializes and invokes show immediately</p> $('#myModal').modal('show') // initializes and invokes show immediately
{% endhighlight %} {% endhighlight %}
<p>Each plugin also exposes its raw constructor on a <code>Constructor</code> property: <code>$.fn.popover.Constructor</code>. If you'd like to get a particular plugin instance, retrieve it directly from an element: <code>$('[rel=popover]').data('popover')</code>.</p> <p>Each plugin also exposes its raw constructor on a <code>Constructor</code> property: <code>$.fn.popover.Constructor</code>. If you'd like to get a particular plugin instance, retrieve it directly from an element: <code>$('[rel=popover]').data('popover')</code>.</p>
...@@ -415,7 +415,7 @@ $('#myModal').on('hidden.bs.modal', function (e) { ...@@ -415,7 +415,7 @@ $('#myModal').on('hidden.bs.modal', function (e) {
</nav> <!-- /navbar-example --> </nav> <!-- /navbar-example -->
</div> <!-- /example --> </div> <!-- /example -->
<h3>Within tabs</h3> <h3>Within pills</h3>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class="active"><a href="#">Regular link</a></li> <li class="active"><a href="#">Regular link</a></li>
...@@ -449,7 +449,7 @@ $('#myModal').on('hidden.bs.modal', function (e) { ...@@ -449,7 +449,7 @@ $('#myModal').on('hidden.bs.modal', function (e) {
<li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Separated link</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Separated link</a></li>
</ul> </ul>
</li> </li>
</ul> <!-- /tabs --> </ul> <!-- /pills -->
</div> <!-- /example --> </div> <!-- /example -->
......
js/.jscs.json 0 → 100644
View file @ 12500047
{
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return"],
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"disallowKeywords": ["with"],
"validateLineBreaks": "LF",
"requireLineFeedAtFileEnd": true
}
js/dropdown.js
View file @ 12500047
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index=0 if (!~index) index = 0
$items.eq(index).focus() $items.eq(index).focus()
} }
......
js/modal.js
View file @ 12500047
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
} else if (!this.isShown && this.$backdrop) { } else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in') this.$backdrop.removeClass('in')
$.support.transition && this.$element.hasClass('fade')? $.support.transition && this.$element.hasClass('fade') ?
this.$backdrop this.$backdrop
.one($.support.transition.end, callback) .one($.support.transition.end, callback)
.emulateTransitionEnd(150) : .emulateTransitionEnd(150) :
......
js/tests/unit/modal.js
View file @ 12500047
...@@ -74,7 +74,7 @@ $(function () { ...@@ -74,7 +74,7 @@ $(function () {
ok($('#modal-test').length, 'modal inserted into dom') ok($('#modal-test').length, 'modal inserted into dom')
$(this).modal("hide") $(this).modal("hide")
}) })
.on("hidden.bs.modal", function() { .on("hidden.bs.modal", function () {
ok(!$('#modal-test').is(":visible"), 'modal hidden') ok(!$('#modal-test').is(":visible"), 'modal hidden')
$('#modal-test').remove() $('#modal-test').remove()
start() start()
...@@ -92,7 +92,7 @@ $(function () { ...@@ -92,7 +92,7 @@ $(function () {
ok($('#modal-test').length, 'modal inserted into dom') ok($('#modal-test').length, 'modal inserted into dom')
div.modal("toggle") div.modal("toggle")
}) })
.on("hidden.bs.modal", function() { .on("hidden.bs.modal", function () {
ok(!$('#modal-test').is(":visible"), 'modal hidden') ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove() div.remove()
start() start()
...@@ -110,7 +110,7 @@ $(function () { ...@@ -110,7 +110,7 @@ $(function () {
ok($('#modal-test').length, 'modal inserted into dom') ok($('#modal-test').length, 'modal inserted into dom')
div.find('.close').click() div.find('.close').click()
}) })
.on("hidden.bs.modal", function() { .on("hidden.bs.modal", function () {
ok(!$('#modal-test').is(":visible"), 'modal hidden') ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove() div.remove()
start() start()
...@@ -127,7 +127,7 @@ $(function () { ...@@ -127,7 +127,7 @@ $(function () {
ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').is(":visible"), 'modal visible')
div.modal("hide") div.modal("hide")
}) })
.on("hidden.bs.modal", function() { .on("hidden.bs.modal", function () {
ok(!$('#modal-test').is(":visible"), 'modal hidden') ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove() div.remove()
start() start()
...@@ -146,7 +146,7 @@ $(function () { ...@@ -146,7 +146,7 @@ $(function () {
ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').is(":visible"), 'modal visible')
$('#modal-test').click() $('#modal-test').click()
}) })
.bind("hidden.bs.modal", function() { .bind("hidden.bs.modal", function () {
ok(!$('#modal-test').is(":visible"), 'modal hidden') ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove() div.remove()
start() start()
...@@ -164,7 +164,7 @@ $(function () { ...@@ -164,7 +164,7 @@ $(function () {
triggered = 0 triggered = 0
$('#modal-test').click() $('#modal-test').click()
}) })
.one("hidden.bs.modal", function() { .one("hidden.bs.modal", function () {
div.modal("show") div.modal("show")
}) })
.bind("hide.bs.modal", function () { .bind("hide.bs.modal", function () {
...@@ -184,7 +184,7 @@ $(function () { ...@@ -184,7 +184,7 @@ $(function () {
$('#close').click() $('#close').click()
ok(!$('#modal-test').is(":visible"), 'modal hidden') ok(!$('#modal-test').is(":visible"), 'modal hidden')
}) })
.one("hidden.bs.modal", function() { .one("hidden.bs.modal", function () {
div.one('hidden.bs.modal', function () { div.one('hidden.bs.modal', function () {
start() start()
}).modal("show") }).modal("show")
......
js/tests/unit/phantom.js
View file @ 12500047
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
} }
// These methods connect QUnit to PhantomJS. // These methods connect QUnit to PhantomJS.
QUnit.log = function(obj) { QUnit.log = function (obj) {
// What is this I don’t even // What is this I don’t even
if (obj.message === '[object Object], undefined:undefined') { return } if (obj.message === '[object Object], undefined:undefined') { return }
// Parse some stuff before sending it. // Parse some stuff before sending it.
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
sendMessage('qunit.log', obj.result, actual, expected, obj.message, obj.source) sendMessage('qunit.log', obj.result, actual, expected, obj.message, obj.source)
} }
QUnit.testStart = function(obj) { QUnit.testStart = function (obj) {
sendMessage('qunit.testStart', obj.name) sendMessage('qunit.testStart', obj.name)
} }
QUnit.testDone = function(obj) { QUnit.testDone = function (obj) {
sendMessage('qunit.testDone', obj.name, obj.failed, obj.passed, obj.total) sendMessage('qunit.testDone', obj.name, obj.failed, obj.passed, obj.total)
} }
QUnit.moduleStart = function(obj) { QUnit.moduleStart = function (obj) {
sendMessage('qunit.moduleStart', obj.name) sendMessage('qunit.moduleStart', obj.name)
} }
......
js/tests/unit/popover.js
View file @ 12500047
...@@ -97,7 +97,7 @@ $(function () { ...@@ -97,7 +97,7 @@ $(function () {
$('#qunit-fixture').empty() $('#qunit-fixture').empty()
}) })
test("should respect custom classes", function() { test("should respect custom classes", function () {
$.support.transition = false $.support.transition = false
var popover = $('<a href="#">@fat</a>') var popover = $('<a href="#">@fat</a>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
...@@ -118,7 +118,7 @@ $(function () { ...@@ -118,7 +118,7 @@ $(function () {
}) })
test("should destroy popover", function () { test("should destroy popover", function () {
var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function(){}) var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function () {})
ok(popover.data('bs.popover'), 'popover has data') ok(popover.data('bs.popover'), 'popover has data')
ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event') ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event')
ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event') ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event')
......
js/tests/unit/scrollspy.js
View file @ 12500047
...@@ -19,7 +19,7 @@ $(function () { ...@@ -19,7 +19,7 @@ $(function () {
test("should switch active class on scroll", function () { test("should switch active class on scroll", function () {
var sectionHTML = '<div id="masthead"></div>' var sectionHTML = '<div id="masthead"></div>'
, $section = $(sectionHTML).append('#qunit-fixture') , $section = $(sectionHTML).append('#qunit-fixture')
, topbarHTML ='<div class="topbar">' , topbarHTML = '<div class="topbar">'
+ '<div class="topbar-inner">' + '<div class="topbar-inner">'
+ '<div class="container">' + '<div class="container">'
+ '<h3><a href="#">Bootstrap</a></h3>' + '<h3><a href="#">Bootstrap</a></h3>'
......
js/tests/unit/tab.js
View file @ 12500047
...@@ -76,9 +76,9 @@ $(function () { ...@@ -76,9 +76,9 @@ $(function () {
+ '</ul>' + '</ul>'
$(dropHTML).find('ul>li:first a').tab('show').end() $(dropHTML).find('ul>li:first a').tab('show').end()
.find('ul>li:last a').on('show', function(event){ .find('ul>li:last a').on('show', function (event) {
equal(event.relatedTarget.hash, "#1-1") equal(event.relatedTarget.hash, "#1-1")
}).on('shown', function(event){ }).on('shown', function (event) {
equal(event.relatedTarget.hash, "#1-1") equal(event.relatedTarget.hash, "#1-1")
}).tab('show') }).tab('show')
}) })
......
js/tests/unit/tooltip.js
View file @ 12500047
...@@ -69,7 +69,7 @@ $(function () { ...@@ -69,7 +69,7 @@ $(function () {
test("should fire show event", function () { test("should fire show event", function () {
stop() stop()
var tooltip = $('<div title="tooltip title"></div>') var tooltip = $('<div title="tooltip title"></div>')
.on("show.bs.tooltip", function() { .on("show.bs.tooltip", function () {
ok(true, "show was called") ok(true, "show was called")
start() start()
}) })
...@@ -79,7 +79,7 @@ $(function () { ...@@ -79,7 +79,7 @@ $(function () {
test("should fire shown event", function () { test("should fire shown event", function () {
stop() stop()
var tooltip = $('<div title="tooltip title"></div>') var tooltip = $('<div title="tooltip title"></div>')
.on("shown.bs.tooltip", function() { .on("shown.bs.tooltip", function () {
ok(true, "shown was called") ok(true, "shown was called")
start() start()
}) })
...@@ -89,12 +89,12 @@ $(function () { ...@@ -89,12 +89,12 @@ $(function () {
test("should not fire shown event when default prevented", function () { test("should not fire shown event when default prevented", function () {
stop() stop()
var tooltip = $('<div title="tooltip title"></div>') var tooltip = $('<div title="tooltip title"></div>')
.on("show.bs.tooltip", function(e) { .on("show.bs.tooltip", function (e) {
e.preventDefault() e.preventDefault()
ok(true, "show was called") ok(true, "show was called")
start() start()
}) })
.on("shown.bs.tooltip", function() { .on("shown.bs.tooltip", function () {
ok(false, "shown was called") ok(false, "shown was called")
}) })
.tooltip('show') .tooltip('show')
...@@ -103,10 +103,10 @@ $(function () { ...@@ -103,10 +103,10 @@ $(function () {
test("should fire hide event", function () { test("should fire hide event", function () {
stop() stop()
var tooltip = $('<div title="tooltip title"></div>') var tooltip = $('<div title="tooltip title"></div>')
.on("shown.bs.tooltip", function() { .on("shown.bs.tooltip", function () {
$(this).tooltip('hide') $(this).tooltip('hide')
}) })
.on("hide.bs.tooltip", function() { .on("hide.bs.tooltip", function () {
ok(true, "hide was called") ok(true, "hide was called")
start() start()
}) })
...@@ -116,10 +116,10 @@ $(function () { ...@@ -116,10 +116,10 @@ $(function () {
test("should fire hidden event", function () { test("should fire hidden event", function () {
stop() stop()
var tooltip = $('<div title="tooltip title"></div>') var tooltip = $('<div title="tooltip title"></div>')
.on("shown.bs.tooltip", function() { .on("shown.bs.tooltip", function () {
$(this).tooltip('hide') $(this).tooltip('hide')
}) })
.on("hidden.bs.tooltip", function() { .on("hidden.bs.tooltip", function () {
ok(true, "hidden was called") ok(true, "hidden was called")
start() start()
}) })
...@@ -129,15 +129,15 @@ $(function () { ...@@ -129,15 +129,15 @@ $(function () {
test("should not fire hidden event when default prevented", function () { test("should not fire hidden event when default prevented", function () {
stop() stop()
var tooltip = $('<div title="tooltip title"></div>') var tooltip = $('<div title="tooltip title"></div>')
.on("shown.bs.tooltip", function() { .on("shown.bs.tooltip", function () {
$(this).tooltip('hide') $(this).tooltip('hide')
}) })
.on("hide.bs.tooltip", function(e) { .on("hide.bs.tooltip", function (e) {
e.preventDefault() e.preventDefault()
ok(true, "hide was called") ok(true, "hide was called")
start() start()
}) })
.on("hidden.bs.tooltip", function() { .on("hidden.bs.tooltip", function () {
ok(false, "hidden was called") ok(false, "hidden was called")
}) })
.tooltip('show') .tooltip('show')
...@@ -258,7 +258,7 @@ $(function () { ...@@ -258,7 +258,7 @@ $(function () {
}) })
test("should destroy tooltip", function () { test("should destroy tooltip", function () {
var tooltip = $('<div/>').tooltip().on('click.foo', function(){}) var tooltip = $('<div/>').tooltip().on('click.foo', function () {})
ok(tooltip.data('bs.tooltip'), 'tooltip has data') ok(tooltip.data('bs.tooltip'), 'tooltip has data')
ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event') ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event')
ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event') ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event')
...@@ -290,25 +290,25 @@ $(function () { ...@@ -290,25 +290,25 @@ $(function () {
test("should place tooltips inside the body", function () { test("should place tooltips inside the body", function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.tooltip({container:'body'}) .tooltip({container: 'body'})
.tooltip('show') .tooltip('show')
ok($("body > .tooltip").length, 'inside the body') ok($("body > .tooltip").length, 'inside the body')
ok(!$("#qunit-fixture > .tooltip").length, 'not found in parent') ok(!$("#qunit-fixture > .tooltip").length, 'not found in parent')
tooltip.tooltip('hide') tooltip.tooltip('hide')
}) })
test("should place tooltip inside window", function(){ test("should place tooltip inside window", function () {
var container = $("<div />").appendTo("body") var container = $("<div />").appendTo("body")
.css({position: "absolute", width: 200, height: 200, bottom: 0, left: 0}) .css({position: "absolute", width: 200, height: 200, bottom: 0, left: 0})
, tooltip = $("<a href='#' title='Very very very very very very very very long tooltip'>Hover me</a>") , tooltip = $("<a href='#' title='Very very very very very very very very long tooltip'>Hover me</a>")
.css({position: "absolute", top:0, left: 0}) .css({position: "absolute", top: 0, left: 0})
.appendTo(container) .appendTo(container)
.tooltip({placement: "top", animate: false}) .tooltip({placement: "top", animate: false})
.tooltip("show") .tooltip("show")
stop() stop()
setTimeout(function(){ setTimeout(function () {
ok($(".tooltip").offset().left >= 0) ok($(".tooltip").offset().left >= 0)
start() start()
...@@ -316,7 +316,7 @@ $(function () { ...@@ -316,7 +316,7 @@ $(function () {
}, 100) }, 100)
}) })
test("should place tooltip on top of element", function(){ test("should place tooltip on top of element", function () {
var container = $("<div />").appendTo("body") var container = $("<div />").appendTo("body")
.css({position: "absolute", bottom: 0, left: 0, textAlign: "right", width: 300, height: 300}) .css({position: "absolute", bottom: 0, left: 0, textAlign: "right", width: 300, height: 300})
, p = $("<p style='margin-top:200px' />").appendTo(container) , p = $("<p style='margin-top:200px' />").appendTo(container)
...@@ -328,7 +328,7 @@ $(function () { ...@@ -328,7 +328,7 @@ $(function () {
stop() stop()
setTimeout(function(){ setTimeout(function () {
var tooltip = container.find(".tooltip") var tooltip = container.find(".tooltip")
start() start()
...@@ -337,7 +337,7 @@ $(function () { ...@@ -337,7 +337,7 @@ $(function () {
}, 100) }, 100)
}) })
test("should add position class before positioning so that position-specific styles are taken into account", function(){ test("should add position class before positioning so that position-specific styles are taken into account", function () {
$("head").append('<style> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>') $("head").append('<style> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>')
var container = $("<div />").appendTo("body") var container = $("<div />").appendTo("body")
...@@ -347,7 +347,7 @@ $(function () { ...@@ -347,7 +347,7 @@ $(function () {
.tooltip('show') .tooltip('show')
, tooltip = container.find(".tooltip") , tooltip = container.find(".tooltip")
ok( Math.round(target.offset().top + target[0].offsetHeight/2 - tooltip[0].offsetHeight/2) === Math.round(tooltip.offset().top) ) ok( Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2)) === Math.round(tooltip.offset().top) )
target.tooltip('hide') target.tooltip('hide')
}) })
......
js/tooltip.js
View file @ 12500047
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
} }
Tooltip.prototype.show = function () { Tooltip.prototype.show = function () {
var e = $.Event('show.bs.'+ this.type) var e = $.Event('show.bs.' + this.type)
if (this.hasContent() && this.enabled) { if (this.hasContent() && this.enabled) {
this.$element.trigger(e) this.$element.trigger(e)
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
} }
} }
Tooltip.prototype.applyPlacement = function(offset, placement) { Tooltip.prototype.applyPlacement = function (offset, placement) {
var replace var replace
var $tip = this.tip() var $tip = this.tip()
var width = $tip[0].offsetWidth var width = $tip[0].offsetWidth
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
if (replace) $tip.offset(offset) if (replace) $tip.offset(offset)
} }
Tooltip.prototype.replaceArrow = function(delta, dimension, position) { Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
} }
......
less/buttons.less
View file @ 12500047
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
.btn-primary { .btn-primary {
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
} }
// Success appears as green
.btn-success {
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
}
// Warning appears as orange // Warning appears as orange
.btn-warning { .btn-warning {
.button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
...@@ -64,10 +68,6 @@ ...@@ -64,10 +68,6 @@
.btn-danger { .btn-danger {
.button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
} }
// Success appears as green
.btn-success {
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
}
// Info appears as blue-green // Info appears as blue-green
.btn-info { .btn-info {
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
......
less/code.less
View file @ 12500047
...@@ -21,6 +21,16 @@ code { ...@@ -21,6 +21,16 @@ code {
border-radius: @border-radius-base; border-radius: @border-radius-base;
} }
// User input typically entered via keyboard
kbd {
padding: 2px 4px;
font-size: 90%;
color: @kbd-color;
background-color: @kbd-bg;
border-radius: @border-radius-small;
box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
}
// Blocks of code // Blocks of code
pre { pre {
display: block; display: block;
......
less/grid.less
View file @ 12500047
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
// Grid system // Grid system
// -------------------------------------------------- // --------------------------------------------------
// Set the container width, and override it for fixed navbars in media queries
// Container widths
//
// Set the container width, and override it for fixed navbars in media queries.
.container { .container {
.container-fixed(); .container-fixed();
...@@ -17,12 +21,30 @@ ...@@ -17,12 +21,30 @@
} }
} }
// mobile first defaults
// Fluid container
//
// Utilizes the mixin meant for fixed width containers, but without any defined
// width for fluid, full width layouts.
.container-fluid {
.container-fixed();
}
// Row
//
// Rows contain and clear the floats of your columns.
.row { .row {
.make-row(); .make-row();
} }
// Columns
//
// Common styles for small and large grid columns // Common styles for small and large grid columns
.make-grid-columns(); .make-grid-columns();
...@@ -76,4 +98,3 @@ ...@@ -76,4 +98,3 @@
.make-grid(@grid-columns, lg, push); .make-grid(@grid-columns, lg, push);
.make-grid(@grid-columns, lg, offset); .make-grid(@grid-columns, lg, offset);
} }
less/list-group.less
View file @ 12500047
...@@ -2,17 +2,21 @@ ...@@ -2,17 +2,21 @@
// List groups // List groups
// -------------------------------------------------- // --------------------------------------------------
// Base class // Base class
// //
// Easily usable on <ul>, <ol>, or <div>. // Easily usable on <ul>, <ol>, or <div>.
.list-group { .list-group {
// No need to set list-style: none; since .list-group-item is block level // No need to set list-style: none; since .list-group-item is block level
margin-bottom: 20px; margin-bottom: 20px;
padding-left: 0; // reset padding because ul and ol padding-left: 0; // reset padding because ul and ol
} }
// Individual list items // Individual list items
// ------------------------- //
// Use on `li`s or `div`s within the `.list-group` parent.
.list-group-item { .list-group-item {
position: relative; position: relative;
...@@ -41,7 +45,12 @@ ...@@ -41,7 +45,12 @@
} }
} }
// Linked list items // Linked list items
//
// Use anchor elements instead of `li`s or `div`s to create linked list items.
// Includes an extra `.active` modifier class for showing selected items.
a.list-group-item { a.list-group-item {
color: @list-group-link-color; color: @list-group-link-color;
...@@ -75,8 +84,21 @@ a.list-group-item { ...@@ -75,8 +84,21 @@ a.list-group-item {
} }
} }
// Contextual variants
//
// Add modifier classes to change text and background color on individual items.
// Organizationally, this must come after the `:hover` states.
.list-group-item-variant(success; @state-success-bg; @state-success-text);
.list-group-item-variant(warning; @state-warning-bg; @state-warning-text);
.list-group-item-variant(danger; @state-danger-bg; @state-danger-text);
.list-group-item-variant(info; @state-info-bg; @state-info-text);
// Custom content options // Custom content options
// ------------------------- //
// Extra classes for creating well-formatted content within `.list-group-item`s.
.list-group-item-heading { .list-group-item-heading {
margin-top: 0; margin-top: 0;
......
less/mixins.less
View file @ 12500047
...@@ -437,6 +437,33 @@ ...@@ -437,6 +437,33 @@
} }
} }
// List Groups
// -------------------------
.list-group-item-variant(@state; @background; @color) {
.list-group-item-@{state} {
color: @color;
background-color: @background;
}
a.list-group-item-@{state} {
color: @color;
.list-group-item-heading { color: inherit; }
&:hover,
&:focus {
color: @color;
background-color: darken(@background, 5%);
}
&.active,
&.active:hover,
&.active:focus {
color: #fff;
background-color: @color;
border-color: @color;
}
}
}
// Button variants // Button variants
// ------------------------- // -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active, // Easily pump out default styles, as well as :hover, :focus, :active,
...@@ -475,7 +502,7 @@ ...@@ -475,7 +502,7 @@
.badge { .badge {
color: @background; color: @background;
background-color: #fff; background-color: @color;
} }
} }
......
less/navbar.less
View file @ 12500047
...@@ -93,14 +93,17 @@ ...@@ -93,14 +93,17 @@
// //
// When a container is present, change the behavior of the header and collapse. // When a container is present, change the behavior of the header and collapse.
.container > .navbar-header, .container,
.container > .navbar-collapse { .container-fluid {
margin-right: -@navbar-padding-horizontal; > .navbar-header,
margin-left: -@navbar-padding-horizontal; > .navbar-collapse {
margin-right: -@navbar-padding-horizontal;
@media (min-width: @grid-float-breakpoint) { margin-left: -@navbar-padding-horizontal;
margin-right: 0;
margin-left: 0; @media (min-width: @grid-float-breakpoint) {
margin-right: 0;
margin-left: 0;
}
} }
} }
...@@ -159,7 +162,8 @@ ...@@ -159,7 +162,8 @@
} }
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
.navbar > .container & { .navbar > .container &,
.navbar > .container-fluid & {
margin-left: -@navbar-padding-horizontal; margin-left: -@navbar-padding-horizontal;
} }
} }
......
less/tables.less
View file @ 12500047
...@@ -156,8 +156,9 @@ table { ...@@ -156,8 +156,9 @@ table {
// Generate the contextual variants // Generate the contextual variants
.table-row-variant(active; @table-bg-active); .table-row-variant(active; @table-bg-active);
.table-row-variant(success; @state-success-bg); .table-row-variant(success; @state-success-bg);
.table-row-variant(danger; @state-danger-bg);
.table-row-variant(warning; @state-warning-bg); .table-row-variant(warning; @state-warning-bg);
.table-row-variant(danger; @state-danger-bg);
.table-row-variant(info; @state-info-bg);
// Responsive tables // Responsive tables
......
less/type.less
View file @ 12500047
...@@ -120,6 +120,7 @@ cite { font-style: normal; } ...@@ -120,6 +120,7 @@ cite { font-style: normal; }
.text-left { text-align: left; } .text-left { text-align: left; }
.text-right { text-align: right; } .text-right { text-align: right; }
.text-center { text-align: center; } .text-center { text-align: center; }
.text-justify { text-align: justify; }
// Page header // Page header
......
less/variables.less
View file @ 12500047
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
// Navbar toggle // Navbar toggle
@navbar-default-toggle-hover-bg: #ddd; @navbar-default-toggle-hover-bg: #ddd;
@navbar-default-toggle-icon-bar-bg: #ccc; @navbar-default-toggle-icon-bar-bg: #888;
@navbar-default-toggle-border-color: #ddd; @navbar-default-toggle-border-color: #ddd;
...@@ -602,6 +602,9 @@ ...@@ -602,6 +602,9 @@
@code-color: #c7254e; @code-color: #c7254e;
@code-bg: #f9f2f4; @code-bg: #f9f2f4;
@kbd-color: #fff;
@kbd-bg: #333;
@pre-bg: #f5f5f5; @pre-bg: #f5f5f5;
@pre-color: @gray-dark; @pre-color: @gray-dark;
@pre-border-color: #ccc; @pre-border-color: #ccc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment