rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' into pr/11299

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
This commit is contained in:
Mark Otto 2013-11-30 00:55:00 -08:00
commit 080aa7f5c8
68 changed files with 814 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -39,3 +39,4 @@ validation-report.json
# Folders to ignore
node_modules
bower_components

2
.travis.yml
View File

@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.8
- 0.10
before_script:
- gem install jekyll
- npm install -g grunt-cli

20
CONTRIBUTING.md
View File

@ -17,7 +17,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
## 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`
- 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
@ -59,3 +59,21 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
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/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.

22
Gruntfile.js
View File

@ -3,6 +3,7 @@
module.exports = function(grunt) {
"use strict";
RegExp.quote = require('regexp-quote')
var btoa = require('btoa')
// Project configuration.
grunt.initConfig({
@ -10,11 +11,9 @@ module.exports = function(grunt) {
// Metadata.
pkg: grunt.file.readJSON('package.json'),
banner: '/*!\n' +
' * Bootstrap v<%= pkg.version %> by @fat and @mdo\n' +
' * Bootstrap v<%= pkg.version %> (http://getbootstrap.com)\n' +
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
' *\n' +
' * Designed and built with all the love in the world by @mdo and @fat.\n' +
' */\n\n',
jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',
@ -156,6 +155,17 @@ module.exports = function(grunt) {
files: 'less/*.less',
tasks: ['recess']
}
},
sed: {
versionNumber: {
pattern: (function () {
var old = grunt.option('oldver')
return old ? RegExp.quote(old) : old
})(),
replacement: grunt.option('newver'),
recursive: true
}
}
});
@ -173,6 +183,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-html-validation');
grunt.loadNpmTasks('grunt-jekyll');
grunt.loadNpmTasks('grunt-recess');
grunt.loadNpmTasks('grunt-sed');
// Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']);
@ -203,6 +214,11 @@ module.exports = function(grunt) {
// Default task.
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
grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () {
var fs = require('fs')

2
README.md
View File

@ -10,7 +10,7 @@ To get started, check out <http://getbootstrap.com>!
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.2.zip).
* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
* Install with [Bower](http://bower.io): `bower install bootstrap`.

12
_config.yml
View File

@ -11,15 +11,15 @@ exclude: [".editorconfig", ".gitignore", "bower.json", "composer.json",
port: 9001
# Custom vars
current_version: 3.0.1
current_version: 3.0.2
repo: https://github.com/twbs/bootstrap
download_source: https://github.com/twbs/bootstrap/archive/v3.0.1.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.1/bootstrap-3.0.1-dist.zip
download_source: https://github.com/twbs/bootstrap/archive/v3.0.2.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.2/bootstrap-3.0.2-dist.zip
blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap.min.css
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap-theme.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap-theme.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js

18
_includes/footer.html
View File

@ -1,10 +1,9 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="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="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/application.js"></script>
@ -18,6 +17,21 @@
<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script>
{% 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
================================================== -->
<script>

25
bower.json
View File

@ -1,9 +1,28 @@
{
"name": "bootstrap",
"version": "3.0.1",
"main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"],
"version": "3.0.2",
"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": [
"**/.*"
"**/.*",
"_*",
"docs-assets",
"examples",
"/fonts",
"js/tests",
"CNAME",
"CONTRIBUTING.md",
"Gruntfile.js",
"browserstack.json",
"composer.json",
"package.json",
"*.html"
],
"dependencies": {
"jquery": ">= 1.9.0"

424
components.html
View File

@ -19,809 +19,813 @@ base_url: "../"
<ul class="bs-glyphicons">
<li>
<span class="glyphicon glyphicon-adjust"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-adjust</span>
<span class="glyphicon-class">glyphicon glyphicon-adjust</span>
</li>
<li>
<span class="glyphicon glyphicon-align-center"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-align-center</span>
<span class="glyphicon-class">glyphicon glyphicon-align-center</span>
</li>
<li>
<span class="glyphicon glyphicon-align-justify"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-align-justify</span>
<span class="glyphicon-class">glyphicon glyphicon-align-justify</span>
</li>
<li>
<span class="glyphicon glyphicon-align-left"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-align-left</span>
<span class="glyphicon-class">glyphicon glyphicon-align-left</span>
</li>
<li>
<span class="glyphicon glyphicon-align-right"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-align-right</span>
<span class="glyphicon-class">glyphicon glyphicon-align-right</span>
</li>
<li>
<span class="glyphicon glyphicon-arrow-down"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-arrow-down</span>
<span class="glyphicon-class">glyphicon glyphicon-arrow-down</span>
</li>
<li>
<span class="glyphicon glyphicon-arrow-left"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-arrow-left</span>
<span class="glyphicon-class">glyphicon glyphicon-arrow-left</span>
</li>
<li>
<span class="glyphicon glyphicon-arrow-right"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-arrow-right</span>
<span class="glyphicon-class">glyphicon glyphicon-arrow-right</span>
</li>
<li>
<span class="glyphicon glyphicon-arrow-up"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-arrow-up</span>
<span class="glyphicon-class">glyphicon glyphicon-arrow-up</span>
</li>
<li>
<span class="glyphicon glyphicon-asterisk"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-asterisk</span>
<span class="glyphicon-class">glyphicon glyphicon-asterisk</span>
</li>
<li>
<span class="glyphicon glyphicon-backward"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-backward</span>
<span class="glyphicon-class">glyphicon glyphicon-backward</span>
</li>
<li>
<span class="glyphicon glyphicon-ban-circle"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-ban-circle</span>
<span class="glyphicon-class">glyphicon glyphicon-ban-circle</span>
</li>
<li>
<span class="glyphicon glyphicon-barcode"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-barcode</span>
<span class="glyphicon-class">glyphicon glyphicon-barcode</span>
</li>
<li>
<span class="glyphicon glyphicon-bell"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-bell</span>
<span class="glyphicon-class">glyphicon glyphicon-bell</span>
</li>
<li>
<span class="glyphicon glyphicon-bold"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-bold</span>
<span class="glyphicon-class">glyphicon glyphicon-bold</span>
</li>
<li>
<span class="glyphicon glyphicon-book"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-book</span>
<span class="glyphicon-class">glyphicon glyphicon-book</span>
</li>
<li>
<span class="glyphicon glyphicon-bookmark"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-bookmark</span>
<span class="glyphicon-class">glyphicon glyphicon-bookmark</span>
</li>
<li>
<span class="glyphicon glyphicon-briefcase"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-briefcase</span>
<span class="glyphicon-class">glyphicon glyphicon-briefcase</span>
</li>
<li>
<span class="glyphicon glyphicon-bullhorn"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-bullhorn</span>
<span class="glyphicon-class">glyphicon glyphicon-bullhorn</span>
</li>
<li>
<span class="glyphicon glyphicon-calendar"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-calendar</span>
<span class="glyphicon-class">glyphicon glyphicon-calendar</span>
</li>
<li>
<span class="glyphicon glyphicon-camera"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-camera</span>
<span class="glyphicon-class">glyphicon glyphicon-camera</span>
</li>
<li>
<span class="glyphicon glyphicon-certificate"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-certificate</span>
<span class="glyphicon-class">glyphicon glyphicon-certificate</span>
</li>
<li>
<span class="glyphicon glyphicon-check"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-check</span>
<span class="glyphicon-class">glyphicon glyphicon-check</span>
</li>
<li>
<span class="glyphicon glyphicon-chevron-down"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-chevron-down</span>
<span class="glyphicon-class">glyphicon glyphicon-chevron-down</span>
</li>
<li>
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-chevron-left</span>
<span class="glyphicon-class">glyphicon glyphicon-chevron-left</span>
</li>
<li>
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-chevron-right</span>
<span class="glyphicon-class">glyphicon glyphicon-chevron-right</span>
</li>
<li>
<span class="glyphicon glyphicon-chevron-up"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-chevron-up</span>
<span class="glyphicon-class">glyphicon glyphicon-chevron-up</span>
</li>
<li>
<span class="glyphicon glyphicon-circle-arrow-down"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-circle-arrow-down</span>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-down</span>
</li>
<li>
<span class="glyphicon glyphicon-circle-arrow-left"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-circle-arrow-left</span>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-left</span>
</li>
<li>
<span class="glyphicon glyphicon-circle-arrow-right"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-circle-arrow-right</span>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-right</span>
</li>
<li>
<span class="glyphicon glyphicon-circle-arrow-up"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-circle-arrow-up</span>
<span class="glyphicon-class">glyphicon glyphicon-circle-arrow-up</span>
</li>
<li>
<span class="glyphicon glyphicon-cloud"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-cloud</span>
<span class="glyphicon-class">glyphicon glyphicon-cloud</span>
</li>
<li>
<span class="glyphicon glyphicon-cloud-download"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-cloud-download</span>
<span class="glyphicon-class">glyphicon glyphicon-cloud-download</span>
</li>
<li>
<span class="glyphicon glyphicon-cloud-upload"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-cloud-upload</span>
<span class="glyphicon-class">glyphicon glyphicon-cloud-upload</span>
</li>
<li>
<span class="glyphicon glyphicon-cog"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-cog</span>
<span class="glyphicon-class">glyphicon glyphicon-cog</span>
</li>
<li>
<span class="glyphicon glyphicon-collapse-down"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-collapse-down</span>
<span class="glyphicon-class">glyphicon glyphicon-collapse-down</span>
</li>
<li>
<span class="glyphicon glyphicon-collapse-up"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-collapse-up</span>
<span class="glyphicon-class">glyphicon glyphicon-collapse-up</span>
</li>
<li>
<span class="glyphicon glyphicon-comment"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-comment</span>
<span class="glyphicon-class">glyphicon glyphicon-comment</span>
</li>
<li>
<span class="glyphicon glyphicon-compressed"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-compressed</span>
<span class="glyphicon-class">glyphicon glyphicon-compressed</span>
</li>
<li>
<span class="glyphicon glyphicon-copyright-mark"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-copyright-mark</span>
<span class="glyphicon-class">glyphicon glyphicon-copyright-mark</span>
</li>
<li>
<span class="glyphicon glyphicon-credit-card"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-credit-card</span>
<span class="glyphicon-class">glyphicon glyphicon-credit-card</span>
</li>
<li>
<span class="glyphicon glyphicon-cutlery"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-cutlery</span>
<span class="glyphicon-class">glyphicon glyphicon-cutlery</span>
</li>
<li>
<span class="glyphicon glyphicon-dashboard"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-dashboard</span>
<span class="glyphicon-class">glyphicon glyphicon-dashboard</span>
</li>
<li>
<span class="glyphicon glyphicon-download"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-download</span>
<span class="glyphicon-class">glyphicon glyphicon-download</span>
</li>
<li>
<span class="glyphicon glyphicon-download-alt"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-download-alt</span>
<span class="glyphicon-class">glyphicon glyphicon-download-alt</span>
</li>
<li>
<span class="glyphicon glyphicon-earphone"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-earphone</span>
<span class="glyphicon-class">glyphicon glyphicon-earphone</span>
</li>
<li>
<span class="glyphicon glyphicon-edit"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-edit</span>
<span class="glyphicon-class">glyphicon glyphicon-edit</span>
</li>
<li>
<span class="glyphicon glyphicon-eject"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-eject</span>
<span class="glyphicon-class">glyphicon glyphicon-eject</span>
</li>
<li>
<span class="glyphicon glyphicon-envelope"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-envelope</span>
<span class="glyphicon-class">glyphicon glyphicon-envelope</span>
</li>
<li>
<span class="glyphicon glyphicon-euro"></span>
<span class="glyphicon-class">.glyphicon .glyphicon-euro</span>
<span class="glyphicon-class">glyphicon glyphicon-euro</span>
</li>
<li>
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-expand</span>
</li>
<li>
<span class="glyphicon glyphicon-export"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-file</span>
</li>
<li>
<span class="glyphicon glyphicon-film"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-filter</span>
</li>
<li>
<span class="glyphicon glyphicon-fire"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-flag</span>
</li>
<li>
<span class="glyphicon glyphicon-flash"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-font</span>
</li>
<li>
<span class="glyphicon glyphicon-forward"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-fullscreen</span>
</li>
<li>
<span class="glyphicon glyphicon-gbp"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-gift</span>
</li>
<li>
<span class="glyphicon glyphicon-glass"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-hdd</span>
</li>
<li>
<span class="glyphicon glyphicon-header"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-headphones</span>
</li>
<li>
<span class="glyphicon glyphicon-heart"></span>
<span class="glyphicon-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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-home</span>
</li>
<li>
<span class="glyphicon glyphicon-import"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-italic</span>
</li>
<li>
<span class="glyphicon glyphicon-leaf"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-link</span>
</li>
<li>
<span class="glyphicon glyphicon-list"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-move</span>
</li>
<li>
<span class="glyphicon glyphicon-music"></span>
<span class="glyphicon-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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-off</span>
</li>
<li>
<span class="glyphicon glyphicon-ok"></span>
<span class="glyphicon-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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-open</span>
</li>
<li>
<span class="glyphicon glyphicon-paperclip"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-pause</span>
</li>
<li>
<span class="glyphicon glyphicon-pencil"></span>
<span class="glyphicon-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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-picture</span>
</li>
<li>
<span class="glyphicon glyphicon-plane"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-print</span>
</li>
<li>
<span class="glyphicon glyphicon-pushpin"></span>
<span class="glyphicon-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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-random</span>
</li>
<li>
<span class="glyphicon glyphicon-record"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-retweet</span>
</li>
<li>
<span class="glyphicon glyphicon-road"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-save</span>
</li>
<li>
<span class="glyphicon glyphicon-saved"></span>
<span class="glyphicon-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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-search</span>
</li>
<li>
<span class="glyphicon glyphicon-send"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-signal</span>
</li>
<li>
<span class="glyphicon glyphicon-sort"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-stop</span>
</li>
<li>
<span class="glyphicon glyphicon-subtitles"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-tag</span>
</li>
<li>
<span class="glyphicon glyphicon-tags"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-time</span>
</li>
<li>
<span class="glyphicon glyphicon-tint"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-tower</span>
</li>
<li>
<span class="glyphicon glyphicon-transfer"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-unchecked</span>
</li>
<li>
<span class="glyphicon glyphicon-upload"></span>
<span class="glyphicon-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>
<span class="glyphicon-class">glyphicon glyphicon-usd</span>
</li>
<li>
<span class="glyphicon glyphicon-user"></span>
<span class="glyphicon-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>
<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>
<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>
<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>
<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>
<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>
<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>
<span class="glyphicon-class">glyphicon glyphicon-zoom-out</span>
</li>
</ul>
<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>
<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 %}
<span class="glyphicon glyphicon-search"></span>
{% endhighlight %}
@ -1882,8 +1886,8 @@ base_url: "../"
<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>
<div class="bs-callout bs-callout-warning">
<h4>WebKit 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>
<h4>Safari and responsive justified navs</h4>
<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 class="bs-example">
<ul class="nav nav-tabs nav-justified">
@ -2247,12 +2251,12 @@ base_url: "../"
<a class="navbar-brand" href="#">Brand</a>
</div>
<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>
</nav>
</div>
{% 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 %}
@ -2776,22 +2780,22 @@ body { padding-bottom: 70px; }
<p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
<div class="bs-example">
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a>
</div>
<div class="col-sm-6 col-md-3">
<div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a>
</div>
<div class="col-sm-6 col-md-3">
<div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a>
</div>
<div class="col-sm-6 col-md-3">
<div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a>
@ -2800,7 +2804,7 @@ body { padding-bottom: 70px; }
</div><!-- /.bs-example -->
{% highlight html %}
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="col-xs-6 col-md-3">
<a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt="...">
</a>
@ -3160,7 +3164,7 @@ body { padding-bottom: 70px; }
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<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.
</div>
</div>

5
composer.json
View File

@ -17,4 +17,9 @@
"issues": "https://github.com/twbs/bootstrap/issues"
}
, "license": "Apache-2.0"
, "extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
}
}
}

10
css.html
View File

@ -320,7 +320,7 @@ base_url: "../"
{% endhighlight %}
<h3 id="grid-responsive-resets">Responsive column resets</h3>
<p>With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a <code>.clearfix</code> and our <a href="../css#responsive-utilities">responsive utility classes</a>.</p>
<p>With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a <code>.clearfix</code> and our <a href="#responsive-utilities">responsive utility classes</a>.</p>
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="col-xs-6 col-sm-3">
@ -871,7 +871,7 @@ base_url: "../"
<p>Style and content changes for simple variations on a standard <code>&lt;blockquote&gt;</code>.</p>
<h4>Naming a source</h4>
<p>Add <code>&lt;small&gt;</code> tag for identifying the source. Wrap the name of the source work in <code>&lt;cite&gt;</code>.</p>
<p>Add <code>&lt;small&gt;</code> tag or <code>.small</code> class for identifying the source. Wrap the name of the source work in <code>&lt;cite&gt;</code>.</p>
<div class="bs-example">
<blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@ -1617,7 +1617,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h2 id="forms-horizontal">Horizontal form</h2>
<p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding <code>.form-horizontal</code> to the form. Doing so changes <code>.form-group</code>s to behave as grid rows, so no need for <code>.row</code>.</p>
<div class="bs-example">
<form class="form-horizontal">
<form class="form-horizontal" role="form">
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">Email</label>
<div class="col-sm-10">
@ -2272,7 +2272,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<div class="bs-callout bs-callout-warning">
<h4>Responsive images</h4>
<p>Looking for how to make images more responsive? <a href="../css#overview-responsive-images">Check out the responsive images section</a> up top.</p>
<p>Looking for how to make images more responsive? <a href="#overview-responsive-images">Check out the responsive images section</a> up top.</p>
</div>
</div>
@ -2384,7 +2384,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3 id="helper-classes-show-hide">Showing and hiding content</h3>
<p>Force an element to be shown or hidden (<strong>including for screen readers</strong>) with the use of <code>.show</code> and <code>.hidden</code> classes. These classes use <code>!important</code> to avoid specificity conflicts, just like the <a href="../css/#helper-classes-floats">quick floats</a>. They are only available for block level toggling. They can also be used as mixins.</p>
<p>Force an element to be shown or hidden (<strong>including for screen readers</strong>) with the use of <code>.show</code> and <code>.hidden</code> classes. These classes use <code>!important</code> to avoid specificity conflicts, just like the <a href="#helper-classes-floats">quick floats</a>. They are only available for block level toggling. They can also be used as mixins.</p>
<p><code>.hide</code> is available, but it does not always affect screen readers and is <strong>deprecated</strong> as of v3.0.1. Use <code>.hidden</code> or <code>.sr-only</code> instead.</p>
<p>Furthermore, <code>.invisible</code> can be used to toggle only the visibility of an element, meaning its <code>display</code> is not modified and the element can still affect the flow of the document.</p>
{% highlight html %}

2
customize.html
View File

@ -399,7 +399,7 @@ base_url: "../"
<input type="text" class="form-control" placeholder="Georgia, 'Times New Roman', Times, serif" data-var="@font-family-serif">
<p class="help-block">Default serif fonts.</p>
<label>@font-family-monospace</label>
<input type="text" class="form-control" placeholder="Monaco, Menlo, Consolas, 'Courier New', monospace" data-var="@font-family-monospace">
<input type="text" class="form-control" placeholder="Menlo, Monaco, Consolas, 'Courier New', monospace" data-var="@font-family-monospace">
<p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code> and <code>&lt;pre&gt;</code>.</p>
<h4>Base type styes</h4>

4
dist/css/bootstrap-theme.css vendored
View File

@ -1,9 +1,7 @@
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default,

4
dist/css/bootstrap-theme.min.css vendored
View File

File diff suppressed because one or more lines are too long

484
dist/css/bootstrap.css vendored
View File

@ -1,9 +1,7 @@
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
@ -333,7 +331,7 @@ a:focus {
}
a:focus {
outline: thin dotted #333;
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@ -426,35 +424,35 @@ cite {
}
.text-warning {
color: #c09853;
color: #8a6d3b;
}
.text-warning:hover {
color: #a47e3c;
color: #66512c;
}
.text-danger {
color: #b94a48;
color: #a94442;
}
.text-danger:hover {
color: #953b39;
color: #843534;
}
.text-success {
color: #468847;
color: #3c763d;
}
.text-success:hover {
color: #356635;
color: #2b542c;
}
.text-info {
color: #3a87ad;
color: #31708f;
}
.text-info:hover {
color: #2d6987;
color: #245269;
}
.text-left {
@ -692,13 +690,15 @@ blockquote p:last-child {
margin-bottom: 0;
}
blockquote small {
blockquote small,
blockquote .small {
display: block;
line-height: 1.428571429;
color: #999999;
}
blockquote small:before {
blockquote small:before,
blockquote .small:before {
content: '\2014 \00A0';
}
@ -740,7 +740,7 @@ code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
@ -807,6 +807,24 @@ pre code {
clear: both;
}
@media (min-width: 768px) {
.container {
width: 750px;
}
}
@media (min-width: 992px) {
.container {
width: 970px;
}
}
@media (min-width: 1200px) {
.container {
width: 1170px;
}
}
.row {
margin-right: -15px;
margin-left: -15px;
@ -996,6 +1014,10 @@ pre code {
right: 8.333333333333332%;
}
.col-xs-pull-0 {
right: 0;
}
.col-xs-push-12 {
left: 100%;
}
@ -1044,6 +1066,10 @@ pre code {
left: 8.333333333333332%;
}
.col-xs-push-0 {
left: 0;
}
.col-xs-offset-12 {
margin-left: 100%;
}
@ -1092,10 +1118,11 @@ pre code {
margin-left: 8.333333333333332%;
}
@media (min-width: 768px) {
.container {
width: 750px;
.col-xs-offset-0 {
margin-left: 0;
}
@media (min-width: 768px) {
.col-sm-1,
.col-sm-2,
.col-sm-3,
@ -1181,6 +1208,9 @@ pre code {
.col-sm-pull-1 {
right: 8.333333333333332%;
}
.col-sm-pull-0 {
right: 0;
}
.col-sm-push-12 {
left: 100%;
}
@ -1217,6 +1247,9 @@ pre code {
.col-sm-push-1 {
left: 8.333333333333332%;
}
.col-sm-push-0 {
left: 0;
}
.col-sm-offset-12 {
margin-left: 100%;
}
@ -1253,12 +1286,12 @@ pre code {
.col-sm-offset-1 {
margin-left: 8.333333333333332%;
}
.col-sm-offset-0 {
margin-left: 0;
}
}
@media (min-width: 992px) {
.container {
width: 970px;
}
.col-md-1,
.col-md-2,
.col-md-3,
@ -1344,6 +1377,9 @@ pre code {
.col-md-pull-1 {
right: 8.333333333333332%;
}
.col-md-pull-0 {
right: 0;
}
.col-md-push-12 {
left: 100%;
}
@ -1380,6 +1416,9 @@ pre code {
.col-md-push-1 {
left: 8.333333333333332%;
}
.col-md-push-0 {
left: 0;
}
.col-md-offset-12 {
margin-left: 100%;
}
@ -1416,12 +1455,12 @@ pre code {
.col-md-offset-1 {
margin-left: 8.333333333333332%;
}
.col-md-offset-0 {
margin-left: 0;
}
}
@media (min-width: 1200px) {
.container {
width: 1170px;
}
.col-lg-1,
.col-lg-2,
.col-lg-3,
@ -1507,6 +1546,9 @@ pre code {
.col-lg-pull-1 {
right: 8.333333333333332%;
}
.col-lg-pull-0 {
right: 0;
}
.col-lg-push-12 {
left: 100%;
}
@ -1543,6 +1585,9 @@ pre code {
.col-lg-push-1 {
left: 8.333333333333332%;
}
.col-lg-push-0 {
left: 0;
}
.col-lg-offset-12 {
margin-left: 100%;
}
@ -1579,6 +1624,9 @@ pre code {
.col-lg-offset-1 {
margin-left: 8.333333333333332%;
}
.col-lg-offset-0 {
margin-left: 0;
}
}
table {
@ -1677,84 +1725,75 @@ table th[class*="col-"] {
float: none;
}
.table > thead > tr > td.active,
.table > tbody > tr > td.active,
.table > tfoot > tr > td.active,
.table > thead > tr > th.active,
.table > tbody > tr > th.active,
.table > tfoot > tr > th.active,
.table > thead > tr.active > td,
.table > tbody > tr.active > td,
.table > tfoot > tr.active > td,
.table > thead > tr.active > th,
.table > tbody > tr.active > th,
.table > tfoot > tr.active > th {
.table > thead > tr > .active,
.table > tbody > tr > .active,
.table > tfoot > tr > .active,
.table > thead > .active > td,
.table > tbody > .active > td,
.table > tfoot > .active > td,
.table > thead > .active > th,
.table > tbody > .active > th,
.table > tfoot > .active > th {
background-color: #f5f5f5;
}
.table > thead > tr > td.success,
.table > tbody > tr > td.success,
.table > tfoot > tr > td.success,
.table > thead > tr > th.success,
.table > tbody > tr > th.success,
.table > tfoot > tr > th.success,
.table > thead > tr.success > td,
.table > tbody > tr.success > td,
.table > tfoot > tr.success > td,
.table > thead > tr.success > th,
.table > tbody > tr.success > th,
.table > tfoot > tr.success > th {
.table-hover > tbody > tr > .active:hover,
.table-hover > tbody > .active:hover > td,
.table-hover > tbody > .active:hover > th {
background-color: #e8e8e8;
}
.table > thead > tr > .success,
.table > tbody > tr > .success,
.table > tfoot > tr > .success,
.table > thead > .success > td,
.table > tbody > .success > td,
.table > tfoot > .success > td,
.table > thead > .success > th,
.table > tbody > .success > th,
.table > tfoot > .success > th {
background-color: #dff0d8;
}
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr.success:hover > th {
.table-hover > tbody > tr > .success:hover,
.table-hover > tbody > .success:hover > td,
.table-hover > tbody > .success:hover > th {
background-color: #d0e9c6;
}
.table > thead > tr > td.danger,
.table > tbody > tr > td.danger,
.table > tfoot > tr > td.danger,
.table > thead > tr > th.danger,
.table > tbody > tr > th.danger,
.table > tfoot > tr > th.danger,
.table > thead > tr.danger > td,
.table > tbody > tr.danger > td,
.table > tfoot > tr.danger > td,
.table > thead > tr.danger > th,
.table > tbody > tr.danger > th,
.table > tfoot > tr.danger > th {
.table > thead > tr > .danger,
.table > tbody > tr > .danger,
.table > tfoot > tr > .danger,
.table > thead > .danger > td,
.table > tbody > .danger > td,
.table > tfoot > .danger > td,
.table > thead > .danger > th,
.table > tbody > .danger > th,
.table > tfoot > .danger > th {
background-color: #f2dede;
}
.table-hover > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover,
.table-hover > tbody > tr.danger:hover > td,
.table-hover > tbody > tr.danger:hover > th {
.table-hover > tbody > tr > .danger:hover,
.table-hover > tbody > .danger:hover > td,
.table-hover > tbody > .danger:hover > th {
background-color: #ebcccc;
}
.table > thead > tr > td.warning,
.table > tbody > tr > td.warning,
.table > tfoot > tr > td.warning,
.table > thead > tr > th.warning,
.table > tbody > tr > th.warning,
.table > tfoot > tr > th.warning,
.table > thead > tr.warning > td,
.table > tbody > tr.warning > td,
.table > tfoot > tr.warning > td,
.table > thead > tr.warning > th,
.table > tbody > tr.warning > th,
.table > tfoot > tr.warning > th {
.table > thead > tr > .warning,
.table > tbody > tr > .warning,
.table > tfoot > tr > .warning,
.table > thead > .warning > td,
.table > tbody > .warning > td,
.table > tfoot > .warning > td,
.table > thead > .warning > th,
.table > tbody > .warning > th,
.table > tfoot > .warning > th {
background-color: #fcf8e3;
}
.table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover,
.table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr.warning:hover > th {
.table-hover > tbody > tr > .warning:hover,
.table-hover > tbody > .warning:hover > td,
.table-hover > tbody > .warning:hover > th {
background-color: #faf2cc;
}
@ -1863,7 +1902,7 @@ select optgroup {
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
outline: thin dotted #333;
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@ -1882,22 +1921,6 @@ output {
vertical-align: middle;
}
.form-control:-moz-placeholder {
color: #999999;
}
.form-control::-moz-placeholder {
color: #999999;
}
.form-control:-ms-input-placeholder {
color: #999999;
}
.form-control::-webkit-input-placeholder {
color: #999999;
}
.form-control {
display: block;
width: 100%;
@ -1924,6 +1947,23 @@ output {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
}
.form-control:-moz-placeholder {
color: #999999;
}
.form-control::-moz-placeholder {
color: #999999;
opacity: 1;
}
.form-control:-ms-input-placeholder {
color: #999999;
}
.form-control::-webkit-input-placeholder {
color: #999999;
}
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
@ -2019,7 +2059,7 @@ textarea.input-sm {
}
.input-lg {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
@ -2027,8 +2067,8 @@ textarea.input-sm {
}
select.input-lg {
height: 45px;
line-height: 45px;
height: 46px;
line-height: 46px;
}
textarea.input-lg {
@ -2041,25 +2081,25 @@ textarea.input-lg {
.has-warning .checkbox,
.has-warning .radio-inline,
.has-warning .checkbox-inline {
color: #c09853;
color: #8a6d3b;
}
.has-warning .form-control {
border-color: #c09853;
border-color: #8a6d3b;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-warning .form-control:focus {
border-color: #a47e3c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
border-color: #66512c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
}
.has-warning .input-group-addon {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #c09853;
border-color: #8a6d3b;
}
.has-error .help-block,
@ -2068,25 +2108,25 @@ textarea.input-lg {
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline {
color: #b94a48;
color: #a94442;
}
.has-error .form-control {
border-color: #b94a48;
border-color: #a94442;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-error .form-control:focus {
border-color: #953b39;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
border-color: #843534;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
}
.has-error .input-group-addon {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #b94a48;
border-color: #a94442;
}
.has-success .help-block,
@ -2095,25 +2135,25 @@ textarea.input-lg {
.has-success .checkbox,
.has-success .radio-inline,
.has-success .checkbox-inline {
color: #468847;
color: #3c763d;
}
.has-success .form-control {
border-color: #468847;
border-color: #3c763d;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-success .form-control:focus {
border-color: #356635;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
border-color: #2b542c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
}
.has-success .input-group-addon {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #468847;
border-color: #3c763d;
}
.form-control-static {
@ -2217,7 +2257,7 @@ textarea.input-lg {
}
.btn:focus {
outline: thin dotted #333;
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@ -3421,9 +3461,8 @@ input[type="button"].btn-block {
height: 0;
margin-left: 2px;
vertical-align: middle;
border-top: 4px solid #000000;
border-top: 4px solid;
border-right: 4px solid transparent;
border-bottom: 0 dotted;
border-left: 4px solid transparent;
}
@ -3541,8 +3580,8 @@ input[type="button"].btn-block {
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0 dotted;
border-bottom: 4px solid #000000;
border-top: 0;
border-bottom: 4px solid;
content: "";
}
@ -3560,30 +3599,6 @@ input[type="button"].btn-block {
}
}
.btn-default .caret {
border-top-color: #333333;
}
.btn-primary .caret,
.btn-success .caret,
.btn-warning .caret,
.btn-danger .caret,
.btn-info .caret {
border-top-color: #fff;
}
.dropup .btn-default .caret {
border-bottom-color: #333333;
}
.dropup .btn-primary .caret,
.dropup .btn-success .caret,
.dropup .btn-warning .caret,
.dropup .btn-danger .caret,
.dropup .btn-info .caret {
border-bottom-color: #fff;
}
.btn-group,
.btn-group-vertical {
position: relative;
@ -3750,7 +3765,8 @@ input[type="button"].btn-block {
}
.btn-group-vertical > .btn,
.btn-group-vertical > .btn-group {
.btn-group-vertical > .btn-group,
.btn-group-vertical > .btn-group > .btn {
display: block;
float: none;
width: 100%;
@ -3858,7 +3874,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
@ -3868,8 +3884,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
height: 45px;
line-height: 45px;
height: 46px;
line-height: 46px;
}
textarea.input-group-lg > .form-control,
@ -4063,13 +4079,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-color: #428bca;
}
.nav .open > a .caret,
.nav .open > a:hover .caret,
.nav .open > a:focus .caret {
border-top-color: #2a6496;
border-bottom-color: #2a6496;
}
.nav .nav-divider {
height: 1px;
margin: 9px 0;
@ -4182,13 +4191,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #428bca;
}
.nav-pills > li.active > a .caret,
.nav-pills > li.active > a:hover .caret,
.nav-pills > li.active > a:focus .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
.nav-stacked > li {
float: none;
}
@ -4261,16 +4263,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: block;
}
.nav .caret {
border-top-color: #428bca;
border-bottom-color: #428bca;
}
.nav a:hover .caret {
border-top-color: #2a6496;
border-bottom-color: #2a6496;
}
.nav-tabs .dropdown-menu {
margin-top: -1px;
border-top-right-radius: 0;
@ -4473,6 +4465,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
margin-right: 15px;
margin-bottom: 8px;
background-color: transparent;
background-image: none;
border: 1px solid transparent;
border-radius: 4px;
}
@ -4627,13 +4620,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-text {
float: left;
margin-top: 15px;
margin-bottom: 15px;
}
@media (min-width: 768px) {
.navbar-text {
float: left;
margin-right: 15px;
margin-left: 15px;
}
@ -4700,12 +4693,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-color: #e7e7e7;
}
.navbar-default .navbar-nav > .dropdown > a:hover .caret,
.navbar-default .navbar-nav > .dropdown > a:focus .caret {
border-top-color: #333333;
border-bottom-color: #333333;
}
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus {
@ -4713,18 +4700,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #e7e7e7;
}
.navbar-default .navbar-nav > .open > a .caret,
.navbar-default .navbar-nav > .open > a:hover .caret,
.navbar-default .navbar-nav > .open > a:focus .caret {
border-top-color: #555555;
border-bottom-color: #555555;
}
.navbar-default .navbar-nav > .dropdown > a .caret {
border-top-color: #777777;
border-bottom-color: #777777;
}
@media (max-width: 767px) {
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #777777;
@ -4824,27 +4799,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #080808;
}
.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
.navbar-inverse .navbar-nav > .dropdown > a .caret {
border-top-color: #999999;
border-bottom-color: #999999;
}
.navbar-inverse .navbar-nav > .open > a .caret,
.navbar-inverse .navbar-nav > .open > a:hover .caret,
.navbar-inverse .navbar-nav > .open > a:focus .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
@media (max-width: 767px) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #080808;
}
.navbar-inverse .navbar-nav .open .dropdown-menu .divider {
background-color: #080808;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #999999;
}
@ -5209,6 +5170,10 @@ a.list-group-item.active > .badge,
border-radius: 6px;
}
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 768px) {
.jumbotron {
padding-top: 48px;
@ -5225,10 +5190,7 @@ a.list-group-item.active > .badge,
}
.thumbnail {
display: inline-block;
display: block;
height: auto;
max-width: 100%;
padding: 4px;
margin-bottom: 20px;
line-height: 1.428571429;
@ -5295,7 +5257,7 @@ a.thumbnail.active {
}
.alert-success {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
@ -5305,11 +5267,11 @@ a.thumbnail.active {
}
.alert-success .alert-link {
color: #356635;
color: #2b542c;
}
.alert-info {
color: #3a87ad;
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
@ -5319,11 +5281,11 @@ a.thumbnail.active {
}
.alert-info .alert-link {
color: #2d6987;
color: #245269;
}
.alert-warning {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
@ -5333,11 +5295,11 @@ a.thumbnail.active {
}
.alert-warning .alert-link {
color: #a47e3c;
color: #66512c;
}
.alert-danger {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
@ -5347,7 +5309,7 @@ a.thumbnail.active {
}
.alert-danger .alert-link {
color: #953b39;
color: #843534;
}
@-webkit-keyframes progress-bar-stripes {
@ -5359,24 +5321,6 @@ a.thumbnail.active {
}
}
@-moz-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
}
to {
background-position: 0 0;
}
}
@-o-keyframes progress-bar-stripes {
from {
background-position: 0 0;
}
to {
background-position: 40px 0;
}
}
@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
@ -5637,7 +5581,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel > .table,
.panel > .table-responsive {
.panel > .table-responsive > .table {
margin-bottom: 0;
}
@ -5646,6 +5590,11 @@ a.list-group-item.active:focus .list-group-item-text {
border-top: 1px solid #dddddd;
}
.panel > .table > tbody:first-child th,
.panel > .table > tbody:first-child td {
border-top: 0;
}
.panel > .table-bordered,
.panel > .table-responsive > .table-bordered {
border: 0;
@ -5765,10 +5714,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #dddddd;
}
.panel-default > .panel-heading > .dropdown .caret {
border-color: #333333 transparent;
}
.panel-default > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #dddddd;
}
@ -5787,10 +5732,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #428bca;
}
.panel-primary > .panel-heading > .dropdown .caret {
border-color: #ffffff transparent;
}
.panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca;
}
@ -5800,7 +5741,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-success > .panel-heading {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
@ -5809,10 +5750,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #d6e9c6;
}
.panel-success > .panel-heading > .dropdown .caret {
border-color: #468847 transparent;
}
.panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6;
}
@ -5822,7 +5759,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-warning > .panel-heading {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
@ -5831,10 +5768,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #faebcc;
}
.panel-warning > .panel-heading > .dropdown .caret {
border-color: #c09853 transparent;
}
.panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #faebcc;
}
@ -5844,7 +5777,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-danger > .panel-heading {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
@ -5853,10 +5786,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #ebccd1;
}
.panel-danger > .panel-heading > .dropdown .caret {
border-color: #b94a48 transparent;
}
.panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #ebccd1;
}
@ -5866,7 +5795,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-info > .panel-heading {
color: #3a87ad;
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
@ -5875,10 +5804,6 @@ a.list-group-item.active:focus .list-group-item-text {
border-top-color: #bce8f1;
}
.panel-info > .panel-heading > .dropdown .caret {
border-color: #3a87ad transparent;
}
.panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1;
}
@ -5973,7 +5898,7 @@ button.close {
position: relative;
z-index: 1050;
width: auto;
padding: 10px;
margin: 10px;
margin-right: auto;
margin-left: auto;
}
@ -6073,8 +5998,8 @@ button.close {
@media screen and (min-width: 768px) {
.modal-dialog {
width: 600px;
padding-top: 30px;
padding-bottom: 30px;
margin-top: 30px;
margin-bottom: 30px;
}
.modal-content {
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
@ -6434,6 +6359,7 @@ button.close {
.carousel-control:focus {
color: #ffffff;
text-decoration: none;
outline: none;
opacity: 0.9;
filter: alpha(opacity=90);
}

6
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

82
dist/js/bootstrap.js vendored
View File

@ -1,15 +1,13 @@
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Bootstrap v3.0.2 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
/* ========================================================================
* Bootstrap: transition.js v3.0.0
* Bootstrap: transition.js v3.0.2
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -63,10 +61,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$.support.transition = transitionEnd()
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: alert.js v3.0.0
* Bootstrap: alert.js v3.0.2
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -162,10 +160,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: button.js v3.0.0
* Bootstrap: button.js v3.0.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -220,15 +218,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
Button.prototype.toggle = function () {
var $parent = this.$element.closest('[data-toggle="buttons"]')
var changed = true
if ($parent.length) {
var $input = this.$element.find('input')
.prop('checked', !this.$element.hasClass('active'))
.trigger('change')
if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
if ($input.prop('type') === 'radio') {
// see if clicking on current one
if ($input.prop('checked') && this.$element.hasClass('active'))
changed = false
else
$parent.find('.active').removeClass('active')
}
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
}
this.$element.toggleClass('active')
if (changed) this.$element.toggleClass('active')
}
@ -272,10 +276,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
e.preventDefault()
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: carousel.js v3.0.0
* Bootstrap: carousel.js v3.0.2
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -345,7 +349,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (pos > (this.$items.length - 1) || pos < 0) return
if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
if (activeIndex == pos) return this.pause().cycle()
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@ -397,7 +401,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (this.$indicators.length) {
this.$indicators.find('.active').removeClass('active')
this.$element.one('slid', function () {
this.$element.one('slid.bs.carousel', function () {
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
$nextIndicator && $nextIndicator.addClass('active')
})
@ -415,7 +419,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
})
.emulateTransitionEnd(600)
} else {
@ -424,7 +428,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
this.$element.trigger('slid.bs.carousel')
}
isCycling && this.cycle()
@ -490,10 +494,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
})
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: collapse.js v3.0.0
* Bootstrap: collapse.js v3.0.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -670,10 +674,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$target.collapse(option)
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: dropdown.js v3.0.0
* Bootstrap: dropdown.js v3.0.2
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -715,7 +719,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (!isActive) {
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
// if mobile we we use a backdrop because click events don't delegate
// if mobile we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
}
@ -797,9 +801,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('dropdown')
var data = $this.data('bs.dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this)
})
}
@ -825,10 +829,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: modal.js v3.0.0
* Bootstrap: modal.js v3.0.2
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -1072,10 +1076,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.0.0
* Bootstrap: tooltip.js v3.0.2
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@ -1459,10 +1463,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
return this
}
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: popover.js v3.0.0
* Bootstrap: popover.js v3.0.2
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -1577,10 +1581,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
return this
}
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: scrollspy.js v3.0.0
* Bootstrap: scrollspy.js v3.0.2
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -1694,7 +1698,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.addClass('active')
}
active.trigger('activate')
active.trigger('activate.bs.scrollspy')
}
@ -1736,10 +1740,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
})
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: tab.js v3.0.0
* Bootstrap: tab.js v3.0.2
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -1872,10 +1876,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$(this).tab('show')
})
}(window.jQuery);
}(jQuery);
/* ========================================================================
* Bootstrap: affix.js v3.0.0
* Bootstrap: affix.js v3.0.2
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -1999,4 +2003,4 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
})
})
}(window.jQuery);
}(jQuery);

6
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs-assets/css/docs.css
View File

@ -586,14 +586,14 @@ h1[id] {
border-color: #faebcc;
}
.bs-callout-warning h4 {
color: #c09853;
color: #8a6d3b;
}
.bs-callout-info {
background-color: #f4f8fa;
border-color: #bce8f1;
}
.bs-callout-info h4 {
color: #3a87ad;
color: #34789a;
}

2
docs-assets/js/application.js
View File

@ -100,4 +100,4 @@
})
})
}(window.jQuery)
}(jQuery)

7
docs-assets/js/customizer.js
View File

@ -7,7 +7,7 @@
window.onload = function () { // wait for load in a dumb way because B-0
var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n'
var cw = '/*!\n * Bootstrap v3.0.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n'
function showError(msg, err) {
$('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
@ -56,7 +56,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
data: JSON.stringify(data)
})
.success(function(result) {
history.replaceState(false, document.title, window.location.origin + window.location.pathname + '?id=' + result.id)
var origin = window.location.protocol + "//" + window.location.host
history.replaceState(false, document.title, origin + window.location.pathname + '?id=' + result.id)
})
.error(function(err) {
showError('<strong>Ruh roh!</strong> Could not save gist file, configuration not saved.', err)
@ -230,7 +231,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
}
result = {
'bootstrap.css' : cw + tree.toCSS(),
'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
'bootstrap.min.css' : cw + tree.toCSS({ compress: true }).replace(/\n/g, '')
}
})
} catch (err) {

4
docs-assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

3
examples/carousel/index.html
View File

@ -31,10 +31,11 @@
<div class="navbar-wrapper">
<div class="container">
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

5
examples/jumbotron/index.html
View File

@ -28,10 +28,11 @@
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -39,7 +40,7 @@
<a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<form class="navbar-form navbar-right">
<form class="navbar-form navbar-right" role="form">
<div class="form-group">
<input type="text" placeholder="Email" class="form-control">
</div>

3
examples/justified-nav/index.html
View File

@ -52,7 +52,8 @@
<!-- Example row of columns -->
<div class="row">
<div class="col-lg-4">
<h2>Heading</h2>
<h2>Safari bug warning!</h2>
<p class="text-danger">Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.</p>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
</div>

3
examples/navbar-fixed-top/index.html
View File

@ -29,10 +29,11 @@
<body>
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top">
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

3
examples/navbar-static-top/index.html
View File

@ -29,10 +29,11 @@
<body>
<!-- Static navbar -->
<div class="navbar navbar-default navbar-static-top">
<div class="navbar navbar-default navbar-static-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

3
examples/navbar/index.html
View File

@ -31,9 +31,10 @@
<div class="container">
<!-- Static navbar -->
<div class="navbar navbar-default">
<div class="navbar navbar-default" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

3
examples/non-responsive/index.html
View File

@ -31,10 +31,11 @@
<body>
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top">
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

1
examples/offcanvas/index.html
View File

@ -31,6 +31,7 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

3
examples/offcanvas/offcanvas.css
View File

@ -2,7 +2,8 @@
* Style tweaks
* --------------------------------------------------
*/
html {
html,
body {
overflow-x: hidden; /* Prevent scroll on narrow devices */
}
body {

2
examples/signin/index.html
View File

@ -30,7 +30,7 @@
<div class="container">
<form class="form-signin">
<form class="form-signin" role="form">
<h2 class="form-signin-heading">Please sign in</h2>
<input type="text" class="form-control" placeholder="Email address" required autofocus>
<input type="password" class="form-control" placeholder="Password" required>

3
examples/starter-template/index.html
View File

@ -28,10 +28,11 @@
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

3
examples/sticky-footer-navbar/index.html
View File

@ -32,10 +32,11 @@
<div id="wrap">
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top">
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

5
examples/theme/index.html
View File

@ -31,10 +31,11 @@
<body>
<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -148,6 +149,7 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -180,6 +182,7 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

17
getting-started.html
View File

@ -108,7 +108,7 @@ bootstrap/
<title>Bootstrap 101 Template</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="css/bootstrap.min.css" rel="stylesheet">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -405,6 +405,10 @@ bootstrap/
<td><code>.control-group</code></td>
<td><code>.form-group</code></td>
</tr>
<tr>
<td><code>.control-group.warning .control-group.error .control-group.success</code></td>
<td><code>.form-group.has-*</code></td>
</tr>
<tr>
<td><code>.checkbox.inline</code> <code>.radio.inline</code></td>
<td><code>.checkbox-inline</code> <code>.radio-inline</code></td>
@ -469,10 +473,6 @@ bootstrap/
<td><code>.accordion-inner</code></td>
<td><code>.panel-body</code></td>
</tr>
<tr>
<td><code>.alert-error</code></td>
<td><code>.alert-danger</code></td>
</tr>
</tbody>
</table>
</div><!-- /.table-responsive -->
@ -615,6 +615,11 @@ bootstrap/
<td><code>.form-search</code></td>
<td class="text-muted">N/A</td>
</tr>
<tr>
<td>Form group with info</td>
<td><code>.control-group.info</code></td>
<td class="text-muted">N/A</td>
</tr>
<tr>
<td>Fluid container</td>
<td><code>.container-fluid</code></td>
@ -678,7 +683,7 @@ bootstrap/
<li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li>
<li>Modal markup has changed significantly. The <code>.modal-header</code>, <code>.modal-body</code>, and <code>.modal-footer</code> sections are now wrapped in <code>.modal-content</code> and <code>.modal-dialog</code> for better mobile styling and behavior.</li>
<li>The HTML loaded by the <code>remote</code> modal option is now injected into the <code>.modal</code> instead of into the <code>.modal-body</code>. This allows you to also easily vary the header and footer of the modal, not just the modal body.</li>
<li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc..</li>
<li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc.</li>
</ul>
<p>For more information on upgrading to v3.0, and code snippets from the community, see <a href="http://bootply.com/">Bootply</a>.</p>
</div>

50
javascript.html
View File

@ -304,15 +304,15 @@ $('#myModal').modal({
{% endhighlight %}
<h4>.modal('toggle')</h4>
<p>Manually toggles a modal.</p>
<p>Manually toggles a modal. <strong>Returns to the caller before the modal has actually been shown or hidden</strong> (i.e. before the <code>shown.bs.modal</code> or <code>hidden.bs.modal</code> event occurs).</p>
{% highlight js %}$('#myModal').modal('toggle'){% endhighlight %}
<h4>.modal('show')</h4>
<p>Manually opens a modal.</p>
<p>Manually opens a modal. <strong>Returns to the caller before the modal has actually been shown</strong> (i.e. before the <code>shown.bs.modal</code> event occurs).</p>
{% highlight js %}$('#myModal').modal('show'){% endhighlight %}
<h4>.modal('hide')</h4>
<p>Manually hides a modal.</p>
<p>Manually hides a modal. <strong>Returns to the caller before the modal has actually been hidden</strong> (i.e. before the <code>hidden.bs.modal</code> event occurs).</p>
{% highlight js %}$('#myModal').modal('hide'){% endhighlight %}
<h3>Events</h3>
@ -328,11 +328,11 @@ $('#myModal').modal({
<tbody>
<tr>
<td>show.bs.modal</td>
<td>This event fires immediately when the <code>show</code> instance method is called.</td>
<td>This event fires immediately when the <code>show</code> instance method is called. If caused by a click, the clicked element is available as the <code>relatedTarget</code> property of the event.</td>
</tr>
<tr>
<td>shown.bs.modal</td>
<td>This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete).</td>
<td>This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete). If caused by a click, the clicked element is available as the <code>relatedTarget</code> property of the event.</td>
</tr>
<tr>
<td>hide.bs.modal</td>
@ -346,8 +346,8 @@ $('#myModal').modal({
</table>
</div><!-- /.table-responsive -->
{% highlight js %}
$('#myModal').on('hidden.bs.modal', function () {
// do something…
$('#myModal').on('hidden.bs.modal', function (e) {
// do something...
})
{% endhighlight %}
</div>
@ -529,6 +529,7 @@ $('#myDropdown').on('show.bs.dropdown', function () {
{% endhighlight %}
</div>
<!-- ScrollSpy
================================================== -->
<div class="bs-docs-section">
@ -588,7 +589,13 @@ $('#myDropdown').on('show.bs.dropdown', function () {
<h3>Via data attributes</h3>
<p>To easily add scrollspy behavior to your topbar navigation, add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the <code>&lt;body&gt;</code>). Then add the <code>data-target</code> attribute with the ID or class of the parent element of any Bootstrap <code>.nav</code> component.</p>
{% highlight html %}
<body data-spy="scroll" data-target="#navbar-example">
<body data-spy="scroll" data-target=".navbar-example">
...
<div class="navbar-example">
<ul class="nav nav-tabs">
...
</ul>
</div>
...
</body>
{% endhighlight %}
@ -596,7 +603,7 @@ $('#myDropdown').on('show.bs.dropdown', function () {
<h3>Via JavaScript</h3>
<p>Call the scrollspy via JavaScript:</p>
{% highlight js %}
$('body').scrollspy({ target: '#navbar-example' })
$('body').scrollspy({ target: '.navbar-example' })
{% endhighlight %}
<div class="bs-callout bs-callout-danger">
@ -1926,21 +1933,26 @@ $('#myCarousel').on('slide.bs.carousel', function () {
<hr class="bs-docs-separator">
<h2 id="affix-usage">Usage</h2>
<p>Use the affix plugin via data attributes or manually with your own JavaScript. <strong>In both situations, you must provide CSS for the positioning of your content.</strong></p>
<h3>Positioning via CSS</h3>
<p>The affix plugin toggles between three classes, each representing a particular state: <code>.affix</code>, <code>.affix-top</code>, and <code>.affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin) to handle the actual positions.</p>
<p>Here's how the affix plugin works:</p>
<ol>
<li>To start, the plugin adds <code>.affix-top</code> to indicate the element is in it's top-most position. At this point no CSS positioning is required.</li>
<li>Scrolling past the element you want affixed should trigger the actual affixing. This is where <code>.affix</code> replaces <code>.affix-top</code> and sets <code>position: fixed;</code> (provided by Bootstrap's code CSS).</li>
<li>If a bottom offset is defined, scrolling past that should replace <code>.affix</code> with <code>.affix-bottom</code>. Since offsets are optional, setting one requires you to set the appropriate CSS. In this case, add <code>position: absolute;</code> when necessary. The plugin uses the data attribute or JavaScript option to determine where to position the elemtn from there.</li>
</ol>
<p>Follow the above steps to set your CSS for either of the usage options below.</p>
<h3>Via data attributes</h3>
<p>To easily add affix behavior to any element, just add <code>data-spy="affix"</code> to the element you want to spy on. Then use offsets to define when to toggle the pinning of an element on and off.</p>
<p>To easily add affix behavior to any element, just add <code>data-spy="affix"</code> to the element you want to spy on. Use offsets to define when to toggle the pinning of an element.</p>
{% highlight html %}
<div data-spy="affix" data-offset-top="200">...</div>
{% endhighlight %}
<div class="bs-callout bs-callout-warning">
<h4>Requires independent styling ;)</h4>
<p>
Affix toggles between three states/classes: <code>.affix</code>, <code>.affix-top</code>, and <code>.affix-bottom</code>. You must provide the styles for these classes yourself (independent of this plugin).
The <code>.affix-top</code> class should be in the regular flow of the document. The <code>.affix</code> class should be <code>position: fixed</code>. And <code>.affix-bottom</code> should be <code>position: absolute</code>. Note: <code>.affix-bottom</code> is special in that the plugin will place the element with JS relative to the <code>offset: { bottom: number }</code> option you've provided.
</p>
<div data-spy="affix" data-offset-top="60" data-offset-bottom="200">
...
</div>
{% endhighlight %}
<h3>Via JavaScript</h3>
<p>Call the affix plugin via JavaScript:</p>

4
js/affix.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.0.0
* Bootstrap: affix.js v3.0.2
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -123,4 +123,4 @@
})
})
}(window.jQuery);
}(jQuery);

4
js/alert.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: alert.js v3.0.0
* Bootstrap: alert.js v3.0.2
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -95,4 +95,4 @@
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
}(window.jQuery);
}(jQuery);

18
js/button.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: button.js v3.0.0
* Bootstrap: button.js v3.0.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -54,15 +54,21 @@
Button.prototype.toggle = function () {
var $parent = this.$element.closest('[data-toggle="buttons"]')
var changed = true
if ($parent.length) {
var $input = this.$element.find('input')
.prop('checked', !this.$element.hasClass('active'))
.trigger('change')
if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
if ($input.prop('type') === 'radio') {
// see if clicking on current one
if ($input.prop('checked') && this.$element.hasClass('active'))
changed = false
else
$parent.find('.active').removeClass('active')
}
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
}
this.$element.toggleClass('active')
if (changed) this.$element.toggleClass('active')
}
@ -106,4 +112,4 @@
e.preventDefault()
})
}(window.jQuery);
}(jQuery);

12
js/carousel.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: carousel.js v3.0.0
* Bootstrap: carousel.js v3.0.2
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -69,7 +69,7 @@
if (pos > (this.$items.length - 1) || pos < 0) return
if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
if (activeIndex == pos) return this.pause().cycle()
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@ -121,7 +121,7 @@
if (this.$indicators.length) {
this.$indicators.find('.active').removeClass('active')
this.$element.one('slid', function () {
this.$element.one('slid.bs.carousel', function () {
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
$nextIndicator && $nextIndicator.addClass('active')
})
@ -139,7 +139,7 @@
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
})
.emulateTransitionEnd(600)
} else {
@ -148,7 +148,7 @@
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
this.$element.trigger('slid.bs.carousel')
}
isCycling && this.cycle()
@ -214,4 +214,4 @@
})
})
}(window.jQuery);
}(jQuery);

4
js/collapse.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: collapse.js v3.0.0
* Bootstrap: collapse.js v3.0.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -176,4 +176,4 @@
$target.collapse(option)
})
}(window.jQuery);
}(jQuery);

10
js/dropdown.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: dropdown.js v3.0.0
* Bootstrap: dropdown.js v3.0.2
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -41,7 +41,7 @@
if (!isActive) {
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
// if mobile we we use a backdrop because click events don't delegate
// if mobile we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
}
@ -123,9 +123,9 @@
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('dropdown')
var data = $this.data('bs.dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this)
})
}
@ -151,4 +151,4 @@
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);
}(jQuery);

4
js/modal.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: modal.js v3.0.0
* Bootstrap: modal.js v3.0.2
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -243,4 +243,4 @@
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
}(window.jQuery);
}(jQuery);

4
js/popover.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: popover.js v3.0.0
* Bootstrap: popover.js v3.0.2
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -114,4 +114,4 @@
return this
}
}(window.jQuery);
}(jQuery);

6
js/scrollspy.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: scrollspy.js v3.0.0
* Bootstrap: scrollspy.js v3.0.2
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -113,7 +113,7 @@
.addClass('active')
}
active.trigger('activate')
active.trigger('activate.bs.scrollspy')
}
@ -155,4 +155,4 @@
})
})
}(window.jQuery);
}(jQuery);

4
js/tab.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: tab.js v3.0.0
* Bootstrap: tab.js v3.0.2
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -132,4 +132,4 @@
$(this).tab('show')
})
}(window.jQuery);
}(jQuery);

6
js/tests/unit/button.js
View File

@ -111,6 +111,12 @@ $(function () {
ok(!btn1.find('input').prop('checked'), 'btn1 is checked')
ok(btn2.hasClass('active'), 'btn2 has active class')
ok(btn2.find('input').prop('checked'), 'btn2 is checked')
btn2.find('input').click() /* clicking an already checked radio should not un-check it */
ok(!btn1.hasClass('active'), 'btn1 does not have active class')
ok(!btn1.find('input').prop('checked'), 'btn1 is checked')
ok(btn2.hasClass('active'), 'btn2 has active class')
ok(btn2.find('input').prop('checked'), 'btn2 is checked')
})
})

4
js/tooltip.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: tooltip.js v3.0.0
* Bootstrap: tooltip.js v3.0.2
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@ -383,4 +383,4 @@
return this
}
}(window.jQuery);
}(jQuery);

4
js/transition.js
View File

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: transition.js v3.0.0
* Bootstrap: transition.js v3.0.2
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
@ -53,4 +53,4 @@
$.support.transition = transitionEnd()
})
}(window.jQuery);
}(jQuery);

34
less/button-groups.less
View File

@ -2,37 +2,6 @@
// Button groups
// --------------------------------------------------
// Button carets
//
// Match the button text color to the arrow/caret for indicating dropdown-ness.
.caret {
.btn-default & {
border-top-color: @btn-default-color;
}
.btn-primary &,
.btn-success &,
.btn-warning &,
.btn-danger &,
.btn-info & {
border-top-color: #fff;
}
}
.dropup {
.btn-default .caret {
border-bottom-color: @btn-default-color;
}
.btn-primary,
.btn-success,
.btn-warning,
.btn-danger,
.btn-info {
.caret {
border-bottom-color: #fff;
}
}
}
// Make the div behave like a button
.btn-group,
.btn-group-vertical {
@ -178,7 +147,8 @@
.btn-group-vertical {
> .btn,
> .btn-group {
> .btn-group,
> .btn-group > .btn {
display: block;
float: none;
width: 100%;

1
less/carousel.less
View File

@ -91,6 +91,7 @@
// Hover/focus state
&:hover,
&:focus {
outline: none;
color: @carousel-control-color;
text-decoration: none;
.opacity(.9);

11
less/dropdowns.less
View File

@ -10,12 +10,9 @@
height: 0;
margin-left: 2px;
vertical-align: middle;
border-top: @caret-width-base solid @dropdown-caret-color;
border-top: @caret-width-base solid;
border-right: @caret-width-base solid transparent;
border-left: @caret-width-base solid transparent;
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
// we can just straight up remove this.
border-bottom: 0 dotted;
}
// The dropdown wrapper (div)
@ -163,10 +160,8 @@
.navbar-fixed-bottom .dropdown {
// Reverse the caret
.caret {
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
// gets fixed, restore `border-top: 0;`.
border-top: 0 dotted;
border-bottom: @caret-width-base solid @dropdown-caret-color;
border-top: 0;
border-bottom: @caret-width-base solid;
content: "";
}
// Different positioning for bottom up menu

14
less/forms.less
View File

@ -92,14 +92,6 @@ output {
vertical-align: middle;
}
// Placeholder
//
// Placeholder text gets special styles because when browsers invalidate entire
// lines if it doesn't understand a selector/
.form-control {
.placeholder();
}
// Common form controls
//
@ -142,6 +134,12 @@ output {
// Customize the `:focus` state to imitate native WebKit styles.
.form-control-focus();
// Placeholder
//
// Placeholder text gets special styles because when browsers invalidate entire
// lines if it doesn't understand a selector/
.placeholder();
// Disabled and read-only inputs
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
// be disabled if the fieldset is disabled. Due to implementation difficulty,

26
less/grid.less
View File

@ -5,6 +5,16 @@
// Set the container width, and override it for fixed navbars in media queries
.container {
.container-fixed();
@media (min-width: @screen-sm) {
width: @container-sm;
}
@media (min-width: @screen-md) {
width: @container-md;
}
@media (min-width: @screen-lg-min) {
width: @container-lg;
}
}
// mobile first defaults
@ -18,8 +28,8 @@
// Extra small grid
//
// Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target.
// Columns, offsets, pushes, and pulls for extra small devices like
// smartphones.
//
// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
// it's full-width.
@ -40,10 +50,6 @@
// it's full-width.
@media (min-width: @screen-sm-min) {
.container {
width: @container-sm;
}
.make-grid-columns-float(sm);
.make-grid(@grid-columns, sm, width);
.make-grid(@grid-columns, sm, pull);
@ -60,10 +66,6 @@
// it's full-width.
@media (min-width: @screen-md-min) {
.container {
width: @container-md;
}
.make-grid-columns-float(md);
.make-grid(@grid-columns, md, width);
.make-grid(@grid-columns, md, pull);
@ -80,10 +82,6 @@
// it's full-width.
@media (min-width: @screen-lg-min) {
.container {
width: @container-lg;
}
.make-grid-columns-float(lg);
.make-grid(@grid-columns, lg, width);
.make-grid(@grid-columns, lg, pull);

4
less/jumbotron.less
View File

@ -25,6 +25,10 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
}
.container {
max-width: 100%;
}
@media screen and (min-width: @screen-sm-min) {
padding-top: (@jumbotron-padding * 1.6);
padding-bottom: (@jumbotron-padding * 1.6);

42
less/mixins.less
View File

@ -30,8 +30,8 @@
// WebKit-style focus
.tab-focus() {
// Default
outline: thin dotted #333;
// WebKit
outline: thin dotted;
//Webkit
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@ -55,7 +55,8 @@
// Placeholder text
.placeholder(@color: @input-color-placeholder) {
&:-moz-placeholder { color: @color; } // Firefox 4-18
&::-moz-placeholder { color: @color; } // Firefox 19+
&::-moz-placeholder { color: @color; // Firefox 19+
opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
&:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
&::-webkit-input-placeholder { color: @color; } // Safari and Chrome
}
@ -391,7 +392,7 @@
// Panels
// -------------------------
.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) {
.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
border-color: @border;
& > .panel-heading {
@ -402,9 +403,6 @@
+ .panel-collapse .panel-body {
border-top-color: @border;
}
& > .dropdown .caret {
border-color: @heading-text-color transparent;
}
}
& > .panel-footer {
+ .panel-collapse .panel-body {
@ -430,27 +428,27 @@
// Tables
// -------------------------
.table-row-variant(@state; @background; @border) {
.table-row-variant(@state; @background) {
// Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables.
.table > thead > tr,
.table > tbody > tr,
.table > tfoot > tr {
> td.@{state},
> th.@{state},
&.@{state} > td,
&.@{state} > th {
.table {
> thead,
> tbody,
> tfoot {
> tr > .@{state},
> .@{state} > td,
> .@{state} > th {
background-color: @background;
}
}
}
// Hover states for `.table-hover`
// Note: this is not available for cells or rows within `thead` or `tfoot`.
.table-hover > tbody > tr {
> td.@{state}:hover,
> th.@{state}:hover,
&.@{state}:hover > td,
&.@{state}:hover > th {
.table-hover > tbody {
> tr > .@{state}:hover,
> .@{state}:hover > td,
> .@{state}:hover > th {
background-color: darken(@background, 5%);
}
}
@ -750,7 +748,7 @@
.col(1); // kickstart it
}
.calc-grid(@index, @class, @type) when (@type = width) {
.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) {
.col-@{class}-@{index} {
width: percentage((@index / @grid-columns));
}
@ -772,7 +770,7 @@
}
// Basic looping in LESS
.make-grid(@index, @class, @type) when (@index > 0) {
.make-grid(@index, @class, @type) when (@index >= 0) {
.calc-grid(@index, @class, @type);
// next iteration
.make-grid(@index - 1, @class, @type);

6
less/modals.less
View File

@ -38,7 +38,7 @@
margin-left: auto;
margin-right: auto;
width: auto;
padding: 10px;
margin: 10px;
z-index: (@zindex-modal-background + 10);
}
@ -122,8 +122,8 @@
.modal-dialog {
width: 600px;
padding-top: 30px;
padding-bottom: 30px;
margin-top: 30px;
margin-bottom: 30px;
}
.modal-content {
.box-shadow(0 5px 15px rgba(0,0,0,.5));

42
less/navbar.less
View File

@ -180,6 +180,7 @@
padding: 9px 10px;
.navbar-vertical-align(34px);
background-color: transparent;
background-image: none; // Fix for at least Firefox on Android, per #11468
border: 1px solid transparent;
border-radius: @border-radius-base;
@ -340,10 +341,10 @@
// Add a class to make any element properly align itself vertically within the navbars.
.navbar-text {
float: left;
.navbar-vertical-align(@line-height-computed);
@media (min-width: @grid-float-breakpoint) {
float: left;
margin-left: @navbar-padding-horizontal;
margin-right: @navbar-padding-horizontal;
}
@ -414,15 +415,8 @@
border-color: @navbar-default-border;
}
// Dropdown menu items and carets
// Dropdown menu items
.navbar-nav {
// Caret should match text color on hover
> .dropdown > a:hover .caret,
> .dropdown > a:focus .caret {
border-top-color: @navbar-default-link-hover-color;
border-bottom-color: @navbar-default-link-hover-color;
}
// Remove background color from open dropdown
> .open > a {
&,
@ -430,17 +424,8 @@
&:focus {
background-color: @navbar-default-link-active-bg;
color: @navbar-default-link-active-color;
.caret {
border-top-color: @navbar-default-link-active-color;
border-bottom-color: @navbar-default-link-active-color;
}
}
}
> .dropdown > a .caret {
border-top-color: @navbar-default-link-color;
border-bottom-color: @navbar-default-link-color;
}
@media (max-width: @screen-xs-max) {
// Dropdowns get custom display when collapsed
@ -561,24 +546,6 @@
color: @navbar-inverse-link-active-color;
}
}
> .dropdown > a:hover .caret {
border-top-color: @navbar-inverse-link-hover-color;
border-bottom-color: @navbar-inverse-link-hover-color;
}
> .dropdown > a .caret {
border-top-color: @navbar-inverse-link-color;
border-bottom-color: @navbar-inverse-link-color;
}
> .open > a {
&,
&:hover,
&:focus {
.caret {
border-top-color: @navbar-inverse-link-active-color;
border-bottom-color: @navbar-inverse-link-active-color;
}
}
}
@media (max-width: @screen-xs-max) {
// Dropdowns get custom display
@ -586,6 +553,9 @@
> .dropdown-header {
border-color: @navbar-inverse-border;
}
.divider {
background-color: @navbar-inverse-border;
}
> li > a {
color: @navbar-inverse-link-color;
&:hover,

20
less/navs.less
View File

@ -48,11 +48,6 @@
&:focus {
background-color: @nav-link-hover-bg;
border-color: @link-color;
.caret {
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
}
}
@ -138,11 +133,6 @@
&:focus {
color: @nav-pills-active-link-hover-color;
background-color: @nav-pills-active-link-hover-bg;
.caret {
border-top-color: @nav-pills-active-link-hover-color;
border-bottom-color: @nav-pills-active-link-hover-color;
}
}
}
}
@ -243,16 +233,6 @@
// Dropdowns
// -------------------------
// Make dropdown carets use link color in navs
.nav .caret {
border-top-color: @link-color;
border-bottom-color: @link-color;
}
.nav a:hover .caret {
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
// Specific dropdowns
.nav-tabs .dropdown-menu {
// make dropdown border overlap tab border

8
less/panels.less
View File

@ -57,13 +57,17 @@
.panel {
> .table,
> .table-responsive {
> .table-responsive > .table {
margin-bottom: 0;
}
> .panel-body + .table,
> .panel-body + .table-responsive {
border-top: 1px solid @table-border-color;
}
> .table > tbody:first-child th,
> .table > tbody:first-child td {
border-top: 0;
}
> .table-bordered,
> .table-responsive > .table-bordered {
border: 0;
@ -96,7 +100,7 @@
border-bottom: 1px solid transparent;
.border-top-radius(@panel-border-radius - 1);
& > .dropdown .dropdown-toggle {
> .dropdown .dropdown-toggle {
color: inherit;
}
}

12
less/progress-bars.less
View File

@ -12,18 +12,6 @@
to { background-position: 0 0; }
}
// Firefox
@-moz-keyframes progress-bar-stripes {
from { background-position: 40px 0; }
to { background-position: 0 0; }
}
// Opera
@-o-keyframes progress-bar-stripes {
from { background-position: 0 0; }
to { background-position: 40px 0; }
}
// Spec and IE10+
@keyframes progress-bar-stripes {
from { background-position: 40px 0; }

26
less/tables.less
View File

@ -104,24 +104,28 @@ th {
//
// Default zebra-stripe styles (alternating gray and transparent backgrounds)
.table-striped > tbody > tr:nth-child(odd) {
.table-striped {
> tbody > tr:nth-child(odd) {
> td,
> th {
background-color: @table-bg-accent;
}
}
}
// Hover effect
//
// Placed here since it has to come after the potential zebra striping
.table-hover > tbody > tr:hover {
.table-hover {
> tbody > tr:hover {
> td,
> th {
background-color: @table-bg-hover;
}
}
}
// Table cell sizing
@ -148,21 +152,11 @@ table {
// Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables.
.table > thead > tr,
.table > tbody > tr,
.table > tfoot > tr {
> td.active,
> th.active,
&.active > td,
&.active > th {
background-color: @table-bg-active;
}
}
// Generate the contextual variants
.table-row-variant(success; @state-success-bg; @state-success-border);
.table-row-variant(danger; @state-danger-bg; @state-danger-border);
.table-row-variant(warning; @state-warning-bg; @state-warning-border);
.table-row-variant(active; @table-bg-active);
.table-row-variant(success; @state-success-bg);
.table-row-variant(danger; @state-danger-bg);
.table-row-variant(warning; @state-warning-bg);
// Responsive tables

20
less/thumbnails.less
View File

@ -5,27 +5,31 @@
// Mixin and adjust the regular image class
.thumbnail {
.img-thumbnail();
display: block; // Override the inline-block from `.img-thumbnail`
display: block;
padding: @thumbnail-padding;
margin-bottom: @line-height-computed;
line-height: @line-height-base;
background-color: @thumbnail-bg;
border: 1px solid @thumbnail-border;
border-radius: @thumbnail-border-radius;
.transition(all .2s ease-in-out);
> img {
.img-responsive();
margin-left: auto;
margin-right: auto;
}
}
// Add a hover state for linked versions only
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
a&:hover,
a&:focus,
a&.active {
border-color: @link-color;
}
// Image captions
.thumbnail .caption {
.caption {
padding: @thumbnail-caption-padding;
color: @thumbnail-caption-color;
}
}

3
less/type.less
View File

@ -233,7 +233,8 @@ blockquote {
p:last-child {
margin-bottom: 0;
}
small {
small,
.small {
display: block;
line-height: @line-height-base;
color: @blockquote-small-color;

15
less/variables.less
View File

@ -41,7 +41,7 @@
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@ -157,7 +157,7 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@legend-color: @gray-dark;
@ -186,8 +186,6 @@
@dropdown-header-color: @gray-light;
@dropdown-caret-color: #000;
// COMPONENT VARIABLES
// --------------------------------------------------
@ -321,7 +319,6 @@
@nav-disabled-link-hover-color: @gray-light;
@nav-open-link-hover-color: #fff;
@nav-open-caret-border-color: #fff;
// Tabs
@nav-tabs-border-color: #ddd;
@ -375,19 +372,19 @@
// Form states and alerts
// -------------------------
@state-success-text: #468847;
@state-success-text: #3c763d;
@state-success-bg: #dff0d8;
@state-success-border: darken(spin(@state-success-bg, -10), 5%);
@state-info-text: #3a87ad;
@state-info-text: #31708f;
@state-info-bg: #d9edf7;
@state-info-border: darken(spin(@state-info-bg, -10), 7%);
@state-warning-text: #c09853;
@state-warning-text: #8a6d3b;
@state-warning-bg: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
@state-danger-text: #b94a48;
@state-danger-text: #a94442;
@state-danger-bg: #f2dede;
@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);

17
package.json
View File

@ -1,7 +1,7 @@
{
"name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "version": "3.0.1"
, "version": "3.0.2"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://getbootstrap.com"
, "author": "Twitter, Inc."
@ -33,6 +33,19 @@
, "grunt-contrib-watch": "~0.5.3"
, "grunt-html-validation": "~0.1.6"
, "grunt-jekyll": "~0.4.0"
, "grunt-recess": "~0.4.0"
, "grunt-recess": "~0.5.0"
, "grunt-sed": "~0.1.1"
, "regexp-quote": "~0.0.0"
}
, "jspm": {
"main": "js/bootstrap"
, "directories": { "lib": "dist" }
, "shim": {
"js/bootstrap": {
"imports": "jquery"
, "exports": "$"
}
}
, "buildConfig": { "uglify": true }
}
}