Commit 83c60ef3 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'master' into pr/11107

Conflicts:
	docs-assets/js/raw-files.js
parents 3bfa630d 4afcebe0
Showing with 1616 additions and 393 deletions
+1616 -393
{
"always-semicolon": true,
"block-indent": 2,
"colon-space": true,
"color-case": "lower",
"color-shorthand": true,
"combinator-space": true,
"element-case": "lower",
"eof-newline": true,
"leading-zero": false,
"remove-empty-rulesets": true,
"rule-indent": 2,
"stick-brace": true,
"strip-spaces": true,
"unitless-zero": true,
"vendor-prefix-align": true,
"sort-order": [
[
"position",
"top",
"right",
"bottom",
"left",
"z-index",
"display",
"float",
"width",
"min-width",
"max-width",
"height",
"min-height",
"max-height",
"-webkit-box-sizing",
"-moz-box-sizing",
"box-sizing",
"padding",
"padding-top",
"padding-right",
"padding-bottom",
"padding-left",
"margin",
"margin-top",
"margin-right",
"margin-bottom",
"margin-left",
"overflow",
"overflow-x",
"overflow-y",
"-ms-overflow-x",
"-ms-overflow-y",
"clip",
"clear",
"font",
"font-family",
"font-size",
"font-style",
"font-weight",
"font-variant",
"font-size-adjust",
"font-stretch",
"font-effect",
"font-emphasize",
"font-emphasize-position",
"font-emphasize-style",
"font-smooth",
"-webkit-hyphens",
"-moz-hyphens",
"hyphens",
"line-height",
"color",
"text-align",
"-webkit-text-align-last",
"-moz-text-align-last",
"-ms-text-align-last",
"text-align-last",
"text-emphasis",
"text-emphasis-color",
"text-emphasis-style",
"text-emphasis-position",
"text-decoration",
"text-indent",
"text-justify",
"text-outline",
"-ms-text-overflow",
"text-overflow",
"text-overflow-ellipsis",
"text-overflow-mode",
"text-shadow",
"text-transform",
"text-wrap",
"letter-spacing",
"-ms-word-break",
"word-break",
"word-spacing",
"-ms-word-wrap",
"word-wrap",
"-moz-tab-size",
"-o-tab-size",
"tab-size",
"white-space",
"vertical-align",
"list-style",
"list-style-position",
"list-style-type",
"list-style-image",
"pointer-events",
"cursor",
"visibility",
"zoom",
"flex-direction",
"flex-order",
"flex-pack",
"flex-align",
"table-layout",
"empty-cells",
"caption-side",
"border-spacing",
"border-collapse",
"content",
"quotes",
"counter-reset",
"counter-increment",
"resize",
"-webkit-user-select",
"-moz-user-select",
"-ms-user-select",
"user-select",
"nav-index",
"nav-up",
"nav-right",
"nav-down",
"nav-left",
"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
"background",
"background-color",
"-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
"filter:progid:DXImageTransform.Microsoft.gradient",
"background-image",
"background-repeat",
"background-attachment",
"background-position",
"background-position-x",
"background-position-y",
"-webkit-background-clip",
"-moz-background-clip",
"background-clip",
"background-origin",
"-webkit-background-size",
"-moz-background-size",
"-o-background-size",
"background-size",
"border",
"border-color",
"border-style",
"border-width",
"border-top",
"border-top-color",
"border-top-style",
"border-top-width",
"border-right",
"border-right-color",
"border-right-style",
"border-right-width",
"border-bottom",
"border-bottom-color",
"border-bottom-style",
"border-bottom-width",
"border-left",
"border-left-color",
"border-left-style",
"border-left-width",
"border-radius",
"border-top-left-radius",
"border-top-right-radius",
"border-bottom-right-radius",
"border-bottom-left-radius",
"-webkit-border-image",
"-moz-border-image",
"-o-border-image",
"border-image",
"-webkit-border-image-source",
"-moz-border-image-source",
"-o-border-image-source",
"border-image-source",
"-webkit-border-image-slice",
"-moz-border-image-slice",
"-o-border-image-slice",
"border-image-slice",
"-webkit-border-image-width",
"-moz-border-image-width",
"-o-border-image-width",
"border-image-width",
"-webkit-border-image-outset",
"-moz-border-image-outset",
"-o-border-image-outset",
"border-image-outset",
"-webkit-border-image-repeat",
"-moz-border-image-repeat",
"-o-border-image-repeat",
"border-image-repeat",
"outline",
"outline-width",
"outline-style",
"outline-color",
"outline-offset",
"-webkit-box-shadow",
"-moz-box-shadow",
"box-shadow",
"filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
"-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
"opacity",
"-ms-interpolation-mode",
"-webkit-transition",
"-moz-transition",
"-ms-transition",
"-o-transition",
"transition",
"-webkit-transition-delay",
"-moz-transition-delay",
"-ms-transition-delay",
"-o-transition-delay",
"transition-delay",
"-webkit-transition-timing-function",
"-moz-transition-timing-function",
"-ms-transition-timing-function",
"-o-transition-timing-function",
"transition-timing-function",
"-webkit-transition-duration",
"-moz-transition-duration",
"-ms-transition-duration",
"-o-transition-duration",
"transition-duration",
"-webkit-transition-property",
"-moz-transition-property",
"-ms-transition-property",
"-o-transition-property",
"transition-property",
"-webkit-transform",
"-moz-transform",
"-ms-transform",
"-o-transform",
"transform",
"-webkit-transform-origin",
"-moz-transform-origin",
"-ms-transform-origin",
"-o-transform-origin",
"transform-origin",
"-webkit-animation",
"-moz-animation",
"-ms-animation",
"-o-animation",
"animation",
"-webkit-animation-name",
"-moz-animation-name",
"-ms-animation-name",
"-o-animation-name",
"animation-name",
"-webkit-animation-duration",
"-moz-animation-duration",
"-ms-animation-duration",
"-o-animation-duration",
"animation-duration",
"-webkit-animation-play-state",
"-moz-animation-play-state",
"-ms-animation-play-state",
"-o-animation-play-state",
"animation-play-state",
"-webkit-animation-timing-function",
"-moz-animation-timing-function",
"-ms-animation-timing-function",
"-o-animation-timing-function",
"animation-timing-function",
"-webkit-animation-delay",
"-moz-animation-delay",
"-ms-animation-delay",
"-o-animation-delay",
"animation-delay",
"-webkit-animation-iteration-count",
"-moz-animation-iteration-count",
"-ms-animation-iteration-count",
"-o-animation-iteration-count",
"animation-iteration-count",
"-webkit-animation-direction",
"-moz-animation-direction",
"-ms-animation-direction",
"-o-animation-direction",
"animation-direction"
]
]
}
.csslintrc 0 → 100644
{
"adjoining-classes": false,
"box-sizing": false,
"box-model": false,
"compatible-vendor-prefixes": false,
"floats": false,
"font-sizes": false,
"gradients": false,
"important": false,
"known-properties": false,
"outline-none": false,
"qualified-headings": false,
"regex-selectors": false,
"text-indent": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false
}
# Enforce Unix newlines
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.less text eol=lf
*.md text eol=lf
*.yml text eol=lf
...@@ -39,3 +39,4 @@ validation-report.json ...@@ -39,3 +39,4 @@ validation-report.json
# Folders to ignore # Folders to ignore
node_modules node_modules
bower_components
language: node_js language: node_js
node_js: node_js:
- 0.8 - 0.10
before_script: before_install:
- gem install jekyll - time sudo pip install --use-mirrors -r ./test-infra/requirements.txt
- npm install -g grunt-cli install:
- time gem install jekyll
- time npm install -g grunt-cli
- time ./test-infra/node_modules_cache.py download || time npm install
after_script:
- time ./test-infra/node_modules_cache.py upload
env: env:
global: global:
- secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w= - SAUCE_USERNAME: bootstrap
- secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew= - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- TWBS_HAVE_OWN_BROWSERSTACK_KEY: "" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
- secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc="
- secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o="
...@@ -17,7 +17,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ...@@ -17,7 +17,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
## Pull requests ## Pull requests
- CSS changes must be done in `.less` files first, never just the compiled `.css` files - CSS changes must be done in `.less` files first, never just in the compiled `.css` files
- If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css` - If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css`
- Try not to pollute your pull request with unintended changes--keep them simple and small - Try not to pollute your pull request with unintended changes--keep them simple and small
- Try to share which browsers your code has been tested in before submitting a pull request - Try to share which browsers your code has been tested in before submitting a pull request
...@@ -33,12 +33,13 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ...@@ -33,12 +33,13 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
- Double quotes only, never single quotes - Double quotes only, never single quotes
- Always use proper indentation - Always use proper indentation
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags) - Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.
### CSS ### CSS
- Adhere to the [RECESS CSS property order](http://markdotto.com/2011/11/29/css-property-order/) - Adhere to the [RECESS CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
- Multiple-line approach (one property and value per line) - Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`) - Always a space after a property's colon (e.g., `display: block;` and not `display:block;`)
- End all lines with a semi-colon - End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on its own line - For multiple, comma-separated selectors, place each selector on its own line
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks). - Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
...@@ -55,4 +56,24 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ...@@ -55,4 +56,24 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
## License ## License
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). We're in the process of collecting permissions from all Bootstrap contributors with code still part of the project to make this happen. For details, please see [#2054](https://github.com/twbs/bootstrap/issues/2054).
By contributing your code, you agree to dual-license your contribution under the [Apache 2](https://github.com/twbs/bootstrap/blob/master/LICENSE) and [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE-MIT) licenses.
## Release checklist
1. Close ship list issue for the release.
2. Close the milestone for the release.
3. Open new release issue that includes this checklist.
4. Ping folks to coordinate release (mainly @jdorfman for BootstrapCDN).
5. Update version numbers using `grunt change-version-number --oldver=A.B.C --newver=X.Y.Z`. Review the changes and stage them manually.
6. Run `grunt` one last time.
7. Push to `master` branch.
8. Merge `master` into `gh-pages`.
9. Generate `bootstrap-X.Y.Z-dist.zip` file for release.
10. Create release on GitHub with `/dist/` folder and release notes.
11. Push `gh-pages`.
12. Publish blog post.
13. Tweet tweet.
/* jshint node: true */ /* jshint node: true */
module.exports = function(grunt) { module.exports = function (grunt) {
"use strict"; 'use strict';
// Force use of Unix newlines
grunt.util.linefeed = '\n';
RegExp.quote = require('regexp-quote')
var btoa = require('btoa') var btoa = require('btoa')
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
...@@ -10,12 +14,10 @@ module.exports = function(grunt) { ...@@ -10,12 +14,10 @@ module.exports = function(grunt) {
// Metadata. // Metadata.
pkg: grunt.file.readJSON('package.json'), pkg: grunt.file.readJSON('package.json'),
banner: '/*!\n' + banner: '/*!\n' +
' * Bootstrap v<%= pkg.version %> by @fat and @mdo\n' + ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' + ' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
' *\n' + ' */\n\n',
' * Designed and built with all the love in the world by @mdo and @fat.\n' +
' */\n',
jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n', jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',
// Task configuration. // Task configuration.
...@@ -35,9 +37,34 @@ module.exports = function(grunt) { ...@@ -35,9 +37,34 @@ module.exports = function(grunt) {
}, },
test: { test: {
src: ['js/tests/unit/*.js'] src: ['js/tests/unit/*.js']
},
assets: {
src: ['docs-assets/js/application.js', 'docs-assets/js/customizer.js']
} }
}, },
jscs: {
options: {
config: 'js/.jscs.json',
},
gruntfile: {
src: ['Gruntfile.js']
},
src: {
src: ['js/*.js']
},
test: {
src: ['js/tests/unit/*.js']
}
},
csslint: {
options: {
csslintrc: '.csslintrc'
},
src: ['dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css']
},
concat: { concat: {
options: { options: {
banner: '<%= banner %><%= jqueryCheck %>', banner: '<%= banner %><%= jqueryCheck %>',
...@@ -70,42 +97,74 @@ module.exports = function(grunt) { ...@@ -70,42 +97,74 @@ 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'
} }
}, },
recess: { less: {
options: { compile: {
compile: true,
banner: '<%= banner %>'
},
bootstrap: {
src: ['less/bootstrap.less'],
dest: 'dist/css/<%= pkg.name %>.css'
},
min: {
options: { options: {
compress: true strictMath: true
}, },
src: ['less/bootstrap.less'], files: {
dest: 'dist/css/<%= pkg.name %>.min.css' 'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less',
}, 'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
theme: { }
src: ['less/theme.less'],
dest: 'dist/css/<%= pkg.name %>-theme.css'
}, },
theme_min: { minify: {
options: { options: {
compress: true cleancss: true,
report: 'min'
}, },
src: ['less/theme.less'], files: {
dest: 'dist/css/<%= pkg.name %>-theme.min.css' 'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css'
}
}
},
usebanner: {
dist: {
options: {
position: 'top',
banner: '<%= banner %>'
},
files: {
src: [
'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>.min.css',
'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.min.css',
]
}
}
},
csscomb: {
sort: {
options: {
sortOrder: '.csscomb.json'
},
files: {
'dist/css/<%= pkg.name %>.css': ['dist/css/<%= pkg.name %>.css'],
'dist/css/<%= pkg.name %>-theme.css': ['dist/css/<%= pkg.name %>-theme.css'],
}
} }
}, },
copy: { copy: {
fonts: { fonts: {
expand: true, expand: true,
src: ["fonts/*"], src: ['fonts/*'],
dest: 'dist/' dest: 'dist/'
} }
}, },
...@@ -132,10 +191,14 @@ module.exports = function(grunt) { ...@@ -132,10 +191,14 @@ module.exports = function(grunt) {
validation: { validation: {
options: { options: {
reset: true reset: true,
relaxerror: [
'Bad value X-UA-Compatible for attribute http-equiv on element meta.',
'Element img is missing required attribute src.'
]
}, },
files: { files: {
src: ["_gh_pages/**/*.html"] src: ['_gh_pages/**/*.html']
} }
}, },
...@@ -148,39 +211,131 @@ module.exports = function(grunt) { ...@@ -148,39 +211,131 @@ module.exports = function(grunt) {
files: '<%= jshint.test.src %>', files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit'] tasks: ['jshint:test', 'qunit']
}, },
recess: { less: {
files: 'less/*.less', files: 'less/*.less',
tasks: ['recess'] tasks: ['less']
}
},
sed: {
versionNumber: {
pattern: (function () {
var old = grunt.option('oldver')
return old ? RegExp.quote(old) : old
})(),
replacement: grunt.option('newver'),
recursive: true
}
},
'saucelabs-qunit': {
all: {
options: {
build: process.env.TRAVIS_JOB_ID,
concurrency: 3,
urls: ['http://127.0.0.1:3000/js/tests/index.html'],
browsers: [
// See https://saucelabs.com/docs/platforms/webdriver
{
browserName: 'safari',
version: '7',
platform: 'OS X 10.9'
},
{
browserName: 'chrome',
version: '31',
platform: 'OS X 10.9'
},
/* FIXME: currently fails 1 tooltip test
{
browserName: 'firefox',
version: '25',
platform: 'OS X 10.6'
},*/
// Mac Opera not currently supported by Sauce Labs
/* FIXME: currently fails 1 tooltip test
{
browserName: 'internet explorer',
version: '11',
platform: 'Windows 8.1'
},*/
/*
{
browserName: 'internet explorer',
version: '10',
platform: 'Windows 8'
},
{
browserName: 'internet explorer',
version: '9',
platform: 'Windows 7'
},
{
browserName: 'internet explorer',
version: '8',
platform: 'Windows 7'
},
{// unofficial
browserName: 'internet explorer',
version: '7',
platform: 'Windows XP'
},
*/
{
browserName: 'chrome',
version: '31',
platform: 'Windows 8.1'
},
{
browserName: 'firefox',
version: '25',
platform: 'Windows 8.1'
},
// Win Opera 15+ not currently supported by Sauce Labs
{
browserName: 'iphone',
version: '6.1',
platform: 'OS X 10.8'
},
// iOS Chrome not currently supported by Sauce Labs
// Linux (unofficial)
{
browserName: 'chrome',
version: '30',
platform: 'Linux'
},
{
browserName: 'firefox',
version: '25',
platform: 'Linux'
}
// Android Chrome not currently supported by Sauce Labs
/* Android Browser (super-unofficial)
{
browserName: 'android',
version: '4.0',
platform: 'Linux'
}
*/
],
}
} }
} }
}); });
// These plugins provide necessary tasks. // These plugins provide necessary tasks.
grunt.loadNpmTasks('browserstack-runner'); require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-html-validation');
grunt.loadNpmTasks('grunt-jekyll');
grunt.loadNpmTasks('grunt-recess');
// Docs HTML validation task // Docs HTML validation task
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 BrowserStack tests under Travis // Only run Sauce Labs tests if there's a Sauce access key
if (process.env.TRAVIS) { if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined') {
// Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key testSubtasks.push('connect');
if ((process.env.TRAVIS_REPO_SLUG === 'twbs/bootstrap' && process.env.TRAVIS_PULL_REQUEST === 'false') || process.env.TWBS_HAVE_OWN_BROWSERSTACK_KEY) { testSubtasks.push('saucelabs-qunit');
testSubtasks.push('browserstack_runner');
}
} }
grunt.registerTask('test', testSubtasks); grunt.registerTask('test', testSubtasks);
...@@ -188,7 +343,7 @@ module.exports = function(grunt) { ...@@ -188,7 +343,7 @@ module.exports = function(grunt) {
grunt.registerTask('dist-js', ['concat', 'uglify']); grunt.registerTask('dist-js', ['concat', 'uglify']);
// CSS distribution task. // CSS distribution task.
grunt.registerTask('dist-css', ['recess']); grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']);
// Fonts distribution task. // Fonts distribution task.
grunt.registerTask('dist-fonts', ['copy']); grunt.registerTask('dist-fonts', ['copy']);
...@@ -199,6 +354,11 @@ module.exports = function(grunt) { ...@@ -199,6 +354,11 @@ module.exports = function(grunt) {
// Default task. // Default task.
grunt.registerTask('default', ['test', 'dist', 'build-customizer']); grunt.registerTask('default', ['test', 'dist', 'build-customizer']);
// Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
// This can be overzealous, so its changes should always be manually reviewed!
grunt.registerTask('change-version-number', ['sed']);
// task for building customizer // task for building customizer
grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () { grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () {
var fs = require('fs') var fs = require('fs')
......
The MIT License (MIT)
Copyright (c) 2013 Twitter, Inc
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies) # [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
To get started, check out [http://getbootstrap.com](http://getbootstrap.com)! To get started, check out <http://getbootstrap.com>!
...@@ -10,7 +11,7 @@ To get started, check out [http://getbootstrap.com](http://getbootstrap.com)! ...@@ -10,7 +11,7 @@ To get started, check out [http://getbootstrap.com](http://getbootstrap.com)!
Three quick start options are available: Three quick start options are available:
* [Download the latest release](https://github.com/twbs/bootstrap/releases/tag/v3.0.0). * [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip).
* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. * Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
* Install with [Bower](http://bower.io): `bower install bootstrap`. * Install with [Bower](http://bower.io): `bower install bootstrap`.
...@@ -51,20 +52,21 @@ You may use [this JS Bin](http://jsbin.com/aKiCIDO/1/edit) as a template for you ...@@ -51,20 +52,21 @@ You may use [this JS Bin](http://jsbin.com/aKiCIDO/1/edit) as a template for you
## Documentation ## Documentation
Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). The docs may also be run locally. Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at <http://getbootstrap.com>. The docs may also be run locally.
### Running documentation locally ### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x). 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x).
- **Windows users:** read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems.
2. From the root `/bootstrap` directory, run `jekyll serve` in the command line. 2. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
- **Windows users:** run `chcp 65001` first to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors. - **Windows users:** For Ruby 2.0.0 run `chcp 65001` first to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors. For Ruby 1.9.3 you can alternatively do `SET LANG=en_EN.UTF-8`. In addition, ensure you have Python installed and added in your `PATH` or the build will fail due to our Pygments dependency.
3. Open [http://localhost:9001](http://localhost:9001) in your browser, and voilà. 3. Open <http://localhost:9001> in your browser, and voilà.
Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).
### Documentation for previous releases ### Documentation for previous releases
Documentation for v2.3.2 has been made available for the time being at [http://getbootstrap.com/2.3.2/](http://getbootstrap.com/2.3.2/) while folks transition to Bootstrap 3. Documentation for v2.3.2 has been made available for the time being at <http://getbootstrap.com/2.3.2/> while folks transition to Bootstrap 3.
[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download. [Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
...@@ -111,8 +113,9 @@ Please read through our [contributing guidelines](https://github.com/twbs/bootst ...@@ -111,8 +113,9 @@ Please read through our [contributing guidelines](https://github.com/twbs/bootst
More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo). More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.org](http://editorconfig.org). Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for more information.
## Community ## Community
...@@ -121,7 +124,6 @@ Keep track of development and community news. ...@@ -121,7 +124,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.
...@@ -141,7 +143,7 @@ And constructed with the following guidelines: ...@@ -141,7 +143,7 @@ And constructed with the following guidelines:
* New additions without breaking backward compatibility bumps the minor (and resets the patch) * New additions without breaking backward compatibility bumps the minor (and resets the patch)
* Bug fixes and misc changes bumps the patch * Bug fixes and misc changes bumps the patch
For more information on SemVer, please visit [http://semver.org/](http://semver.org/). For more information on SemVer, please visit <http://semver.org/>.
...@@ -149,13 +151,13 @@ For more information on SemVer, please visit [http://semver.org/](http://semver. ...@@ -149,13 +151,13 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
**Mark Otto** **Mark Otto**
+ [http://twitter.com/mdo](http://twitter.com/mdo) + <http://twitter.com/mdo>
+ [http://github.com/mdo](http://github.com/mdo) + <http://github.com/mdo>
**Jacob Thornton** **Jacob Thornton**
+ [http://twitter.com/fat](http://twitter.com/fat) + <http://twitter.com/fat>
+ [http://github.com/fat](http://github.com/fat) + <http://github.com/fat>
......
...@@ -11,15 +11,15 @@ exclude: [".editorconfig", ".gitignore", "bower.json", "composer.json", ...@@ -11,15 +11,15 @@ exclude: [".editorconfig", ".gitignore", "bower.json", "composer.json",
port: 9001 port: 9001
# Custom vars # Custom vars
current_version: 3.0.0 current_version: 3.0.3
repo: https://github.com/twbs/bootstrap repo: https://github.com/twbs/bootstrap
download_source: https://github.com/twbs/bootstrap/archive/v3.0.0.zip download_source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip
blog: http://blog.getbootstrap.com blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com expo: http://expo.getbootstrap.com
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- 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://code.jquery.com/jquery-1.10.2.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="http://platform.twitter.com/widgets.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 %}
Inject Twitter widgets asynchronously. Snippet snipped from Twitter's
JS interface site: https://dev.twitter.com/docs/tfw-javascript
* "js.async=1;" added to add async attribute to the generated script tag.
{% endcomment %}
<script>
window.twttr = (function (d,s,id) {
var t, js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return; js=d.createElement(s); js.id=id; js.async=1;
js.src="https://platform.twitter.com/widgets.js"; fjs.parentNode.insertBefore(js, fjs);
return window.twttr || (t = { _e: [], ready: function(f){ t._e.push(f) } });
}(document, "script", "twitter-wjs"));
</script>
<!-- Analytics <!-- Analytics
================================================== --> ================================================== -->
<script> <script>
......
<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 contributors">
<title> <title>
{% if page.title == "Bootstrap" %} {% if page.title == "Bootstrap" %}
...@@ -18,10 +19,11 @@ ...@@ -18,10 +19,11 @@
<!-- Documentation extras --> <!-- Documentation extras -->
<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet"> <link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet"> <link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
<!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script> <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> <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]--> <![endif]-->
......
...@@ -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>
......
...@@ -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">
...@@ -97,3 +105,11 @@ ...@@ -97,3 +105,11 @@
<li><a href="#responsive-utilities-tests">Test cases</a></li> <li><a href="#responsive-utilities-tests">Test cases</a></li>
</ul> </ul>
</li> </li>
<li>
<a href="#less">Using LESS</a>
<ul class="nav">
<li><a href="#less-variables">Variables</a></li>
<li><a href="#less-mixins-vendor">Vendor mixins</a></li>
<li><a href="#less-mixins-utility">Utility mixins</a></li>
</ul>
</li>
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
</li> </li>
<li> <li>
<a href="#whats-included">What's included</a> <a href="#whats-included">What's included</a>
<ul class="nav">
<li><a href="#whats-included-precompiled">Precompiled</a></li>
<li><a href="#whats-included-source">Source code</a></li>
</ul>
</li> </li>
<li> <li>
<a href="#template">Basic template</a> <a href="#template">Basic template</a>
......
...@@ -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>
...@@ -86,8 +85,10 @@ base_url: "../" ...@@ -86,8 +85,10 @@ base_url: "../"
<p class="lead">Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.</p> <p class="lead">Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.</p>
<ul> <ul>
<li><a href="http://v3.bootcss.com/">Bootstrap 中文文档 (Chinese)</a></li> <li><a href="http://v3.bootcss.com/">Bootstrap 中文文档 (Chinese)</a></li>
<li><a href="http://bootstrap.oneskyapp.net/ru">Bootstrap по-русски (Russian)</a></li> <li><a href="http://www.oneskyapp.com/docs/bootstrap/ru">Bootstrap по-русски (Russian)</a></li>
<li><a href="http://bootstrap.oneskyapp.net/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://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>
{ {
"name": "bootstrap", "name": "bootstrap",
"version": "3.0.0", "version": "3.0.3",
"main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"], "main": [
"./dist/js/bootstrap.js",
"./dist/css/bootstrap.css",
"./dist/fonts/glyphicons-halflings-regular.eot",
"./dist/fonts/glyphicons-halflings-regular.svg",
"./dist/fonts/glyphicons-halflings-regular.ttf",
"./dist/fonts/glyphicons-halflings-regular.woff"
],
"ignore": [ "ignore": [
"**/.*" "**/.*",
"_*",
"docs-assets",
"examples",
"/fonts",
"js/tests",
"CNAME",
"CONTRIBUTING.md",
"composer.json",
"*.html"
], ],
"dependencies": { "dependencies": {
"jquery": ">= 1.9.0" "jquery": ">= 1.9.0"
......
{
"username": "--secure--",
"key": "--secure--",
"test_path": "js/tests/index.html",
"browsers": [
{
"browser": "firefox",
"browser_version": "latest",
"os": "OS X",
"os_version": "Mountain Lion"
},
{
"browser": "safari",
"browser_version": "latest",
"os": "OS X",
"os_version": "Mountain Lion"
},
{
"browser": "chrome",
"browser_version": "latest",
"os": "OS X",
"os_version": "Mountain Lion"
},
{
"browser": "firefox",
"browser_version": "latest",
"os": "Windows",
"os_version": "7"
},
{
"browser": "chrome",
"browser_version": "latest",
"os": "Windows",
"os_version": "7"
}
]
}
...@@ -16,212 +16,818 @@ base_url: "../" ...@@ -16,212 +16,818 @@ 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><span class="glyphicon glyphicon-adjust"></span> .glyphicon .glyphicon-adjust</li> <ul class="bs-glyphicons-list">
<li><span class="glyphicon glyphicon-align-center"></span> .glyphicon .glyphicon-align-center</li> <li>
<li><span class="glyphicon glyphicon-align-justify"></span> .glyphicon .glyphicon-align-justify</li> <span class="glyphicon glyphicon-adjust"></span>
<li><span class="glyphicon glyphicon-align-left"></span> .glyphicon .glyphicon-align-left</li> <span class="glyphicon-class">glyphicon glyphicon-adjust</span>
<li><span class="glyphicon glyphicon-align-right"></span> .glyphicon .glyphicon-align-right</li> </li>
<li><span class="glyphicon glyphicon-arrow-down"></span> .glyphicon .glyphicon-arrow-down</li> <li>
<li><span class="glyphicon glyphicon-arrow-left"></span> .glyphicon .glyphicon-arrow-left</li> <span class="glyphicon glyphicon-align-center"></span>
<li><span class="glyphicon glyphicon-arrow-right"></span> .glyphicon .glyphicon-arrow-right</li> <span class="glyphicon-class">glyphicon glyphicon-align-center</span>
<li><span class="glyphicon glyphicon-arrow-up"></span> .glyphicon .glyphicon-arrow-up</li> </li>
<li><span class="glyphicon glyphicon-asterisk"></span> .glyphicon .glyphicon-asterisk</li> <li>
<li><span class="glyphicon glyphicon-backward"></span> .glyphicon .glyphicon-backward</li> <span class="glyphicon glyphicon-align-justify"></span>
<li><span class="glyphicon glyphicon-ban-circle"></span> .glyphicon .glyphicon-ban-circle</li> <span class="glyphicon-class">glyphicon glyphicon-align-justify</span>
<li><span class="glyphicon glyphicon-barcode"></span> .glyphicon .glyphicon-barcode</li> </li>
<li><span class="glyphicon glyphicon-bell"></span> .glyphicon .glyphicon-bell</li> <li>
<li><span class="glyphicon glyphicon-bold"></span> .glyphicon .glyphicon-bold</li> <span class="glyphicon glyphicon-align-left"></span>
<li><span class="glyphicon glyphicon-book"></span> .glyphicon .glyphicon-book</li> <span class="glyphicon-class">glyphicon glyphicon-align-left</span>
<li><span class="glyphicon glyphicon-bookmark"></span> .glyphicon .glyphicon-bookmark</li> </li>
<li><span class="glyphicon glyphicon-briefcase"></span> .glyphicon .glyphicon-briefcase</li> <li>
<li><span class="glyphicon glyphicon-bullhorn"></span> .glyphicon .glyphicon-bullhorn</li> <span class="glyphicon glyphicon-align-right"></span>
<li><span class="glyphicon glyphicon-calendar"></span> .glyphicon .glyphicon-calendar</li> <span class="glyphicon-class">glyphicon glyphicon-align-right</span>
<li><span class="glyphicon glyphicon-camera"></span> .glyphicon .glyphicon-camera</li> </li>
<li><span class="glyphicon glyphicon-certificate"></span> .glyphicon .glyphicon-certificate</li> <li>
<li><span class="glyphicon glyphicon-check"></span> .glyphicon .glyphicon-check</li> <span class="glyphicon glyphicon-arrow-down"></span>
<li><span class="glyphicon glyphicon-chevron-down"></span> .glyphicon .glyphicon-chevron-down</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-down</span>
<li><span class="glyphicon glyphicon-chevron-left"></span> .glyphicon .glyphicon-chevron-left</li> </li>
<li><span class="glyphicon glyphicon-chevron-right"></span> .glyphicon .glyphicon-chevron-right</li> <li>
<li><span class="glyphicon glyphicon-chevron-up"></span> .glyphicon .glyphicon-chevron-up</li> <span class="glyphicon glyphicon-arrow-left"></span>
<li><span class="glyphicon glyphicon-circle-arrow-down"></span> .glyphicon .glyphicon-circle-arrow-down</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-left</span>
<li><span class="glyphicon glyphicon-circle-arrow-left"></span> .glyphicon .glyphicon-circle-arrow-left</li> </li>
<li><span class="glyphicon glyphicon-circle-arrow-right"></span> .glyphicon .glyphicon-circle-arrow-right</li> <li>
<li><span class="glyphicon glyphicon-circle-arrow-up"></span> .glyphicon .glyphicon-circle-arrow-up</li> <span class="glyphicon glyphicon-arrow-right"></span>
<li><span class="glyphicon glyphicon-cloud"></span> .glyphicon .glyphicon-cloud</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-right</span>
<li><span class="glyphicon glyphicon-cloud-download"></span> .glyphicon .glyphicon-cloud-download</li> </li>
<li><span class="glyphicon glyphicon-cloud-upload"></span> .glyphicon .glyphicon-cloud-upload</li> <li>
<li><span class="glyphicon glyphicon-cog"></span> .glyphicon .glyphicon-cog</li> <span class="glyphicon glyphicon-arrow-up"></span>
<li><span class="glyphicon glyphicon-collapse-down"></span> .glyphicon .glyphicon-collapse-down</li> <span class="glyphicon-class">glyphicon glyphicon-arrow-up</span>
<li><span class="glyphicon glyphicon-collapse-up"></span> .glyphicon .glyphicon-collapse-up</li> </li>
<li><span class="glyphicon glyphicon-comment"></span> .glyphicon .glyphicon-comment</li> <li>
<li><span class="glyphicon glyphicon-compressed"></span> .glyphicon .glyphicon-compressed</li> <span class="glyphicon glyphicon-asterisk"></span>
<li><span class="glyphicon glyphicon-copyright-mark"></span> .glyphicon .glyphicon-copyright-mark</li> <span class="glyphicon-class">glyphicon glyphicon-asterisk</span>
<li><span class="glyphicon glyphicon-credit-card"></span> .glyphicon .glyphicon-credit-card</li> </li>
<li><span class="glyphicon glyphicon-cutlery"></span> .glyphicon .glyphicon-cutlery</li> <li>
<li><span class="glyphicon glyphicon-dashboard"></span> .glyphicon .glyphicon-dashboard</li> <span class="glyphicon glyphicon-backward"></span>
<li><span class="glyphicon glyphicon-download"></span> .glyphicon .glyphicon-download</li> <span class="glyphicon-class">glyphicon glyphicon-backward</span>
<li><span class="glyphicon glyphicon-download-alt"></span> .glyphicon .glyphicon-download-alt</li> </li>
<li><span class="glyphicon glyphicon-earphone"></span> .glyphicon .glyphicon-earphone</li> <li>
<li><span class="glyphicon glyphicon-edit"></span> .glyphicon .glyphicon-edit</li> <span class="glyphicon glyphicon-ban-circle"></span>
<li><span class="glyphicon glyphicon-eject"></span> .glyphicon .glyphicon-eject</li> <span class="glyphicon-class">glyphicon glyphicon-ban-circle</span>
<li><span class="glyphicon glyphicon-envelope"></span> .glyphicon .glyphicon-envelope</li> </li>
<li><span class="glyphicon glyphicon-euro"></span> .glyphicon .glyphicon-euro</li> <li>
<li><span class="glyphicon glyphicon-exclamation-sign"></span> .glyphicon .glyphicon-exclamation-sign</li> <span class="glyphicon glyphicon-barcode"></span>
<li><span class="glyphicon glyphicon-expand"></span> .glyphicon .glyphicon-expand</li> <span class="glyphicon-class">glyphicon glyphicon-barcode</span>
<li><span class="glyphicon glyphicon-export"></span> .glyphicon .glyphicon-export</li> </li>
<li><span class="glyphicon glyphicon-eye-close"></span> .glyphicon .glyphicon-eye-close</li> <li>
<li><span class="glyphicon glyphicon-eye-open"></span> .glyphicon .glyphicon-eye-open</li> <span class="glyphicon glyphicon-bell"></span>
<li><span class="glyphicon glyphicon-facetime-video"></span> .glyphicon .glyphicon-facetime-video</li> <span class="glyphicon-class">glyphicon glyphicon-bell</span>
<li><span class="glyphicon glyphicon-fast-backward"></span> .glyphicon .glyphicon-fast-backward</li> </li>
<li><span class="glyphicon glyphicon-fast-forward"></span> .glyphicon .glyphicon-fast-forward</li> <li>
<li><span class="glyphicon glyphicon-file"></span> .glyphicon .glyphicon-file</li> <span class="glyphicon glyphicon-bold"></span>
<li><span class="glyphicon glyphicon-film"></span> .glyphicon .glyphicon-film</li> <span class="glyphicon-class">glyphicon glyphicon-bold</span>
<li><span class="glyphicon glyphicon-filter"></span> .glyphicon .glyphicon-filter</li> </li>
<li><span class="glyphicon glyphicon-fire"></span> .glyphicon .glyphicon-fire</li> <li>
<li><span class="glyphicon glyphicon-flag"></span> .glyphicon .glyphicon-flag</li> <span class="glyphicon glyphicon-book"></span>
<li><span class="glyphicon glyphicon-flash"></span> .glyphicon .glyphicon-flash</li> <span class="glyphicon-class">glyphicon glyphicon-book</span>
<li><span class="glyphicon glyphicon-floppy-disk"></span> .glyphicon .glyphicon-floppy-disk</li> </li>
<li><span class="glyphicon glyphicon-floppy-open"></span> .glyphicon .glyphicon-floppy-open</li> <li>
<li><span class="glyphicon glyphicon-floppy-remove"></span> .glyphicon .glyphicon-floppy-remove</li> <span class="glyphicon glyphicon-bookmark"></span>
<li><span class="glyphicon glyphicon-floppy-save"></span> .glyphicon .glyphicon-floppy-save</li> <span class="glyphicon-class">glyphicon glyphicon-bookmark</span>
<li><span class="glyphicon glyphicon-floppy-saved"></span> .glyphicon .glyphicon-floppy-saved</li> </li>
<li><span class="glyphicon glyphicon-folder-close"></span> .glyphicon .glyphicon-folder-close</li> <li>
<li><span class="glyphicon glyphicon-folder-open"></span> .glyphicon .glyphicon-folder-open</li> <span class="glyphicon glyphicon-briefcase"></span>
<li><span class="glyphicon glyphicon-font"></span> .glyphicon .glyphicon-font</li> <span class="glyphicon-class">glyphicon glyphicon-briefcase</span>
<li><span class="glyphicon glyphicon-forward"></span> .glyphicon .glyphicon-forward</li> </li>
<li><span class="glyphicon glyphicon-fullscreen"></span> .glyphicon .glyphicon-fullscreen</li> <li>
<li><span class="glyphicon glyphicon-gbp"></span> .glyphicon .glyphicon-gbp</li> <span class="glyphicon glyphicon-bullhorn"></span>
<li><span class="glyphicon glyphicon-gift"></span> .glyphicon .glyphicon-gift</li> <span class="glyphicon-class">glyphicon glyphicon-bullhorn</span>
<li><span class="glyphicon glyphicon-glass"></span> .glyphicon .glyphicon-glass</li> </li>
<li><span class="glyphicon glyphicon-globe"></span> .glyphicon .glyphicon-globe</li> <li>
<li><span class="glyphicon glyphicon-hand-down"></span> .glyphicon .glyphicon-hand-down</li> <span class="glyphicon glyphicon-calendar"></span>
<li><span class="glyphicon glyphicon-hand-left"></span> .glyphicon .glyphicon-hand-left</li> <span class="glyphicon-class">glyphicon glyphicon-calendar</span>
<li><span class="glyphicon glyphicon-hand-right"></span> .glyphicon .glyphicon-hand-right</li> </li>
<li><span class="glyphicon glyphicon-hand-up"></span> .glyphicon .glyphicon-hand-up</li> <li>
<li><span class="glyphicon glyphicon-hd-video"></span> .glyphicon .glyphicon-hd-video</li> <span class="glyphicon glyphicon-camera"></span>
<li><span class="glyphicon glyphicon-hdd"></span> .glyphicon .glyphicon-hdd</li> <span class="glyphicon-class">glyphicon glyphicon-camera</span>
<li><span class="glyphicon glyphicon-header"></span> .glyphicon .glyphicon-header</li> </li>
<li><span class="glyphicon glyphicon-headphones"></span> .glyphicon .glyphicon-headphones</li> <li>
<li><span class="glyphicon glyphicon-heart"></span> .glyphicon .glyphicon-heart</li> <span class="glyphicon glyphicon-certificate"></span>
<li><span class="glyphicon glyphicon-heart-empty"></span> .glyphicon .glyphicon-heart-empty</li> <span class="glyphicon-class">glyphicon glyphicon-certificate</span>
<li><span class="glyphicon glyphicon-home"></span> .glyphicon .glyphicon-home</li> </li>
<li><span class="glyphicon glyphicon-import"></span> .glyphicon .glyphicon-import</li> <li>
<li><span class="glyphicon glyphicon-inbox"></span> .glyphicon .glyphicon-inbox</li> <span class="glyphicon glyphicon-check"></span>
<li><span class="glyphicon glyphicon-indent-left"></span> .glyphicon .glyphicon-indent-left</li> <span class="glyphicon-class">glyphicon glyphicon-check</span>
<li><span class="glyphicon glyphicon-indent-right"></span> .glyphicon .glyphicon-indent-right</li> </li>
<li><span class="glyphicon glyphicon-info-sign"></span> .glyphicon .glyphicon-info-sign</li> <li>
<li><span class="glyphicon glyphicon-italic"></span> .glyphicon .glyphicon-italic</li> <span class="glyphicon glyphicon-chevron-down"></span>
<li><span class="glyphicon glyphicon-leaf"></span> .glyphicon .glyphicon-leaf</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-down</span>
<li><span class="glyphicon glyphicon-link"></span> .glyphicon .glyphicon-link</li> </li>
<li><span class="glyphicon glyphicon-list"></span> .glyphicon .glyphicon-list</li> <li>
<li><span class="glyphicon glyphicon-list-alt"></span> .glyphicon .glyphicon-list-alt</li> <span class="glyphicon glyphicon-chevron-left"></span>
<li><span class="glyphicon glyphicon-lock"></span> .glyphicon .glyphicon-lock</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-left</span>
<li><span class="glyphicon glyphicon-log-in"></span> .glyphicon .glyphicon-log-in</li> </li>
<li><span class="glyphicon glyphicon-log-out"></span> .glyphicon .glyphicon-log-out</li> <li>
<li><span class="glyphicon glyphicon-magnet"></span> .glyphicon .glyphicon-magnet</li> <span class="glyphicon glyphicon-chevron-right"></span>
<li><span class="glyphicon glyphicon-map-marker"></span> .glyphicon .glyphicon-map-marker</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-right</span>
<li><span class="glyphicon glyphicon-minus"></span> .glyphicon .glyphicon-minus</li> </li>
<li><span class="glyphicon glyphicon-minus-sign"></span> .glyphicon .glyphicon-minus-sign</li> <li>
<li><span class="glyphicon glyphicon-move"></span> .glyphicon .glyphicon-move</li> <span class="glyphicon glyphicon-chevron-up"></span>
<li><span class="glyphicon glyphicon-music"></span> .glyphicon .glyphicon-music</li> <span class="glyphicon-class">glyphicon glyphicon-chevron-up</span>
<li><span class="glyphicon glyphicon-new-window"></span> .glyphicon .glyphicon-new-window</li> </li>
<li><span class="glyphicon glyphicon-off"></span> .glyphicon .glyphicon-off</li> <li>
<li><span class="glyphicon glyphicon-ok"></span> .glyphicon .glyphicon-ok</li> <span class="glyphicon glyphicon-circle-arrow-down"></span>
<li><span class="glyphicon glyphicon-ok-circle"></span> .glyphicon .glyphicon-ok-circle</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-down</span>
<li><span class="glyphicon glyphicon-ok-sign"></span> .glyphicon .glyphicon-ok-sign</li> </li>
<li><span class="glyphicon glyphicon-open"></span> .glyphicon .glyphicon-open</li> <li>
<li><span class="glyphicon glyphicon-paperclip"></span> .glyphicon .glyphicon-paperclip</li> <span class="glyphicon glyphicon-circle-arrow-left"></span>
<li><span class="glyphicon glyphicon-pause"></span> .glyphicon .glyphicon-pause</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-left</span>
<li><span class="glyphicon glyphicon-pencil"></span> .glyphicon .glyphicon-pencil</li> </li>
<li><span class="glyphicon glyphicon-phone"></span> .glyphicon .glyphicon-phone</li> <li>
<li><span class="glyphicon glyphicon-phone-alt"></span> .glyphicon .glyphicon-phone-alt</li> <span class="glyphicon glyphicon-circle-arrow-right"></span>
<li><span class="glyphicon glyphicon-picture"></span> .glyphicon .glyphicon-picture</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-right</span>
<li><span class="glyphicon glyphicon-plane"></span> .glyphicon .glyphicon-plane</li> </li>
<li><span class="glyphicon glyphicon-play"></span> .glyphicon .glyphicon-play</li> <li>
<li><span class="glyphicon glyphicon-play-circle"></span> .glyphicon .glyphicon-play-circle</li> <span class="glyphicon glyphicon-circle-arrow-up"></span>
<li><span class="glyphicon glyphicon-plus"></span> .glyphicon .glyphicon-plus</li> <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-up</span>
<li><span class="glyphicon glyphicon-plus-sign"></span> .glyphicon .glyphicon-plus-sign</li> </li>
<li><span class="glyphicon glyphicon-print"></span> .glyphicon .glyphicon-print</li> <li>
<li><span class="glyphicon glyphicon-pushpin"></span> .glyphicon .glyphicon-pushpin</li> <span class="glyphicon glyphicon-cloud"></span>
<li><span class="glyphicon glyphicon-qrcode"></span> .glyphicon .glyphicon-qrcode</li> <span class="glyphicon-class">glyphicon glyphicon-cloud</span>
<li><span class="glyphicon glyphicon-question-sign"></span> .glyphicon .glyphicon-question-sign</li> </li>
<li><span class="glyphicon glyphicon-random"></span> .glyphicon .glyphicon-random</li> <li>
<li><span class="glyphicon glyphicon-record"></span> .glyphicon .glyphicon-record</li> <span class="glyphicon glyphicon-cloud-download"></span>
<li><span class="glyphicon glyphicon-refresh"></span> .glyphicon .glyphicon-refresh</li> <span class="glyphicon-class">glyphicon glyphicon-cloud-download</span>
<li><span class="glyphicon glyphicon-registration-mark"></span> .glyphicon .glyphicon-registration-mark</li> </li>
<li><span class="glyphicon glyphicon-remove"></span> .glyphicon .glyphicon-remove</li> <li>
<li><span class="glyphicon glyphicon-remove-circle"></span> .glyphicon .glyphicon-remove-circle</li> <span class="glyphicon glyphicon-cloud-upload"></span>
<li><span class="glyphicon glyphicon-remove-sign"></span> .glyphicon .glyphicon-remove-sign</li> <span class="glyphicon-class">glyphicon glyphicon-cloud-upload</span>
<li><span class="glyphicon glyphicon-repeat"></span> .glyphicon .glyphicon-repeat</li> </li>
<li><span class="glyphicon glyphicon-resize-full"></span> .glyphicon .glyphicon-resize-full</li> <li>
<li><span class="glyphicon glyphicon-resize-horizontal"></span> .glyphicon .glyphicon-resize-horizontal</li> <span class="glyphicon glyphicon-cog"></span>
<li><span class="glyphicon glyphicon-resize-small"></span> .glyphicon .glyphicon-resize-small</li> <span class="glyphicon-class">glyphicon glyphicon-cog</span>
<li><span class="glyphicon glyphicon-resize-vertical"></span> .glyphicon .glyphicon-resize-vertical</li> </li>
<li><span class="glyphicon glyphicon-retweet"></span> .glyphicon .glyphicon-retweet</li> <li>
<li><span class="glyphicon glyphicon-road"></span> .glyphicon .glyphicon-road</li> <span class="glyphicon glyphicon-collapse-down"></span>
<li><span class="glyphicon glyphicon-save"></span> .glyphicon .glyphicon-save</li> <span class="glyphicon-class">glyphicon glyphicon-collapse-down</span>
<li><span class="glyphicon glyphicon-saved"></span> .glyphicon .glyphicon-saved</li> </li>
<li><span class="glyphicon glyphicon-screenshot"></span> .glyphicon .glyphicon-screenshot</li> <li>
<li><span class="glyphicon glyphicon-sd-video"></span> .glyphicon .glyphicon-sd-video</li> <span class="glyphicon glyphicon-collapse-up"></span>
<li><span class="glyphicon glyphicon-search"></span> .glyphicon .glyphicon-search</li> <span class="glyphicon-class">glyphicon glyphicon-collapse-up</span>
<li><span class="glyphicon glyphicon-send"></span> .glyphicon .glyphicon-send</li> </li>
<li><span class="glyphicon glyphicon-share"></span> .glyphicon .glyphicon-share</li> <li>
<li><span class="glyphicon glyphicon-share-alt"></span> .glyphicon .glyphicon-share-alt</li> <span class="glyphicon glyphicon-comment"></span>
<li><span class="glyphicon glyphicon-shopping-cart"></span> .glyphicon .glyphicon-shopping-cart</li> <span class="glyphicon-class">glyphicon glyphicon-comment</span>
<li><span class="glyphicon glyphicon-signal"></span> .glyphicon .glyphicon-signal</li> </li>
<li><span class="glyphicon glyphicon-sort"></span> .glyphicon .glyphicon-sort</li> <li>
<li><span class="glyphicon glyphicon-sort-by-alphabet"></span> .glyphicon .glyphicon-sort-by-alphabet</li> <span class="glyphicon glyphicon-compressed"></span>
<li><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span> .glyphicon .glyphicon-sort-by-alphabet-alt</li> <span class="glyphicon-class">glyphicon glyphicon-compressed</span>
<li><span class="glyphicon glyphicon-sort-by-attributes"></span> .glyphicon .glyphicon-sort-by-attributes</li> </li>
<li><span class="glyphicon glyphicon-sort-by-attributes-alt"></span> .glyphicon .glyphicon-sort-by-attributes-alt</li> <li>
<li><span class="glyphicon glyphicon-sort-by-order"></span> .glyphicon .glyphicon-sort-by-order</li> <span class="glyphicon glyphicon-copyright-mark"></span>
<li><span class="glyphicon glyphicon-sort-by-order-alt"></span> .glyphicon .glyphicon-sort-by-order-alt</li> <span class="glyphicon-class">glyphicon glyphicon-copyright-mark</span>
<li><span class="glyphicon glyphicon-sound-5-1"></span> .glyphicon .glyphicon-sound-5-1</li> </li>
<li><span class="glyphicon glyphicon-sound-6-1"></span> .glyphicon .glyphicon-sound-6-1</li> <li>
<li><span class="glyphicon glyphicon-sound-7-1"></span> .glyphicon .glyphicon-sound-7-1</li> <span class="glyphicon glyphicon-credit-card"></span>
<li><span class="glyphicon glyphicon-sound-dolby"></span> .glyphicon .glyphicon-sound-dolby</li> <span class="glyphicon-class">glyphicon glyphicon-credit-card</span>
<li><span class="glyphicon glyphicon-sound-stereo"></span> .glyphicon .glyphicon-sound-stereo</li> </li>
<li><span class="glyphicon glyphicon-star"></span> .glyphicon .glyphicon-star</li> <li>
<li><span class="glyphicon glyphicon-star-empty"></span> .glyphicon .glyphicon-star-empty</li> <span class="glyphicon glyphicon-cutlery"></span>
<li><span class="glyphicon glyphicon-stats"></span> .glyphicon .glyphicon-stats</li> <span class="glyphicon-class">glyphicon glyphicon-cutlery</span>
<li><span class="glyphicon glyphicon-step-backward"></span> .glyphicon .glyphicon-step-backward</li> </li>
<li><span class="glyphicon glyphicon-step-forward"></span> .glyphicon .glyphicon-step-forward</li> <li>
<li><span class="glyphicon glyphicon-stop"></span> .glyphicon .glyphicon-stop</li> <span class="glyphicon glyphicon-dashboard"></span>
<li><span class="glyphicon glyphicon-subtitles"></span> .glyphicon .glyphicon-subtitles</li> <span class="glyphicon-class">glyphicon glyphicon-dashboard</span>
<li><span class="glyphicon glyphicon-tag"></span> .glyphicon .glyphicon-tag</li> </li>
<li><span class="glyphicon glyphicon-tags"></span> .glyphicon .glyphicon-tags</li> <li>
<li><span class="glyphicon glyphicon-tasks"></span> .glyphicon .glyphicon-tasks</li> <span class="glyphicon glyphicon-download"></span>
<li><span class="glyphicon glyphicon-text-height"></span> .glyphicon .glyphicon-text-height</li> <span class="glyphicon-class">glyphicon glyphicon-download</span>
<li><span class="glyphicon glyphicon-text-width"></span> .glyphicon .glyphicon-text-width</li> </li>
<li><span class="glyphicon glyphicon-th"></span> .glyphicon .glyphicon-th</li> <li>
<li><span class="glyphicon glyphicon-th-large"></span> .glyphicon .glyphicon-th-large</li> <span class="glyphicon glyphicon-download-alt"></span>
<li><span class="glyphicon glyphicon-th-list"></span> .glyphicon .glyphicon-th-list</li> <span class="glyphicon-class">glyphicon glyphicon-download-alt</span>
<li><span class="glyphicon glyphicon-thumbs-down"></span> .glyphicon .glyphicon-thumbs-down</li> </li>
<li><span class="glyphicon glyphicon-thumbs-up"></span> .glyphicon .glyphicon-thumbs-up</li> <li>
<li><span class="glyphicon glyphicon-time"></span> .glyphicon .glyphicon-time</li> <span class="glyphicon glyphicon-earphone"></span>
<li><span class="glyphicon glyphicon-tint"></span> .glyphicon .glyphicon-tint</li> <span class="glyphicon-class">glyphicon glyphicon-earphone</span>
<li><span class="glyphicon glyphicon-tower"></span> .glyphicon .glyphicon-tower</li> </li>
<li><span class="glyphicon glyphicon-transfer"></span> .glyphicon .glyphicon-transfer</li> <li>
<li><span class="glyphicon glyphicon-trash"></span> .glyphicon .glyphicon-trash</li> <span class="glyphicon glyphicon-edit"></span>
<li><span class="glyphicon glyphicon-tree-conifer"></span> .glyphicon .glyphicon-tree-conifer</li> <span class="glyphicon-class">glyphicon glyphicon-edit</span>
<li><span class="glyphicon glyphicon-tree-deciduous"></span> .glyphicon .glyphicon-tree-deciduous</li> </li>
<li><span class="glyphicon glyphicon-unchecked"></span> .glyphicon .glyphicon-unchecked</li> <li>
<li><span class="glyphicon glyphicon-upload"></span> .glyphicon .glyphicon-upload</li> <span class="glyphicon glyphicon-eject"></span>
<li><span class="glyphicon glyphicon-usd"></span> .glyphicon .glyphicon-usd</li> <span class="glyphicon-class">glyphicon glyphicon-eject</span>
<li><span class="glyphicon glyphicon-user"></span> .glyphicon .glyphicon-user</li> </li>
<li><span class="glyphicon glyphicon-volume-down"></span> .glyphicon .glyphicon-volume-down</li> <li>
<li><span class="glyphicon glyphicon-volume-off"></span> .glyphicon .glyphicon-volume-off</li> <span class="glyphicon glyphicon-envelope"></span>
<li><span class="glyphicon glyphicon-volume-up"></span> .glyphicon .glyphicon-volume-up</li> <span class="glyphicon-class">glyphicon glyphicon-envelope</span>
<li><span class="glyphicon glyphicon-warning-sign"></span> .glyphicon .glyphicon-warning-sign</li> </li>
<li><span class="glyphicon glyphicon-wrench"></span> .glyphicon .glyphicon-wrench</li> <li>
<li><span class="glyphicon glyphicon-zoom-in"></span> .glyphicon .glyphicon-zoom-in</li> <span class="glyphicon glyphicon-euro"></span>
<li><span class="glyphicon glyphicon-zoom-out"></span> .glyphicon .glyphicon-zoom-out</li> <span class="glyphicon-class">glyphicon glyphicon-euro</span>
</ul> </li>
<li>
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-exclamation-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-expand"></span>
<span class="glyphicon-class">glyphicon glyphicon-expand</span>
</li>
<li>
<span class="glyphicon glyphicon-export"></span>
<span class="glyphicon-class">glyphicon glyphicon-export</span>
</li>
<li>
<span class="glyphicon glyphicon-eye-close"></span>
<span class="glyphicon-class">glyphicon glyphicon-eye-close</span>
</li>
<li>
<span class="glyphicon glyphicon-eye-open"></span>
<span class="glyphicon-class">glyphicon glyphicon-eye-open</span>
</li>
<li>
<span class="glyphicon glyphicon-facetime-video"></span>
<span class="glyphicon-class">glyphicon glyphicon-facetime-video</span>
</li>
<li>
<span class="glyphicon glyphicon-fast-backward"></span>
<span class="glyphicon-class">glyphicon glyphicon-fast-backward</span>
</li>
<li>
<span class="glyphicon glyphicon-fast-forward"></span>
<span class="glyphicon-class">glyphicon glyphicon-fast-forward</span>
</li>
<li>
<span class="glyphicon glyphicon-file"></span>
<span class="glyphicon-class">glyphicon glyphicon-file</span>
</li>
<li>
<span class="glyphicon glyphicon-film"></span>
<span class="glyphicon-class">glyphicon glyphicon-film</span>
</li>
<li>
<span class="glyphicon glyphicon-filter"></span>
<span class="glyphicon-class">glyphicon glyphicon-filter</span>
</li>
<li>
<span class="glyphicon glyphicon-fire"></span>
<span class="glyphicon-class">glyphicon glyphicon-fire</span>
</li>
<li>
<span class="glyphicon glyphicon-flag"></span>
<span class="glyphicon-class">glyphicon glyphicon-flag</span>
</li>
<li>
<span class="glyphicon glyphicon-flash"></span>
<span class="glyphicon-class">glyphicon glyphicon-flash</span>
</li>
<li>
<span class="glyphicon glyphicon-floppy-disk"></span>
<span class="glyphicon-class">glyphicon glyphicon-floppy-disk</span>
</li>
<li>
<span class="glyphicon glyphicon-floppy-open"></span>
<span class="glyphicon-class">glyphicon glyphicon-floppy-open</span>
</li>
<li>
<span class="glyphicon glyphicon-floppy-remove"></span>
<span class="glyphicon-class">glyphicon glyphicon-floppy-remove</span>
</li>
<li>
<span class="glyphicon glyphicon-floppy-save"></span>
<span class="glyphicon-class">glyphicon glyphicon-floppy-save</span>
</li>
<li>
<span class="glyphicon glyphicon-floppy-saved"></span>
<span class="glyphicon-class">glyphicon glyphicon-floppy-saved</span>
</li>
<li>
<span class="glyphicon glyphicon-folder-close"></span>
<span class="glyphicon-class">glyphicon glyphicon-folder-close</span>
</li>
<li>
<span class="glyphicon glyphicon-folder-open"></span>
<span class="glyphicon-class">glyphicon glyphicon-folder-open</span>
</li>
<li>
<span class="glyphicon glyphicon-font"></span>
<span class="glyphicon-class">glyphicon glyphicon-font</span>
</li>
<li>
<span class="glyphicon glyphicon-forward"></span>
<span class="glyphicon-class">glyphicon glyphicon-forward</span>
</li>
<li>
<span class="glyphicon glyphicon-fullscreen"></span>
<span class="glyphicon-class">glyphicon glyphicon-fullscreen</span>
</li>
<li>
<span class="glyphicon glyphicon-gbp"></span>
<span class="glyphicon-class">glyphicon glyphicon-gbp</span>
</li>
<li>
<span class="glyphicon glyphicon-gift"></span>
<span class="glyphicon-class">glyphicon glyphicon-gift</span>
</li>
<li>
<span class="glyphicon glyphicon-glass"></span>
<span class="glyphicon-class">glyphicon glyphicon-glass</span>
</li>
<li>
<span class="glyphicon glyphicon-globe"></span>
<span class="glyphicon-class">glyphicon glyphicon-globe</span>
</li>
<li>
<span class="glyphicon glyphicon-hand-down"></span>
<span class="glyphicon-class">glyphicon glyphicon-hand-down</span>
</li>
<li>
<span class="glyphicon glyphicon-hand-left"></span>
<span class="glyphicon-class">glyphicon glyphicon-hand-left</span>
</li>
<li>
<span class="glyphicon glyphicon-hand-right"></span>
<span class="glyphicon-class">glyphicon glyphicon-hand-right</span>
</li>
<li>
<span class="glyphicon glyphicon-hand-up"></span>
<span class="glyphicon-class">glyphicon glyphicon-hand-up</span>
</li>
<li>
<span class="glyphicon glyphicon-hd-video"></span>
<span class="glyphicon-class">glyphicon glyphicon-hd-video</span>
</li>
<li>
<span class="glyphicon glyphicon-hdd"></span>
<span class="glyphicon-class">glyphicon glyphicon-hdd</span>
</li>
<li>
<span class="glyphicon glyphicon-header"></span>
<span class="glyphicon-class">glyphicon glyphicon-header</span>
</li>
<li>
<span class="glyphicon glyphicon-headphones"></span>
<span class="glyphicon-class">glyphicon glyphicon-headphones</span>
</li>
<li>
<span class="glyphicon glyphicon-heart"></span>
<span class="glyphicon-class">glyphicon glyphicon-heart</span>
</li>
<li>
<span class="glyphicon glyphicon-heart-empty"></span>
<span class="glyphicon-class">glyphicon glyphicon-heart-empty</span>
</li>
<li>
<span class="glyphicon glyphicon-home"></span>
<span class="glyphicon-class">glyphicon glyphicon-home</span>
</li>
<li>
<span class="glyphicon glyphicon-import"></span>
<span class="glyphicon-class">glyphicon glyphicon-import</span>
</li>
<li>
<span class="glyphicon glyphicon-inbox"></span>
<span class="glyphicon-class">glyphicon glyphicon-inbox</span>
</li>
<li>
<span class="glyphicon glyphicon-indent-left"></span>
<span class="glyphicon-class">glyphicon glyphicon-indent-left</span>
</li>
<li>
<span class="glyphicon glyphicon-indent-right"></span>
<span class="glyphicon-class">glyphicon glyphicon-indent-right</span>
</li>
<li>
<span class="glyphicon glyphicon-info-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-info-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-italic"></span>
<span class="glyphicon-class">glyphicon glyphicon-italic</span>
</li>
<li>
<span class="glyphicon glyphicon-leaf"></span>
<span class="glyphicon-class">glyphicon glyphicon-leaf</span>
</li>
<li>
<span class="glyphicon glyphicon-link"></span>
<span class="glyphicon-class">glyphicon glyphicon-link</span>
</li>
<li>
<span class="glyphicon glyphicon-list"></span>
<span class="glyphicon-class">glyphicon glyphicon-list</span>
</li>
<li>
<span class="glyphicon glyphicon-list-alt"></span>
<span class="glyphicon-class">glyphicon glyphicon-list-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-lock"></span>
<span class="glyphicon-class">glyphicon glyphicon-lock</span>
</li>
<li>
<span class="glyphicon glyphicon-log-in"></span>
<span class="glyphicon-class">glyphicon glyphicon-log-in</span>
</li>
<li>
<span class="glyphicon glyphicon-log-out"></span>
<span class="glyphicon-class">glyphicon glyphicon-log-out</span>
</li>
<li>
<span class="glyphicon glyphicon-magnet"></span>
<span class="glyphicon-class">glyphicon glyphicon-magnet</span>
</li>
<li>
<span class="glyphicon glyphicon-map-marker"></span>
<span class="glyphicon-class">glyphicon glyphicon-map-marker</span>
</li>
<li>
<span class="glyphicon glyphicon-minus"></span>
<span class="glyphicon-class">glyphicon glyphicon-minus</span>
</li>
<li>
<span class="glyphicon glyphicon-minus-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-minus-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-move"></span>
<span class="glyphicon-class">glyphicon glyphicon-move</span>
</li>
<li>
<span class="glyphicon glyphicon-music"></span>
<span class="glyphicon-class">glyphicon glyphicon-music</span>
</li>
<li>
<span class="glyphicon glyphicon-new-window"></span>
<span class="glyphicon-class">glyphicon glyphicon-new-window</span>
</li>
<li>
<span class="glyphicon glyphicon-off"></span>
<span class="glyphicon-class">glyphicon glyphicon-off</span>
</li>
<li>
<span class="glyphicon glyphicon-ok"></span>
<span class="glyphicon-class">glyphicon glyphicon-ok</span>
</li>
<li>
<span class="glyphicon glyphicon-ok-circle"></span>
<span class="glyphicon-class">glyphicon glyphicon-ok-circle</span>
</li>
<li>
<span class="glyphicon glyphicon-ok-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-ok-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-open"></span>
<span class="glyphicon-class">glyphicon glyphicon-open</span>
</li>
<li>
<span class="glyphicon glyphicon-paperclip"></span>
<span class="glyphicon-class">glyphicon glyphicon-paperclip</span>
</li>
<li>
<span class="glyphicon glyphicon-pause"></span>
<span class="glyphicon-class">glyphicon glyphicon-pause</span>
</li>
<li>
<span class="glyphicon glyphicon-pencil"></span>
<span class="glyphicon-class">glyphicon glyphicon-pencil</span>
</li>
<li>
<span class="glyphicon glyphicon-phone"></span>
<span class="glyphicon-class">glyphicon glyphicon-phone</span>
</li>
<li>
<span class="glyphicon glyphicon-phone-alt"></span>
<span class="glyphicon-class">glyphicon glyphicon-phone-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-picture"></span>
<span class="glyphicon-class">glyphicon glyphicon-picture</span>
</li>
<li>
<span class="glyphicon glyphicon-plane"></span>
<span class="glyphicon-class">glyphicon glyphicon-plane</span>
</li>
<li>
<span class="glyphicon glyphicon-play"></span>
<span class="glyphicon-class">glyphicon glyphicon-play</span>
</li>
<li>
<span class="glyphicon glyphicon-play-circle"></span>
<span class="glyphicon-class">glyphicon glyphicon-play-circle</span>
</li>
<li>
<span class="glyphicon glyphicon-plus"></span>
<span class="glyphicon-class">glyphicon glyphicon-plus</span>
</li>
<li>
<span class="glyphicon glyphicon-plus-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-plus-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-print"></span>
<span class="glyphicon-class">glyphicon glyphicon-print</span>
</li>
<li>
<span class="glyphicon glyphicon-pushpin"></span>
<span class="glyphicon-class">glyphicon glyphicon-pushpin</span>
</li>
<li>
<span class="glyphicon glyphicon-qrcode"></span>
<span class="glyphicon-class">glyphicon glyphicon-qrcode</span>
</li>
<li>
<span class="glyphicon glyphicon-question-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-question-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-random"></span>
<span class="glyphicon-class">glyphicon glyphicon-random</span>
</li>
<li>
<span class="glyphicon glyphicon-record"></span>
<span class="glyphicon-class">glyphicon glyphicon-record</span>
</li>
<li>
<span class="glyphicon glyphicon-refresh"></span>
<span class="glyphicon-class">glyphicon glyphicon-refresh</span>
</li>
<li>
<span class="glyphicon glyphicon-registration-mark"></span>
<span class="glyphicon-class">glyphicon glyphicon-registration-mark</span>
</li>
<li>
<span class="glyphicon glyphicon-remove"></span>
<span class="glyphicon-class">glyphicon glyphicon-remove</span>
</li>
<li>
<span class="glyphicon glyphicon-remove-circle"></span>
<span class="glyphicon-class">glyphicon glyphicon-remove-circle</span>
</li>
<li>
<span class="glyphicon glyphicon-remove-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-remove-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-repeat"></span>
<span class="glyphicon-class">glyphicon glyphicon-repeat</span>
</li>
<li>
<span class="glyphicon glyphicon-resize-full"></span>
<span class="glyphicon-class">glyphicon glyphicon-resize-full</span>
</li>
<li>
<span class="glyphicon glyphicon-resize-horizontal"></span>
<span class="glyphicon-class">glyphicon glyphicon-resize-horizontal</span>
</li>
<li>
<span class="glyphicon glyphicon-resize-small"></span>
<span class="glyphicon-class">glyphicon glyphicon-resize-small</span>
</li>
<li>
<span class="glyphicon glyphicon-resize-vertical"></span>
<span class="glyphicon-class">glyphicon glyphicon-resize-vertical</span>
</li>
<li>
<span class="glyphicon glyphicon-retweet"></span>
<span class="glyphicon-class">glyphicon glyphicon-retweet</span>
</li>
<li>
<span class="glyphicon glyphicon-road"></span>
<span class="glyphicon-class">glyphicon glyphicon-road</span>
</li>
<li>
<span class="glyphicon glyphicon-save"></span>
<span class="glyphicon-class">glyphicon glyphicon-save</span>
</li>
<li>
<span class="glyphicon glyphicon-saved"></span>
<span class="glyphicon-class">glyphicon glyphicon-saved</span>
</li>
<li>
<span class="glyphicon glyphicon-screenshot"></span>
<span class="glyphicon-class">glyphicon glyphicon-screenshot</span>
</li>
<li>
<span class="glyphicon glyphicon-sd-video"></span>
<span class="glyphicon-class">glyphicon glyphicon-sd-video</span>
</li>
<li>
<span class="glyphicon glyphicon-search"></span>
<span class="glyphicon-class">glyphicon glyphicon-search</span>
</li>
<li>
<span class="glyphicon glyphicon-send"></span>
<span class="glyphicon-class">glyphicon glyphicon-send</span>
</li>
<li>
<span class="glyphicon glyphicon-share"></span>
<span class="glyphicon-class">glyphicon glyphicon-share</span>
</li>
<li>
<span class="glyphicon glyphicon-share-alt"></span>
<span class="glyphicon-class">glyphicon glyphicon-share-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-shopping-cart"></span>
<span class="glyphicon-class">glyphicon glyphicon-shopping-cart</span>
</li>
<li>
<span class="glyphicon glyphicon-signal"></span>
<span class="glyphicon-class">glyphicon glyphicon-signal</span>
</li>
<li>
<span class="glyphicon glyphicon-sort"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort</span>
</li>
<li>
<span class="glyphicon glyphicon-sort-by-alphabet"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet</span>
</li>
<li>
<span class="glyphicon glyphicon-sort-by-alphabet-alt"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-sort-by-attributes"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes</span>
</li>
<li>
<span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-sort-by-order"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-order</span>
</li>
<li>
<span class="glyphicon glyphicon-sort-by-order-alt"></span>
<span class="glyphicon-class">glyphicon glyphicon-sort-by-order-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-sound-5-1"></span>
<span class="glyphicon-class">glyphicon glyphicon-sound-5-1</span>
</li>
<li>
<span class="glyphicon glyphicon-sound-6-1"></span>
<span class="glyphicon-class">glyphicon glyphicon-sound-6-1</span>
</li>
<li>
<span class="glyphicon glyphicon-sound-7-1"></span>
<span class="glyphicon-class">glyphicon glyphicon-sound-7-1</span>
</li>
<li>
<span class="glyphicon glyphicon-sound-dolby"></span>
<span class="glyphicon-class">glyphicon glyphicon-sound-dolby</span>
</li>
<li>
<span class="glyphicon glyphicon-sound-stereo"></span>
<span class="glyphicon-class">glyphicon glyphicon-sound-stereo</span>
</li>
<li>
<span class="glyphicon glyphicon-star"></span>
<span class="glyphicon-class">glyphicon glyphicon-star</span>
</li>
<li>
<span class="glyphicon glyphicon-star-empty"></span>
<span class="glyphicon-class">glyphicon glyphicon-star-empty</span>
</li>
<li>
<span class="glyphicon glyphicon-stats"></span>
<span class="glyphicon-class">glyphicon glyphicon-stats</span>
</li>
<li>
<span class="glyphicon glyphicon-step-backward"></span>
<span class="glyphicon-class">glyphicon glyphicon-step-backward</span>
</li>
<li>
<span class="glyphicon glyphicon-step-forward"></span>
<span class="glyphicon-class">glyphicon glyphicon-step-forward</span>
</li>
<li>
<span class="glyphicon glyphicon-stop"></span>
<span class="glyphicon-class">glyphicon glyphicon-stop</span>
</li>
<li>
<span class="glyphicon glyphicon-subtitles"></span>
<span class="glyphicon-class">glyphicon glyphicon-subtitles</span>
</li>
<li>
<span class="glyphicon glyphicon-tag"></span>
<span class="glyphicon-class">glyphicon glyphicon-tag</span>
</li>
<li>
<span class="glyphicon glyphicon-tags"></span>
<span class="glyphicon-class">glyphicon glyphicon-tags</span>
</li>
<li>
<span class="glyphicon glyphicon-tasks"></span>
<span class="glyphicon-class">glyphicon glyphicon-tasks</span>
</li>
<li>
<span class="glyphicon glyphicon-text-height"></span>
<span class="glyphicon-class">glyphicon glyphicon-text-height</span>
</li>
<li>
<span class="glyphicon glyphicon-text-width"></span>
<span class="glyphicon-class">glyphicon glyphicon-text-width</span>
</li>
<li>
<span class="glyphicon glyphicon-th"></span>
<span class="glyphicon-class">glyphicon glyphicon-th</span>
</li>
<li>
<span class="glyphicon glyphicon-th-large"></span>
<span class="glyphicon-class">glyphicon glyphicon-th-large</span>
</li>
<li>
<span class="glyphicon glyphicon-th-list"></span>
<span class="glyphicon-class">glyphicon glyphicon-th-list</span>
</li>
<li>
<span class="glyphicon glyphicon-thumbs-down"></span>
<span class="glyphicon-class">glyphicon glyphicon-thumbs-down</span>
</li>
<li>
<span class="glyphicon glyphicon-thumbs-up"></span>
<span class="glyphicon-class">glyphicon glyphicon-thumbs-up</span>
</li>
<li>
<span class="glyphicon glyphicon-time"></span>
<span class="glyphicon-class">glyphicon glyphicon-time</span>
</li>
<li>
<span class="glyphicon glyphicon-tint"></span>
<span class="glyphicon-class">glyphicon glyphicon-tint</span>
</li>
<li>
<span class="glyphicon glyphicon-tower"></span>
<span class="glyphicon-class">glyphicon glyphicon-tower</span>
</li>
<li>
<span class="glyphicon glyphicon-transfer"></span>
<span class="glyphicon-class">glyphicon glyphicon-transfer</span>
</li>
<li>
<span class="glyphicon glyphicon-trash"></span>
<span class="glyphicon-class">glyphicon glyphicon-trash</span>
</li>
<li>
<span class="glyphicon glyphicon-tree-conifer"></span>
<span class="glyphicon-class">glyphicon glyphicon-tree-conifer</span>
</li>
<li>
<span class="glyphicon glyphicon-tree-deciduous"></span>
<span class="glyphicon-class">glyphicon glyphicon-tree-deciduous</span>
</li>
<li>
<span class="glyphicon glyphicon-unchecked"></span>
<span class="glyphicon-class">glyphicon glyphicon-unchecked</span>
</li>
<li>
<span class="glyphicon glyphicon-upload"></span>
<span class="glyphicon-class">glyphicon glyphicon-upload</span>
</li>
<li>
<span class="glyphicon glyphicon-usd"></span>
<span class="glyphicon-class">glyphicon glyphicon-usd</span>
</li>
<li>
<span class="glyphicon glyphicon-user"></span>
<span class="glyphicon-class">glyphicon glyphicon-user</span>
</li>
<li>
<span class="glyphicon glyphicon-volume-down"></span>
<span class="glyphicon-class">glyphicon glyphicon-volume-down</span>
</li>
<li>
<span class="glyphicon glyphicon-volume-off"></span>
<span class="glyphicon-class">glyphicon glyphicon-volume-off</span>
</li>
<li>
<span class="glyphicon glyphicon-volume-up"></span>
<span class="glyphicon-class">glyphicon glyphicon-volume-up</span>
</li>
<li>
<span class="glyphicon glyphicon-warning-sign"></span>
<span class="glyphicon-class">glyphicon glyphicon-warning-sign</span>
</li>
<li>
<span class="glyphicon glyphicon-wrench"></span>
<span class="glyphicon-class">glyphicon glyphicon-wrench</span>
</li>
<li>
<span class="glyphicon glyphicon-zoom-in"></span>
<span class="glyphicon-class">glyphicon glyphicon-zoom-in</span>
</li>
<li>
<span class="glyphicon glyphicon-zoom-out"></span>
<span class="glyphicon-class">glyphicon glyphicon-zoom-out</span>
</li>
</ul>
</div>
<h2 id="glyphicons-how-to-use">How to use</h2> <h2 id="glyphicons-how-to-use">How to use</h2>
<p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p> <p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p>
<div class="bs-callout bs-callout-danger">
<h4>Don't mix with other components</h4>
<p>Icon classes cannot be combined with other elements. They are designed to be standalone elements.</p>
</div>
{% highlight html %} {% highlight html %}
<span class="glyphicon glyphicon-search"></span> <span class="glyphicon glyphicon-search"></span>
{% endhighlight %} {% endhighlight %}
...@@ -296,9 +902,13 @@ base_url: "../" ...@@ -296,9 +902,13 @@ base_url: "../"
{% endhighlight %} {% endhighlight %}
<h3 id="dropdowns-alignment">Alignment options</h3> <h3 id="dropdowns-alignment">Alignment options</h3>
<p>Add <code>.pull-right</code> to a <code>.dropdown-menu</code> to right align the dropdown menu.</p> <p>Add <code>.dropdown-menu-right</code> to a <code>.dropdown-menu</code> to right align the dropdown menu.</p>
<div class="bs-callout bs-callout-warning">
<h4>Deprecated <code>.pull-right</code> alignment</h4>
<p>As of v3.1, we've deprecated <code>.pull-right</code> on dropdown menus. To right-align a menu, use <code>.dropdown-menu-right</code>. Right-aligned nav components in the navbar use a mixin version of this class to automatically align the menu. To override it, use <code>.dropdown-menu-left</code>.</p>
</div>
{% highlight html %} {% highlight html %}
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel">
... ...
</ul> </ul>
{% endhighlight %} {% endhighlight %}
...@@ -493,7 +1103,7 @@ base_url: "../" ...@@ -493,7 +1103,7 @@ base_url: "../"
{% endhighlight %} {% endhighlight %}
<h3 id="btn-groups-vertical">Vertical variation</h3> <h3 id="btn-groups-vertical">Vertical variation</h3>
<p>Make a set of buttons appear vertically stacked rather than horizontally.</p> <p>Make a set of buttons appear vertically stacked rather than horizontally. <strong class="text-danger">Split button dropdowns are not supported here.</strong></p>
<div class="bs-example"> <div class="bs-example">
<div class="btn-group-vertical"> <div class="btn-group-vertical">
<button type="button" class="btn btn-default">Button</button> <button type="button" class="btn btn-default">Button</button>
...@@ -549,11 +1159,11 @@ base_url: "../" ...@@ -549,11 +1159,11 @@ base_url: "../"
{% endhighlight %} {% endhighlight %}
<h3 id="btn-groups-justified">Justified link variation</h3> <h3 id="btn-groups-justified">Justified link variation</h3>
<p>Make a group of buttons stretch at the same size to span the entire width of its parent.</p> <p>Make a group of buttons stretch at the same size to span the entire width of its parent. Also works with button dropdowns within the button group.</p>
<div class="bs-callout bs-callout-warning"> <div class="bs-callout bs-callout-warning">
<h4>Element-specific usage</h4> <h4>Element-specific usage</h4>
<p>This only works with <code>&lt;a&gt;</code> elements as the <code>&lt;button&gt;</code> doesn't pick up these styles.</p> <p>This only works with <code>&lt;a&gt;</code> elements as the <code>&lt;button&gt;</code> doesn't pick up the styles we use to justify content (some <code>display: table-cell;</code>-fu).</p>
</div> </div>
<div class="bs-example"> <div class="bs-example">
...@@ -562,6 +1172,23 @@ base_url: "../" ...@@ -562,6 +1172,23 @@ base_url: "../"
<a class="btn btn-default" role="button">Middle</a> <a class="btn btn-default" role="button">Middle</a>
<a class="btn btn-default" role="button">Right</a> <a class="btn btn-default" role="button">Right</a>
</div> </div>
<br>
<div class="btn-group btn-group-justified">
<a class="btn btn-default" role="button">Left</a>
<a class="btn btn-default" role="button">Middle</a>
<div class="btn-group">
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown">
Dropdown <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div>
</div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="btn-group btn-group-justified"> <div class="btn-group btn-group-justified">
...@@ -1282,8 +1909,8 @@ base_url: "../" ...@@ -1282,8 +1909,8 @@ base_url: "../"
<h2 id="nav-justified">Justified</h2> <h2 id="nav-justified">Justified</h2>
<p>Easily make tabs or pills equal widths of their parent at screens wider than 768px with <code>.nav-justified</code>. On smaller screens, the nav links are stacked.</p> <p>Easily make tabs or pills equal widths of their parent at screens wider than 768px with <code>.nav-justified</code>. On smaller screens, the nav links are stacked.</p>
<div class="bs-callout bs-callout-warning"> <div class="bs-callout bs-callout-warning">
<h4>WebKit and responsive justified navs</h4> <h4>Safari and responsive justified navs</h4>
<p>Chrome and Safari both exhibit a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p> <p>Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
</div> </div>
<div class="bs-example"> <div class="bs-example">
<ul class="nav nav-tabs nav-justified"> <ul class="nav nav-tabs nav-justified">
...@@ -1421,9 +2048,9 @@ base_url: "../" ...@@ -1421,9 +2048,9 @@ base_url: "../"
<h4>Customize the collapsing point</h4> <h4>Customize the collapsing point</h4>
<p>Depending on the content in your navbar, you might need to change the point at which your navbar switches between collapsed and horizontal mode. Customize the <code>@grid-float-breakpoint</code> variable or add your own media query.</p> <p>Depending on the content in your navbar, you might need to change the point at which your navbar switches between collapsed and horizontal mode. Customize the <code>@grid-float-breakpoint</code> variable or add your own media query.</p>
</div> </div>
<div class="bs-callout bs-callout-warning" id="multiple-navbars-warning"> <div class="bs-callout bs-callout-danger">
<h4>Multiple navbars require custom code</h4> <h4>Requires JavaScript</h4>
<p>Multiple nearby navbars with dropdown menus are not supported by default. You will need to override the <code>z-index</code>es of the dropdown menus yourself. Otherwise, the dropdown menu will display behind the other navbar.</p> <p>If JavaScript is disabled and the viewport is narrow enough that the navbar collapses, it will be impossible to expand the navbar and view the content within the <code>.navbar-collapse</code>.</p>
</div> </div>
<div class="bs-example"> <div class="bs-example">
...@@ -1533,15 +2160,15 @@ base_url: "../" ...@@ -1533,15 +2160,15 @@ base_url: "../"
</nav> </nav>
{% endhighlight %} {% endhighlight %}
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
<h4>Plugin dependency</h4> <h4>Plugin dependency</h4>
<p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p> <p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p>
</div> </div>
<div class="bs-callout bs-callout-warning"> <div class="bs-callout bs-callout-warning">
<h4>Make navbars accessible</h4> <h4>Make navbars accessible</h4>
<p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p> <p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p>
</div> </div>
<h2 id="navbar-forms">Forms</h2> <h2 id="navbar-forms">Forms</h2>
...@@ -1577,14 +2204,14 @@ base_url: "../" ...@@ -1577,14 +2204,14 @@ base_url: "../"
</form> </form>
{% endhighlight %} {% endhighlight %}
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
<h4>Always add labels</h4> <h4>Always add labels</h4>
<p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline navbar forms, you can hide the labels using the <code>.sr-only</code> class.</p> <p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline navbar forms, you can hide the labels using the <code>.sr-only</code> class.</p>
</div> </div>
<h2 id="navbar-buttons">Buttons</h2> <h2 id="navbar-buttons">Buttons</h2>
<p>For buttons not residing in a <code>&lt;form&gt;</code>, add this class to vertically center buttons within a navbar.</p> <p>Add the <code>.navbar-btn</code> class to <code>&lt;button&gt;</code> elements not residing in a <code>&lt;form&gt;</code> to vertically center them in the navbar.</p>
<div class="bs-example"> <div class="bs-example">
<nav class="navbar navbar-default" role="navigation"> <nav class="navbar navbar-default" role="navigation">
<div class="navbar-header"> <div class="navbar-header">
...@@ -1605,6 +2232,10 @@ base_url: "../" ...@@ -1605,6 +2232,10 @@ base_url: "../"
<button type="button" class="btn btn-default navbar-btn">Sign in</button> <button type="button" class="btn btn-default navbar-btn">Sign in</button>
{% endhighlight %} {% endhighlight %}
<div class="bs-callout bs-callout-warning">
<h4>Context-specific usage</h4>
<p>Like the standard <a href="{{ page.base_url }}css#buttons">button classes</a>, <code>.navbar-btn</code> can be used on <code>&lt;a&gt;</code> and <code>&lt;input&gt;</code> elements. However, neither <code>.navbar-btn</code> nor the standard button classes should be used on <code>&lt;a&gt;</code> elements within <code>.navbar-nav</code>.</p>
</div>
<h2 id="navbar-text">Text</h2> <h2 id="navbar-text">Text</h2>
<p>Wrap strings of text in an element with <code>.navbar-text</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p> <p>Wrap strings of text in an element with <code>.navbar-text</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
...@@ -1643,12 +2274,12 @@ base_url: "../" ...@@ -1643,12 +2274,12 @@ base_url: "../"
<a class="navbar-brand" href="#">Brand</a> <a class="navbar-brand" href="#">Brand</a>
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-5"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-5">
<p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> <p class="navbar-text navbar-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
</div> </div>
</nav> </nav>
</div> </div>
{% highlight html %} {% highlight html %}
<p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> <p class="navbar-text navbar-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
{% endhighlight %} {% endhighlight %}
...@@ -2089,6 +2720,10 @@ body { padding-bottom: 70px; } ...@@ -2089,6 +2720,10 @@ body { padding-bottom: 70px; }
</a> </a>
</li> </li>
</ul> </ul>
<br>
<button class="btn btn-primary" type="button">
Messages <span class="badge">4</span>
</button>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
...@@ -2111,25 +2746,30 @@ body { padding-bottom: 70px; } ...@@ -2111,25 +2746,30 @@ body { padding-bottom: 70px; }
<div class="page-header"> <div class="page-header">
<h1 id="jumbotron">Jumbotron</h1> <h1 id="jumbotron">Jumbotron</h1>
</div> </div>
<p>A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a <code>.container</code>. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.</p> <p>A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.</p>
<div class="bs-example"> <div class="bs-example">
<div class="jumbotron"> <div class="jumbotron">
<div class="container"> <h1>Hello, world!</h1>
<h1>Hello, world!</h1> <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
<p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p> <p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
<p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
</div>
</div> </div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="jumbotron">
<h1>Hello, world!</h1>
<p>...</p>
<p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
</div>
{% endhighlight %}
<p>To make the jumbotron full width, and without rounded corners, place it outside all <code>.container</code>s and instead add a <code>.container</code> within.</p>
{% highlight html %}
<div class="jumbotron"> <div class="jumbotron">
<div class="container"> <div class="container">
<h1>Hello, world!</h1> ...
<p>...</p>
<p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
</div> </div>
</div> </div>
{% endhighlight %} {% endhighlight %}
</div> </div>
...@@ -2167,31 +2807,31 @@ body { padding-bottom: 70px; } ...@@ -2167,31 +2807,31 @@ body { padding-bottom: 70px; }
<p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p> <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
<div class="bs-example"> <div class="bs-example">
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-3"> <div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
<div class="col-sm-6 col-md-3"> <div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
<div class="col-sm-6 col-md-3"> <div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
<div class="col-sm-6 col-md-3"> <div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
</div> </div>
</div><!-- /.bs-example --> </div><!-- /.bs-example -->
{% highlight html %} {% highlight html %}
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-3"> <div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="..."> <img data-src="holder.js/100%x180" alt="...">
</a> </a>
...@@ -2206,7 +2846,7 @@ body { padding-bottom: 70px; } ...@@ -2206,7 +2846,7 @@ body { padding-bottom: 70px; }
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-4"> <div class="col-sm-6 col-md-4">
<div class="thumbnail"> <div class="thumbnail">
<img data-src="holder.js/300x200" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/300x200" alt="Generic placeholder thumbnail">
<div class="caption"> <div class="caption">
<h3>Thumbnail label</h3> <h3>Thumbnail label</h3>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
...@@ -2216,7 +2856,7 @@ body { padding-bottom: 70px; } ...@@ -2216,7 +2856,7 @@ body { padding-bottom: 70px; }
</div> </div>
<div class="col-sm-6 col-md-4"> <div class="col-sm-6 col-md-4">
<div class="thumbnail"> <div class="thumbnail">
<img data-src="holder.js/300x200" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/300x200" alt="Generic placeholder thumbnail">
<div class="caption"> <div class="caption">
<h3>Thumbnail label</h3> <h3>Thumbnail label</h3>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
...@@ -2226,7 +2866,7 @@ body { padding-bottom: 70px; } ...@@ -2226,7 +2866,7 @@ body { padding-bottom: 70px; }
</div> </div>
<div class="col-sm-6 col-md-4"> <div class="col-sm-6 col-md-4">
<div class="thumbnail"> <div class="thumbnail">
<img data-src="holder.js/300x200" alt="Generic placeholder thumbnail" src="data:image/png;base64,"> <img data-src="holder.js/300x200" alt="Generic placeholder thumbnail">
<div class="caption"> <div class="caption">
<h3>Thumbnail label</h3> <h3>Thumbnail label</h3>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
...@@ -2532,7 +3172,7 @@ body { padding-bottom: 70px; } ...@@ -2532,7 +3172,7 @@ body { padding-bottom: 70px; }
<div class="bs-example"> <div class="bs-example">
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2541,17 +3181,17 @@ body { padding-bottom: 70px; } ...@@ -2541,17 +3181,17 @@ body { padding-bottom: 70px; }
</div> </div>
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Nested media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
</div> </div>
</div> </div>
...@@ -2576,7 +3216,7 @@ body { padding-bottom: 70px; } ...@@ -2576,7 +3216,7 @@ body { padding-bottom: 70px; }
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2584,7 +3224,7 @@ body { padding-bottom: 70px; } ...@@ -2584,7 +3224,7 @@ body { padding-bottom: 70px; }
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -2592,7 +3232,7 @@ body { padding-bottom: 70px; } ...@@ -2592,7 +3232,7 @@ body { padding-bottom: 70px; }
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -2604,7 +3244,7 @@ body { padding-bottom: 70px; } ...@@ -2604,7 +3244,7 @@ body { padding-bottom: 70px; }
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -2615,7 +3255,7 @@ body { padding-bottom: 70px; } ...@@ -2615,7 +3255,7 @@ body { padding-bottom: 70px; }
</li> </li>
<li class="media"> <li class="media">
<a class="pull-right" href="#"> <a class="pull-right" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image" src="data:image/png;base64,"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2720,6 +3360,43 @@ body { padding-bottom: 70px; } ...@@ -2720,6 +3360,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>
......
...@@ -17,4 +17,9 @@ ...@@ -17,4 +17,9 @@
"issues": "https://github.com/twbs/bootstrap/issues" "issues": "https://github.com/twbs/bootstrap/issues"
} }
, "license": "Apache-2.0" , "license": "Apache-2.0"
, "extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
}
}
} }
Supports Markdown
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