Skip to content

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

Merge branch '2.1.2-wip' 

Conflicts:
	js/bootstrap-dropdown.js
parents 7426ced0 68cfedb3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4064 additions and 1249 deletions
.issue-guidelines.js deleted 100644 → 0
View file @ 7426ced0
/* ==========================================================
* issue-guidelines.js
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
var assert = require('assert')
module.exports = {
'pull-requests': {
'should always be made against -wip branches': function (pull) {
assert.ok(/\-wip$/.test(pull.base.ref))
},
'should always be made from feature branches': function (pull) {
assert.notEqual(pull.head.ref, 'master')
},
'should always include a unit test if changing js files': function (pull) {
var hasJS = false
var hasTests = false
pull.files.forEach(function (file) {
if (/^js\/[^./]+.js/.test(file.filename)) hasJS = true
if (/^js\/tests\/unit\/[^.]+.js/.test(file.filename)) hasTests = true
})
assert.ok(!hasJS || hasJS && hasTests)
},
'after': function (pull) {
if (pull.reporter.stats.failures) {
pull.reportFailures(pull.close.bind(pull))
}
}
},
'issues': {
'before': function (issue) {
var plus = {}
var labels = issue.labels.map(function (label) { return label.name });
if (~labels.indexOf('popular')) return
issue.comments.forEach(function (comment) {
if (/\+1/.test(comment.body)) plus[comment.user.login] = true
})
if (Object.keys(plus).length > 5) {
issue.tag('popular')
issue.comment('Tagging this issue as popular, please stop commenting on this issue with +1. thanks!')
}
},
'should include a jsfiddle/jsbin illustrating the problem if tagged with js but not a feature': function (issue) {
var labels = issue.labels.map(function (label) { return label.name });
if (~labels.indexOf('js') && !~labels.indexOf('feature')) assert.ok(/(jsfiddle|jsbin)/.test(issue.body))
},
'after': function (issue) {
if (issue.reporter.stats.failures) {
issue.reportFailures(issue.close.bind(issue))
}
}
}
}
\ No newline at end of file
CONTRIBUTING.md 0 → 100644
View file @ b5af762e
# Contributing to Bootstrap
Looking to contribute something to Bootstrap? **Here's how you can help.**
## Reporting issues
We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test cases](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
## Key branches
- `master` is the latest, deployed version.
- `gh-pages` is the hosted docs (not to be used for pull requests).
- `*-wip` is the official work in progress branch for the next release.
## Notes on the repo
As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and built via `make` before each commit and release. This was done to enable internationalization (translation) in a future release by uploading our strings to the [Twitter Translation Center](http://translate.twttr.com/). Any edits to the docs should be first done in the Mustache files and then recompiled into the HTML.
## Pull requests
- Try to submit pull requests against the latest `*-wip` branch for easier merging
- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages
- CSS changes must be done in .less files first, never just the compiled 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
## Coding standards: HTML
- Two spaces for indentation, never tabs
- Double quotes only, never single quotes
- Always use proper indentation
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
## Coding standards: CSS
- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
- Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
- End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on it's own line
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
## Coding standards: JS
- No semicolons
- Comma first
- 2 spaces (no tabs)
- strict mode
- "Attractive"
## License
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twitter/bootstrap/blob/master/LICENSE
Makefile
View file @ b5af762e
...@@ -28,7 +28,7 @@ build: ...@@ -28,7 +28,7 @@ build:
@echo "Compiling documentation... ${CHECK} Done" @echo "Compiling documentation... ${CHECK} Done"
@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js v2.1.1 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @echo "/**\n* Bootstrap.js v2.2.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
@echo "Compiling and minifying javascript... ${CHECK} Done" @echo "Compiling and minifying javascript... ${CHECK} Done"
...@@ -97,12 +97,5 @@ watch: ...@@ -97,12 +97,5 @@ watch:
echo "Watching less files..."; \ echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }" watchr -e "watch('less/.*\.less') { system 'make' }"
#
# HAUNT GITHUB ISSUES 4 FAT & MDO ONLY (O_O )
#
haunt:
@haunt .issue-guidelines.js https://github.com/twitter/bootstrap
.PHONY: docs watch gh-pages .PHONY: docs watch gh-pages
\ No newline at end of file
README.md
View file @ b5af762e
[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) [Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
================= =================
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter. Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
To get started, checkout http://getbootstrap.com! To get started, checkout http://getbootstrap.com!
...@@ -10,7 +10,7 @@ To get started, checkout http://getbootstrap.com! ...@@ -10,7 +10,7 @@ To get started, checkout http://getbootstrap.com!
Quick start Quick start
----------- -----------
Clone the repo, `git clone git://github.com/twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master). Clone the repo, `git clone git://github.com/twitter/bootstrap.git`, [download the latest release](https://github.com/twitter/bootstrap/zipball/master), or install with twitter's [Bower](http://twitter.github.com/bower): `bower install bootstrap`.
...@@ -89,7 +89,7 @@ $ npm install recess connect uglify-js jshint -g ...@@ -89,7 +89,7 @@ $ npm install recess connect uglify-js jshint -g
``` ```
+ **build** - `make` + **build** - `make`
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a> Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/extend.html#compiling">Read more in our docs &raquo;</a>
+ **test** - `make test` + **test** - `make test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed. Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
......
component.json 0 → 100644
View file @ b5af762e
{
"name": "bootstrap",
"version": "2.2.0",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": "~1.8.0"
}
}
\ No newline at end of file
docs/assets/css/bootstrap-responsive.css
View file @ b5af762e
/*! /*!
* Bootstrap Responsive v2.1.1 * Bootstrap Responsive v2.2.0
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -215,6 +215,9 @@ ...@@ -215,6 +215,9 @@
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.564102564102564%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
...@@ -562,6 +565,9 @@ ...@@ -562,6 +565,9 @@
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.7624309392265194%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
...@@ -814,6 +820,7 @@ ...@@ -814,6 +820,7 @@
margin-left: 0; margin-left: 0;
} }
[class*="span"], [class*="span"],
.uneditable-input[class*="span"],
.row-fluid [class*="span"] { .row-fluid [class*="span"] {
display: block; display: block;
float: none; float: none;
...@@ -830,6 +837,9 @@ ...@@ -830,6 +837,9 @@
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.row-fluid [class*="offset"]:first-child {
margin-left: 0;
}
.input-large, .input-large,
.input-xlarge, .input-xlarge,
.input-xxlarge, .input-xxlarge,
...@@ -862,8 +872,11 @@ ...@@ -862,8 +872,11 @@
width: auto; width: auto;
margin: 0; margin: 0;
} }
.modal.fade {
top: -100px;
}
.modal.fade.in { .modal.fade.in {
top: auto; top: 20px;
} }
} }
...@@ -895,6 +908,16 @@ ...@@ -895,6 +908,16 @@
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
} }
.media .pull-left,
.media .pull-right {
display: block;
float: none;
margin-bottom: 10px;
}
.media-object {
margin-right: 0;
margin-left: 0;
}
.modal { .modal {
top: 10px; top: 10px;
right: 10px; right: 10px;
...@@ -979,6 +1002,10 @@ ...@@ -979,6 +1002,10 @@
.nav-collapse .dropdown-menu a:hover { .nav-collapse .dropdown-menu a:hover {
background-color: #f2f2f2; background-color: #f2f2f2;
} }
.navbar-inverse .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a {
color: #999999;
}
.navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .nav > li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover { .navbar-inverse .nav-collapse .dropdown-menu a:hover {
background-color: #111111; background-color: #111111;
......
docs/assets/css/bootstrap.css
View file @ b5af762e
This diff is collapsed.
docs/assets/css/docs.css
View file @ b5af762e
...@@ -114,7 +114,7 @@ hr.soften { ...@@ -114,7 +114,7 @@ hr.soften {
.jumbotron p { .jumbotron p {
font-size: 24px; font-size: 24px;
font-weight: 300; font-weight: 300;
line-height: 30px; line-height: 1.25;
margin-bottom: 30px; margin-bottom: 30px;
} }
...@@ -133,7 +133,7 @@ hr.soften { ...@@ -133,7 +133,7 @@ hr.soften {
/* Download button */ /* Download button */
.masthead .btn { .masthead .btn {
padding: 14px 24px; padding: 19px 24px;
font-size: 24px; font-size: 24px;
font-weight: 200; font-weight: 200;
color: #fff; /* redeclare to override the `.jumbotron a` */ color: #fff; /* redeclare to override the `.jumbotron a` */
...@@ -275,7 +275,7 @@ hr.soften { ...@@ -275,7 +275,7 @@ hr.soften {
margin-bottom: 40px; margin-bottom: 40px;
font-size: 20px; font-size: 20px;
font-weight: 300; font-weight: 300;
line-height: 25px; line-height: 1.25;
color: #999; color: #999;
} }
.marketing img { .marketing img {
...@@ -303,7 +303,10 @@ hr.soften { ...@@ -303,7 +303,10 @@ hr.soften {
} }
.footer-links li { .footer-links li {
display: inline; display: inline;
margin-right: 10px; padding: 0 2px;
}
.footer-links li:first-child {
padding-left: 0;
} }
...@@ -754,7 +757,7 @@ form.bs-docs-example { ...@@ -754,7 +757,7 @@ form.bs-docs-example {
} }
.bs-docs-sidenav > li > a { .bs-docs-sidenav > li > a {
display: block; display: block;
*width: 190px; width: 190px \9;
margin: 0 0 -1px; margin: 0 0 -1px;
padding: 8px 14px; padding: 8px 14px;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
...@@ -821,6 +824,9 @@ form.bs-docs-example { ...@@ -821,6 +824,9 @@ form.bs-docs-example {
.bs-docs-sidenav { .bs-docs-sidenav {
width: 258px; width: 258px;
} }
.bs-docs-sidenav > li > a {
width: 230px \9; /* Override the previous IE8-9 hack */
}
} }
/* Desktop /* Desktop
...@@ -941,11 +947,11 @@ form.bs-docs-example { ...@@ -941,11 +947,11 @@ form.bs-docs-example {
/* Downsize the jumbotrons */ /* Downsize the jumbotrons */
.jumbotron h1 { .jumbotron h1 {
font-size: 60px; font-size: 45px;
} }
.jumbotron p, .jumbotron p,
.jumbotron .btn { .jumbotron .btn {
font-size: 20px; font-size: 18px;
} }
.jumbotron .btn { .jumbotron .btn {
display: block; display: block;
...@@ -960,7 +966,10 @@ form.bs-docs-example { ...@@ -960,7 +966,10 @@ form.bs-docs-example {
/* Marketing on home */ /* Marketing on home */
.marketing h1 { .marketing h1 {
font-size: 40px; font-size: 30px;
}
.marketing-byline {
font-size: 18px;
} }
/* center example sites */ /* center example sites */
...@@ -994,6 +1003,11 @@ form.bs-docs-example { ...@@ -994,6 +1003,11 @@ form.bs-docs-example {
left: auto; left: auto;
} }
/* Tighten up footer */
.footer {
padding-top: 20px;
padding-bottom: 20px;
}
/* Unfloat the back to top in footer to prevent odd text wrapping */ /* Unfloat the back to top in footer to prevent odd text wrapping */
.footer .pull-right { .footer .pull-right {
float: none; float: none;
......
docs/assets/js/bootstrap-affix.js
View file @ b5af762e
/* ========================================================== /* ==========================================================
* bootstrap-affix.js v2.1.1 * bootstrap-affix.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#affix * http://twitter.github.com/bootstrap/javascript.html#affix
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
var Affix = function (element, options) { var Affix = function (element, options) {
this.options = $.extend({}, $.fn.affix.defaults, options) this.options = $.extend({}, $.fn.affix.defaults, options)
this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) this.$window = $(window)
.on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
.on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
this.$element = $(element) this.$element = $(element)
this.checkPosition() this.checkPosition()
} }
......
docs/assets/js/bootstrap-alert.js
View file @ b5af762e
/* ========================================================== /* ==========================================================
* bootstrap-alert.js v2.1.1 * bootstrap-alert.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#alerts
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -83,8 +83,6 @@ ...@@ -83,8 +83,6 @@
/* ALERT DATA-API /* ALERT DATA-API
* ============== */ * ============== */
$(function () { $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-button.js
View file @ b5af762e
/* ============================================================ /* ============================================================
* bootstrap-button.js v2.1.1 * bootstrap-button.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -85,12 +85,10 @@ ...@@ -85,12 +85,10 @@
/* BUTTON DATA-API /* BUTTON DATA-API
* =============== */ * =============== */
$(function () { $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
var $btn = $(e.target) var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle') $btn.button('toggle')
}) })
})
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-carousel.js
View file @ b5af762e
/* ========================================================== /* ==========================================================
* bootstrap-carousel.js v2.1.1 * bootstrap-carousel.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#carousel * http://twitter.github.com/bootstrap/javascript.html#carousel
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -94,9 +94,7 @@ ...@@ -94,9 +94,7 @@
, direction = type == 'next' ? 'left' : 'right' , direction = type == 'next' ? 'left' : 'right'
, fallback = type == 'next' ? 'first' : 'last' , fallback = type == 'next' ? 'first' : 'last'
, that = this , that = this
, e = $.Event('slide', { , e
relatedTarget: $next[0]
})
this.sliding = true this.sliding = true
...@@ -104,6 +102,10 @@ ...@@ -104,6 +102,10 @@
$next = $next.length ? $next : this.$element.find('.item')[fallback]() $next = $next.length ? $next : this.$element.find('.item')[fallback]()
e = $.Event('slide', {
relatedTarget: $next[0]
})
if ($next.hasClass('active')) return if ($next.hasClass('active')) return
if ($.support.transition && this.$element.hasClass('slide')) { if ($.support.transition && this.$element.hasClass('slide')) {
...@@ -163,14 +165,12 @@ ...@@ -163,14 +165,12 @@
/* CAROUSEL DATA-API /* CAROUSEL DATA-API
* ================= */ * ================= */
$(function () { $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
$('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
var $this = $(this), href var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) , options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
$target.carousel(options) $target.carousel(options)
e.preventDefault() e.preventDefault()
}) })
})
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-collapse.js
View file @ b5af762e
/* ============================================================= /* =============================================================
* bootstrap-collapse.js v2.1.1 * bootstrap-collapse.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#collapse * http://twitter.github.com/bootstrap/javascript.html#collapse
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -143,8 +143,7 @@ ...@@ -143,8 +143,7 @@
/* COLLAPSIBLE DATA-API /* COLLAPSIBLE DATA-API
* ==================== */ * ==================== */
$(function () { $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
var $this = $(this), href var $this = $(this), href
, target = $this.attr('data-target') , target = $this.attr('data-target')
|| e.preventDefault() || e.preventDefault()
...@@ -153,6 +152,5 @@ ...@@ -153,6 +152,5 @@
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
$(target).collapse(option) $(target).collapse(option)
}) })
})
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-dropdown.js
View file @ b5af762e
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js v2.1.1 * bootstrap-dropdown.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -100,8 +100,9 @@ ...@@ -100,8 +100,9 @@
} }
function clearMenus() { function clearMenus() {
getParent($(toggle)) $(toggle).each(function () {
.removeClass('open') getParent($(this)).removeClass("open")
})
} }
function getParent($this) { function getParent($this) {
...@@ -138,13 +139,10 @@ ...@@ -138,13 +139,10 @@
/* APPLY TO STANDARD DROPDOWN ELEMENTS /* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */ * =================================== */
$(function () { $(document)
$('html')
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
$('body')
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
})
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-modal.js
View file @ b5af762e
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.1.1 * bootstrap-modal.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#modals * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -49,8 +49,6 @@ ...@@ -49,8 +49,6 @@
if (this.isShown || e.isDefaultPrevented()) return if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true this.isShown = true
this.escape() this.escape()
...@@ -72,13 +70,12 @@ ...@@ -72,13 +70,12 @@
that.$element that.$element
.addClass('in') .addClass('in')
.attr('aria-hidden', false) .attr('aria-hidden', false)
.focus()
that.enforceFocus() that.enforceFocus()
transition ? transition ?
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
that.$element.trigger('shown') that.$element.focus().trigger('shown')
}) })
} }
...@@ -96,8 +93,6 @@ ...@@ -96,8 +93,6 @@
this.isShown = false this.isShown = false
$('body').removeClass('modal-open')
this.escape() this.escape()
$(document).off('focusin.modal') $(document).off('focusin.modal')
...@@ -167,9 +162,11 @@ ...@@ -167,9 +162,11 @@
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />') this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body) .appendTo(document.body)
if (this.options.backdrop != 'static') { this.$backdrop.click(
this.$backdrop.click($.proxy(this.hide, this)) this.options.backdrop == 'static' ?
} $.proxy(this.$element[0].focus, this.$element[0])
: $.proxy(this.hide, this)
)
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
...@@ -219,12 +216,11 @@ ...@@ -219,12 +216,11 @@
/* MODAL DATA-API /* MODAL DATA-API
* ============== */ * ============== */
$(function () { $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
$('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
var $this = $(this) var $this = $(this)
, href = $this.attr('href') , href = $this.attr('href')
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
, option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
e.preventDefault() e.preventDefault()
...@@ -234,6 +230,5 @@ ...@@ -234,6 +230,5 @@
$this.focus() $this.focus()
}) })
}) })
})
}(window.jQuery); }(window.jQuery);
docs/assets/js/bootstrap-popover.js
View file @ b5af762e
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.1.1 * bootstrap-popover.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
......
docs/assets/js/bootstrap-scrollspy.js
View file @ b5af762e
/* ============================================================= /* =============================================================
* bootstrap-scrollspy.js v2.1.1 * bootstrap-scrollspy.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://twitter.github.com/bootstrap/javascript.html#scrollspy
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
......
docs/assets/js/bootstrap-tab.js
View file @ b5af762e
/* ======================================================== /* ========================================================
* bootstrap-tab.js v2.1.1 * bootstrap-tab.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
if ( $this.parent('li').hasClass('active') ) return if ( $this.parent('li').hasClass('active') ) return
previous = $ul.find('.active a').last()[0] previous = $ul.find('.active:last a')[0]
e = $.Event('show', { e = $.Event('show', {
relatedTarget: previous relatedTarget: previous
...@@ -125,11 +125,9 @@ ...@@ -125,11 +125,9 @@
/* TAB DATA-API /* TAB DATA-API
* ============ */ * ============ */
$(function () { $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
$('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
e.preventDefault() e.preventDefault()
$(this).tab('show') $(this).tab('show')
}) })
})
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-tooltip.js
View file @ b5af762e
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.1.1 * bootstrap-tooltip.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ===========================================================
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
inside = /in/.test(placement) inside = /in/.test(placement)
$tip $tip
.remove() .detach()
.css({ top: 0, left: 0, display: 'block' }) .css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body) .insertAfter(this.$element)
pos = this.getPosition(inside) pos = this.getPosition(inside)
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
} }
$tip $tip
.css(tp) .offset(tp)
.addClass(placement) .addClass(placement)
.addClass('in') .addClass('in')
} }
...@@ -166,18 +166,18 @@ ...@@ -166,18 +166,18 @@
function removeWithAnimation() { function removeWithAnimation() {
var timeout = setTimeout(function () { var timeout = setTimeout(function () {
$tip.off($.support.transition.end).remove() $tip.off($.support.transition.end).detach()
}, 500) }, 500)
$tip.one($.support.transition.end, function () { $tip.one($.support.transition.end, function () {
clearTimeout(timeout) clearTimeout(timeout)
$tip.remove() $tip.detach()
}) })
} }
$.support.transition && this.$tip.hasClass('fade') ? $.support.transition && this.$tip.hasClass('fade') ?
removeWithAnimation() : removeWithAnimation() :
$tip.remove() $tip.detach()
return this return this
} }
...@@ -235,8 +235,9 @@ ...@@ -235,8 +235,9 @@
this.enabled = !this.enabled this.enabled = !this.enabled
} }
, toggle: function () { , toggle: function (e) {
this[this.tip().hasClass('in') ? 'hide' : 'show']() var self = $(e.currentTarget)[this.type](this._options).data(this.type)
self[self.tip().hasClass('in') ? 'hide' : 'show']()
} }
, destroy: function () { , destroy: function () {
...@@ -269,7 +270,7 @@ ...@@ -269,7 +270,7 @@
, trigger: 'hover' , trigger: 'hover'
, title: '' , title: ''
, delay: 0 , delay: 0
, html: true , html: false
} }
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
docs/assets/js/bootstrap-transition.js
View file @ b5af762e
/* =================================================== /* ===================================================
* bootstrap-transition.js v2.1.1 * bootstrap-transition.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
!function ($) { !function ($) {
$(function () {
"use strict"; // jshint ;_; "use strict"; // jshint ;_;
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/) /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */ * ======================================================= */
$(function () {
$.support.transition = (function () { $.support.transition = (function () {
var transitionEnd = (function () { var transitionEnd = (function () {
......
docs/assets/js/bootstrap-typeahead.js
View file @ b5af762e
/* ============================================================= /* =============================================================
* bootstrap-typeahead.js v2.1.1 * bootstrap-typeahead.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#typeahead * http://twitter.github.com/bootstrap/javascript.html#typeahead
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
.on('keypress', $.proxy(this.keypress, this)) .on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this)) .on('keyup', $.proxy(this.keyup, this))
if ($.browser.chrome || $.browser.webkit || $.browser.msie) { if (this.eventSupported('keydown')) {
this.$element.on('keydown', $.proxy(this.keydown, this)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
...@@ -183,6 +183,15 @@ ...@@ -183,6 +183,15 @@
.on('mouseenter', 'li', $.proxy(this.mouseenter, this)) .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
} }
, eventSupported: function(eventName) {
var isSupported = eventName in this.$element
if (!isSupported) {
this.$element.setAttribute(eventName, 'return;')
isSupported = typeof this.$element[eventName] === 'function'
}
return isSupported
}
, move: function (e) { , move: function (e) {
if (!this.shown) return if (!this.shown) return
...@@ -221,6 +230,9 @@ ...@@ -221,6 +230,9 @@
switch(e.keyCode) { switch(e.keyCode) {
case 40: // down arrow case 40: // down arrow
case 38: // up arrow case 38: // up arrow
case 16: // shift
case 17: // ctrl
case 18: // alt
break break
case 9: // tab case 9: // tab
...@@ -288,13 +300,11 @@ ...@@ -288,13 +300,11 @@
/* TYPEAHEAD DATA-API /* TYPEAHEAD DATA-API
* ================== */ * ================== */
$(function () { $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
$('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
var $this = $(this) var $this = $(this)
if ($this.data('typeahead')) return if ($this.data('typeahead')) return
e.preventDefault() e.preventDefault()
$this.typeahead($this.data()) $this.typeahead($this.data())
}) })
})
}(window.jQuery); }(window.jQuery);
docs/assets/js/bootstrap.js
View file @ b5af762e
This diff is collapsed.
docs/assets/js/bootstrap.min.js
View file @ b5af762e
This diff is collapsed.
docs/assets/js/jquery.js
View file @ b5af762e
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/base-css.html
View file @ b5af762e
This diff is collapsed.
docs/build/index.js
View file @ b5af762e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
var hogan = require('hogan.js') var hogan = require('hogan.js')
, fs = require('fs') , fs = require('fs')
, prod = process.argv[2] == 'production' , prod = process.argv[2] == 'production'
, title = 'Twitter Bootstrap' , title = 'Bootstrap'
var layout, pages var layout, pages
......
docs/components.html
View file @ b5af762e
This diff is collapsed.
docs/customize.html
View file @ b5af762e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Customize · Twitter Bootstrap</title> <title>Customize · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./javascript.html">Javascript</a> <a href="./javascript.html">JavaScript</a>
</li> </li>
<li class="active"> <li class="active">
<a href="./customize.html">Customize</a> <a href="./customize.html">Customize</a>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<div class="container"> <div class="container">
<h1>Customize and download</h1> <h1>Customize and download</h1>
<p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, javascript plugins, and more.</p> <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.</p>
</div> </div>
</header> </header>
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label> <label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label> <label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label> <label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media component</label>
<h3>JS Components</h3> <h3>JS Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label> <label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
...@@ -143,6 +144,7 @@ ...@@ -143,6 +144,7 @@
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Miscellaneous</h3> <h3>Miscellaneous</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media object</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label> <label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label> <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
...@@ -297,12 +299,14 @@ ...@@ -297,12 +299,14 @@
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif"> <input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label> <label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace"> <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label> <label>@baseFontSize</label>
<input type="text" class="span3" placeholder="14px"> <input type="text" class="span3" placeholder="14px">
<label>@baseFontFamily</label> <label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="@sansFontFamily"> <input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label> <label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="20px"> <input type="text" class="span3" placeholder="20px">
<label>@altFontFamily</label> <label>@altFontFamily</label>
<input type="text" class="span3" placeholder="@serifFontFamily"> <input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label> <label>@headingsFontFamily</label>
...@@ -311,6 +315,28 @@ ...@@ -311,6 +315,28 @@
<input type="text" class="span3" placeholder="bold"> <input type="text" class="span3" placeholder="bold">
<label>@headingsColor</label> <label>@headingsColor</label>
<input type="text" class="span3" placeholder="inherit"> <input type="text" class="span3" placeholder="inherit">
<label>@fontSizeLarge</label>
<input type="text" class="span3" placeholder="@baseFontSize * 1.25">
<label>@fontSizeSmall</label>
<input type="text" class="span3" placeholder="@baseFontSize * 0.85">
<label>@fontSizeMini</label>
<input type="text" class="span3" placeholder="@baseFontSize * 0.75">
<label>@paddingLarge</label>
<input type="text" class="span3" placeholder="11px 19px">
<label>@paddingSmall</label>
<input type="text" class="span3" placeholder="2px 10px">
<label>@paddingMini</label>
<input type="text" class="span3" placeholder="1px 6px">
<label>@baseBorderRadius</label>
<input type="text" class="span3" placeholder="4px">
<label>@borderRadiusLarge</label>
<input type="text" class="span3" placeholder="6px">
<label>@borderRadiusSmall</label>
<input type="text" class="span3" placeholder="3px">
<label>@heroUnitBackground</label> <label>@heroUnitBackground</label>
<input type="text" class="span3" placeholder="@grayLighter"> <input type="text" class="span3" placeholder="@grayLighter">
<label>@heroUnitHeadingColor</label> <label>@heroUnitHeadingColor</label>
...@@ -397,6 +423,11 @@ ...@@ -397,6 +423,11 @@
<label>@navbarSearchPlaceholderColor</label> <label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@navbarCollapseWidth</label>
<input type="text" class="span3" placeholder="979px">
<label>@navbarCollapseDesktopWidth</label>
<input type="text" class="span3" placeholder="@navbarCollapseWidth + 1">
<h3>Dropdowns</h3> <h3>Dropdowns</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="@white">
...@@ -440,12 +471,14 @@ ...@@ -440,12 +471,14 @@
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-right"><a href="#">Back to top</a></p> <p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links"> <ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">Read the blog</a></li> <li><a href="http://blog.getbootstrap.com">Blog</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> <li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
</ul> </ul>
</div> </div>
......
docs/examples/carousel.html 0 → 100644
View file @ b5af762e
This diff is collapsed.
docs/examples/fluid.html
View file @ b5af762e
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
</style> </style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<!-- Le fav and touch icons --> <!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico"> <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
......
docs/examples/hero.html
View file @ b5af762e
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
</style> </style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<!-- Le fav and touch icons --> <!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico"> <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
......
docs/examples/marketing-alternate.html 0 → 100644
View file @ b5af762e
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Template &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 20px;
padding-bottom: 60px;
}
/* Custom container */
.container {
margin: 0 auto;
max-width: 1000px;
}
.container > hr {
margin: 60px 0;
}
/* Main marketing message and sign up button */
.jumbotron {
margin: 80px 0;
text-align: center;
}
.jumbotron h1 {
font-size: 100px;
line-height: 1;
}
.jumbotron .lead {
font-size: 24px;
line-height: 1.25;
}
.jumbotron .btn {
font-size: 21px;
padding: 14px 24px;
}
/* Supporting marketing content */
.marketing {
margin: 60px 0;
}
.marketing p + h4 {
margin-top: 28px;
}
/* Customize the navbar links to be fill the entire space of the .navbar */
.navbar .navbar-inner {
padding: 0;
}
.navbar .nav {
margin: 0;
}
.navbar .nav li {
display: table-cell;
width: 1%;
float: none;
}
.navbar .nav li a {
font-weight: bold;
text-align: center;
border-left: 1px solid rgba(255,255,255,.75);
border-right: 1px solid rgba(0,0,0,.1);
}
.navbar .nav li:first-child a {
border-left: 0;
border-radius: 3px 0 0 3px;
}
.navbar .nav li:last-child a {
border-right: 0;
border-radius: 0 3px 3px 0;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
<div class="container">
<div class="masthead">
<h3 class="muted">Project name</h3>
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Projects</a></li>
<li><a href="#">Services</a></li>
<li><a href="#">Downloads</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
</ul>
</div>
</div>
</div><!-- /.navbar -->
</div>
<!-- Jumbotron -->
<div class="jumbotron">
<h1>Marketing stuff!</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<a class="btn btn-large btn-success" href="#">Get started today</a>
</div>
<hr>
<!-- Example row of columns -->
<div class="row-fluid">
<div class="span4">
<h2>Heading</h2>
<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" href="#">View details &raquo;</a></p>
</div>
<div class="span4">
<h2>Heading</h2>
<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" href="#">View details &raquo;</a></p>
</div>
<div class="span4">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
</div>
<hr>
<div class="footer">
<p>&copy; Company 2012</p>
</div>
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
docs/examples/marketing-narrow.html 0 → 100644
View file @ b5af762e
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Template &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 20px;
padding-bottom: 40px;
}
/* Custom container */
.container-narrow {
margin: 0 auto;
max-width: 700px;
}
.container-narrow > hr {
margin: 30px 0;
}
/* Main marketing message and sign up button */
.jumbotron {
margin: 60px 0;
text-align: center;
}
.jumbotron h1 {
font-size: 72px;
line-height: 1;
}
.jumbotron .btn {
font-size: 21px;
padding: 14px 24px;
}
/* Supporting marketing content */
.marketing {
margin: 60px 0;
}
.marketing p + h4 {
margin-top: 28px;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
<div class="container-narrow">
<div class="masthead">
<ul class="nav nav-pills pull-right">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
</ul>
<h3 class="muted">Project name</h3>
</div>
<hr>
<div class="jumbotron">
<h1>Super awesome marketing speak!</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<a class="btn btn-large btn-success" href="#">Sign up today</a>
</div>
<hr>
<div class="row-fluid marketing">
<div class="span6">
<h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
<h4>Subheading</h4>
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
<h4>Subheading</h4>
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
</div>
<div class="span6">
<h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
<h4>Subheading</h4>
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
<h4>Subheading</h4>
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
</div>
</div>
<hr>
<div class="footer">
<p>&copy; Company 2012</p>
</div>
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
docs/examples/signin.html 0 → 100644
View file @ b5af762e
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Sign in &middot; Twitter Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
}
.form-signin {
max-width: 300px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
background-color: #fff;
border: 1px solid #e5e5e5;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin input[type="text"],
.form-signin input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
padding: 7px 9px;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
<div class="container">
<form class="form-signin">
<h2 class="form-signin-heading">Please sign in</h2>
<input type="text" class="input-block-level" placeholder="Email address">
<input type="password" class="input-block-level" placeholder="Password">
<label class="checkbox">
<input type="checkbox" value="remember-me"> Remember me
</label>
<button class="btn btn-large btn-primary" type="submit">Sign in</button>
</form>
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
docs/examples/starter-template.html
View file @ b5af762e
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</style> </style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<!-- Le fav and touch icons --> <!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico"> <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
......
docs/examples/sticky-footer.html 0 → 100644
View file @ b5af762e
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Sticky footer &middot; Twitter Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- CSS -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
/* Sticky footer styles
-------------------------------------------------- */
html,
body {
height: 100%;
/* The html and body elements cannot have any padding or margin. */
}
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
height: auto !important;
height: 100%;
/* Negative indent footer by it's height */
margin: 0 auto -60px;
}
/* Set the fixed height of the footer here */
#push,
#footer {
height: 60px;
}
#footer {
background-color: #f5f5f5;
}
/* Lastly, apply responsive CSS fixes as necessary */
@media (max-width: 767px) {
#footer {
margin-left: -20px;
margin-right: -20px;
padding-left: 20px;
padding-right: 20px;
}
}
/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */
.container {
width: auto;
max-width: 680px;
}
.container .credit {
margin: 20px 0;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
<!-- Part 1: Wrap all page content here -->
<div id="wrap">
<!-- Begin page content -->
<div class="container">
<div class="page-header">
<h1>Sticky footer</h1>
</div>
<p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p>
</div>
<div id="push"></div>
</div>
<div id="footer">
<div class="container">
<p class="muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
</div>
</div>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
docs/extend.html
View file @ b5af762e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Extend · Twitter Bootstrap</title> <title>Extend · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./javascript.html">Javascript</a> <a href="./javascript.html">JavaScript</a>
</li> </li>
<li class=""> <li class="">
<a href="./customize.html">Customize</a> <a href="./customize.html">Customize</a>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<pre>$ lessc ./less/bootstrap.less > bootstrap.css</pre> <pre>$ lessc ./less/bootstrap.less > bootstrap.css</pre>
<p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p> <p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
<h3>Javascript</h3> <h3>JavaScript</h3>
<p><a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.</p> <p><a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.</p>
<pre class="prettyprint"> <pre class="prettyprint">
&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; &lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
...@@ -180,18 +180,18 @@ ...@@ -180,18 +180,18 @@
<h3>Setup file structure</h3> <h3>Setup file structure</h3>
<p>Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:</p> <p>Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:</p>
<pre class="prettyprint"> <pre>
app/ <span class="icon-folder-open"></span> app/
├── layouts/ <span class="icon-folder-open"></span> layouts/
└── templates/ <span class="icon-folder-open"></span> templates/
public/ <span class="icon-folder-open"></span> public/
├── css/ <span class="icon-folder-open"></span> css/
│ ├── bootstrap.min.css <span class="icon-file"></span> bootstrap.min.css
├── js/ <span class="icon-folder-open"></span> js/
│ ├── bootstrap.min.js <span class="icon-file"></span> bootstrap.min.js
└── img/ <span class="icon-folder-open"></span> img/
├── glyphicons-halflings.png <span class="icon-file"></span> glyphicons-halflings.png
└── glyphicons-halflings-white.png <span class="icon-file"></span> glyphicons-halflings-white.png
</pre> </pre>
<h3>Utilize starter template</h3> <h3>Utilize starter template</h3>
...@@ -246,12 +246,14 @@ ...@@ -246,12 +246,14 @@
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-right"><a href="#">Back to top</a></p> <p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links"> <ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">Read the blog</a></li> <li><a href="http://blog.getbootstrap.com">Blog</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> <li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
</ul> </ul>
</div> </div>
......
docs/getting-started.html
View file @ b5af762e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Getting · Twitter Bootstrap</title> <title>Getting · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./javascript.html">Javascript</a> <a href="./javascript.html">JavaScript</a>
</li> </li>
<li class=""> <li class="">
<a href="./customize.html">Customize</a> <a href="./customize.html">Customize</a>
...@@ -138,10 +138,9 @@ ...@@ -138,10 +138,9 @@
├── js/ ├── js/
│ ├── bootstrap.js │ ├── bootstrap.js
│ ├── bootstrap.min.js │ ├── bootstrap.min.js
├── img/ └── img/
│ ├── glyphicons-halflings.png ├── glyphicons-halflings.png
│ ├── glyphicons-halflings-white.png └── glyphicons-halflings-white.png
└── README.md
</pre> </pre>
<p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.</p> <p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.</p>
<p>Please note that all JavaScript plugins require jQuery to be included.</p> <p>Please note that all JavaScript plugins require jQuery to be included.</p>
...@@ -164,11 +163,11 @@ ...@@ -164,11 +163,11 @@
<p>Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes <a href="http://glyphicons.com">Glyphicons</a>, a great little icon set.</p> <p>Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes <a href="http://glyphicons.com">Glyphicons</a>, a great little icon set.</p>
<h4><a href="http://twitter.github.com/bootstrap/components.html">Components</a></h4> <h4><a href="http://twitter.github.com/bootstrap/components.html">Components</a></h4>
<p>Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.</p> <p>Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.</p>
<h4><a href="http://twitter.github.com/bootstrap/javascript.html">Javascript plugins</a></h4> <h4><a href="http://twitter.github.com/bootstrap/javascript.html">JavaScript plugins</a></h4>
<p>Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.</p> <p>Similar to Components, these JavaScript plugins are interactive components for things like tooltips, popovers, modals, and more.</p>
<h2>List of components</h2> <h2>List of components</h2>
<p>Together, the <strong>Components</strong> and <strong>Javascript plugins</strong> sections provide the following interface elements:</p> <p>Together, the <strong>Components</strong> and <strong>JavaScript plugins</strong> sections provide the following interface elements:</p>
<ul> <ul>
<li>Button groups</li> <li>Button groups</li>
<li>Button dropdowns</li> <li>Button dropdowns</li>
...@@ -199,7 +198,7 @@ ...@@ -199,7 +198,7 @@
<div class="page-header"> <div class="page-header">
<h1>4. Basic HTML template</h1> <h1>4. Basic HTML template</h1>
</div> </div>
<p class="lead">With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p> <p class="lead">With a brief intro into the contents out of the way, we can focus on putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p>
<p>Now, here's a look at a <strong>typical HTML file</strong>:</p> <p>Now, here's a look at a <strong>typical HTML file</strong>:</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;!DOCTYPE html&gt; &lt;!DOCTYPE html&gt;
...@@ -220,7 +219,7 @@ ...@@ -220,7 +219,7 @@
&lt;head&gt; &lt;head&gt;
&lt;title&gt;Bootstrap 101 Template&lt;/title&gt; &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
&lt;!-- Bootstrap --&gt; &lt;!-- Bootstrap --&gt;
&lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt; &lt;link href="css/bootstrap.min.css" rel="stylesheet" media="screen"&gt;
&lt;/head&gt; &lt;/head&gt;
&lt;body&gt; &lt;body&gt;
&lt;h1&gt;Hello, world!&lt;/h1&gt; &lt;h1&gt;Hello, world!&lt;/h1&gt;
...@@ -242,6 +241,13 @@ ...@@ -242,6 +241,13 @@
</div> </div>
<p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p> <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
<ul class="thumbnails bootstrap-examples"> <ul class="thumbnails bootstrap-examples">
<li class="span3">
<a class="thumbnail" href="examples/starter-template.html">
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
</a>
<h4>Starter template</h4>
<p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
</li>
<li class="span3"> <li class="span3">
<a class="thumbnail" href="examples/hero.html"> <a class="thumbnail" href="examples/hero.html">
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt=""> <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
...@@ -256,12 +262,35 @@ ...@@ -256,12 +262,35 @@
<h4>Fluid layout</h4> <h4>Fluid layout</h4>
<p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p> <p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
</li> </li>
<li class="span3"> <li class="span3">
<a class="thumbnail" href="examples/starter-template.html"> <a class="thumbnail" href="examples/marketing-narrow.html">
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt=""> <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
</a> </a>
<h4>Starter template</h4> <h4>Narrow marketing</h4>
<p>A barebones HTML document with all the Bootstrap CSS and javascript included.</p> <p>Slim, lightweight marketing template for small projects or teams.</p>
</li>
<li class="span3">
<a class="thumbnail" href="examples/signin.html">
<img src="assets/img/examples/bootstrap-example-signin.png" alt="">
</a>
<h4>Sign in</h4>
<p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
</li>
<li class="span3">
<a class="thumbnail" href="examples/sticky-footer.html">
<img src="assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
</a>
<h4>Sticky footer</h4>
<p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
</li>
<li class="span3">
<a class="thumbnail" href="examples/carousel.html">
<img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
</a>
<h4>Carousel jumbotron</h4>
<p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p>
</li> </li>
</ul> </ul>
</section> </section>
...@@ -295,12 +324,14 @@ ...@@ -295,12 +324,14 @@
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-right"><a href="#">Back to top</a></p> <p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links"> <ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">Read the blog</a></li> <li><a href="http://blog.getbootstrap.com">Blog</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> <li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
</ul> </ul>
</div> </div>
......
docs/index.html
View file @ b5af762e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Twitter Bootstrap</title> <title>Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./javascript.html">Javascript</a> <a href="./javascript.html">JavaScript</a>
</li> </li>
<li class=""> <li class="">
<a href="./customize.html">Customize</a> <a href="./customize.html">Customize</a>
...@@ -73,11 +73,22 @@ ...@@ -73,11 +73,22 @@
<div class="container"> <div class="container">
<h1>Bootstrap</h1> <h1>Bootstrap</h1>
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p> <p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
<p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a></p> <p>
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a>
</p>
<ul class="masthead-links"> <ul class="masthead-links">
<li><a href="http://github.com/twitter/bootstrap" >GitHub project</a></li> <li>
<li><a href="./extend.html" >Extend</a></li> <a href="http://github.com/twitter/bootstrap" >GitHub project</a>
<li>Version 2.1.1</li> </li>
<li>
<a href="./getting-started.html#examples" >Examples</a>
</li>
<li>
<a href="./extend.html" >Extend</a>
</li>
<li>
Version 2.2.0
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -122,7 +133,7 @@ ...@@ -122,7 +133,7 @@
<div class="span4"> <div class="span4">
<img src="assets/img/bs-docs-bootstrap-features.png"> <img src="assets/img/bs-docs-bootstrap-features.png">
<h2>Packed with features.</h2> <h2>Packed with features.</h2>
<p>A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">javascript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p> <p>A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p>
</div> </div>
</div> </div>
...@@ -143,8 +154,8 @@ ...@@ -143,8 +154,8 @@
</a> </a>
</li> </li>
<li class="span3"> <li class="span3">
<a class="thumbnail" href="http://www.fleetio.com/" target="_blank"> <a class="thumbnail" href="http://www.gathercontent.com/" target="_blank">
<img src="assets/img/example-sites/fleetio.png" alt="Fleetio"> <img src="assets/img/example-sites/gathercontent.png" alt="Gather Content">
</a> </a>
</li> </li>
<li class="span3"> <li class="span3">
...@@ -166,12 +177,14 @@ ...@@ -166,12 +177,14 @@
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-right"><a href="#">Back to top</a></p> <p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links"> <ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">Read the blog</a></li> <li><a href="http://blog.getbootstrap.com">Blog</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> <li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
</ul> </ul>
</div> </div>
......
docs/javascript.html
View file @ b5af762e
This diff is collapsed.
docs/scaffolding.html
View file @ b5af762e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Scaffolding · Twitter Bootstrap</title> <title>Scaffolding · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./javascript.html">Javascript</a> <a href="./javascript.html">JavaScript</a>
</li> </li>
<li class=""> <li class="">
<a href="./customize.html">Customize</a> <a href="./customize.html">Customize</a>
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.</p> <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.</p>
<div class="row show-grid"> <div class="row show-grid">
<div class="span9"> <div class="span9">
Level 1 of column Level 1 column
<div class="row show-grid"> <div class="row show-grid">
<div class="span6"> <div class="span6">
Level 2 Level 2
...@@ -318,10 +318,10 @@ ...@@ -318,10 +318,10 @@
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row-fluid"&gt; &lt;div class="row-fluid"&gt;
&lt;div class="span12"&gt; &lt;div class="span12"&gt;
Level 1 of column Fluid 12
&lt;div class="row-fluid"&gt; &lt;div class="row-fluid"&gt;
&lt;div class="span6"&gt;Level 2&lt;/div&gt; &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
&lt;div class="span6"&gt;Level 2&lt;/div&gt; &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
...@@ -509,7 +509,7 @@ ...@@ -509,7 +509,7 @@
</table> </table>
<h3>When to use</h3> <h3>When to use</h3>
<p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.</p> <p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.</p>
<h3>Responsive utilities test case</h3> <h3>Responsive utilities test case</h3>
<p>Resize your browser or load on different devices to test the above classes.</p> <p>Resize your browser or load on different devices to test the above classes.</p>
...@@ -544,12 +544,14 @@ ...@@ -544,12 +544,14 @@
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-right"><a href="#">Back to top</a></p> <p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links"> <ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">Read the blog</a></li> <li><a href="http://blog.getbootstrap.com">Blog</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> <li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
</ul> </ul>
</div> </div>
......
docs/templates/layout.mustache
View file @ b5af762e
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<a href="./components.html">{{_i}}Components{{/i}}</a> <a href="./components.html">{{_i}}Components{{/i}}</a>
</li> </li>
<li class="{{javascript}}"> <li class="{{javascript}}">
<a href="./javascript.html">{{_i}}Javascript{{/i}}</a> <a href="./javascript.html">{{_i}}JavaScript{{/i}}</a>
</li> </li>
<li class="{{customize}}"> <li class="{{customize}}">
<a href="./customize.html">{{_i}}Customize{{/i}}</a> <a href="./customize.html">{{_i}}Customize{{/i}}</a>
...@@ -90,12 +90,14 @@ ...@@ -90,12 +90,14 @@
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p> <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
<p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p> <p>{{_i}}Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p>
<p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p> <p>{{_i}}Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
<p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p> <p>{{_i}}<a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
<ul class="footer-links"> <ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">{{_i}}Read the blog{{/i}}</a></li> <li><a href="http://blog.getbootstrap.com">{{_i}}Blog{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Submit issues{{/i}}</a></li> <li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li> <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li>
</ul> </ul>
</div> </div>
......
docs/templates/pages/base-css.mustache
View file @ b5af762e
This diff is collapsed.
docs/templates/pages/components.mustache
View file @ b5af762e
This diff is collapsed.
docs/templates/pages/customize.mustache
View file @ b5af762e
This diff is collapsed.
docs/templates/pages/extend.mustache
View file @ b5af762e
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<pre>$ lessc ./less/bootstrap.less > bootstrap.css</pre> <pre>$ lessc ./less/bootstrap.less > bootstrap.css</pre>
<p>{{_i}}Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!{{/i}}</p> <p>{{_i}}Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!{{/i}}</p>
<h3>{{_i}}Javascript{{/i}}</h3> <h3>{{_i}}JavaScript{{/i}}</h3>
<p>{{_i}}<a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.{{/i}}</p> <p>{{_i}}<a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code>&lt;head&gt;</code>.{{/i}}</p>
<pre class="prettyprint"> <pre class="prettyprint">
&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; &lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
...@@ -109,18 +109,18 @@ ...@@ -109,18 +109,18 @@
<h3>{{_i}}Setup file structure{{/i}}</h3> <h3>{{_i}}Setup file structure{{/i}}</h3>
<p>{{_i}}Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:{{/i}}</p> <p>{{_i}}Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:{{/i}}</p>
<pre class="prettyprint"> <pre>
app/ <span class="icon-folder-open"></span> app/
├── layouts/ <span class="icon-folder-open"></span> layouts/
└── templates/ <span class="icon-folder-open"></span> templates/
public/ <span class="icon-folder-open"></span> public/
├── css/ <span class="icon-folder-open"></span> css/
│ ├── bootstrap.min.css <span class="icon-file"></span> bootstrap.min.css
├── js/ <span class="icon-folder-open"></span> js/
│ ├── bootstrap.min.js <span class="icon-file"></span> bootstrap.min.js
└── img/ <span class="icon-folder-open"></span> img/
├── glyphicons-halflings.png <span class="icon-file"></span> glyphicons-halflings.png
└── glyphicons-halflings-white.png <span class="icon-file"></span> glyphicons-halflings-white.png
</pre> </pre>
<h3>{{_i}}Utilize starter template{{/i}}</h3> <h3>{{_i}}Utilize starter template{{/i}}</h3>
......
docs/templates/pages/index.mustache
View file @ b5af762e
This diff is collapsed.
docs/templates/pages/javascript.mustache
View file @ b5af762e
This diff is collapsed.
docs/templates/pages/scaffolding.mustache
View file @ b5af762e
This diff is collapsed.
js/bootstrap-affix.js
View file @ b5af762e
/* ========================================================== /* ==========================================================
* bootstrap-affix.js v2.1.1 * bootstrap-affix.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#affix * http://twitter.github.com/bootstrap/javascript.html#affix
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
var Affix = function (element, options) { var Affix = function (element, options) {
this.options = $.extend({}, $.fn.affix.defaults, options) this.options = $.extend({}, $.fn.affix.defaults, options)
this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) this.$window = $(window)
.on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
.on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
this.$element = $(element) this.$element = $(element)
this.checkPosition() this.checkPosition()
} }
......
js/bootstrap-alert.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-button.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-carousel.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-collapse.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-dropdown.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-modal.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-popover.js
View file @ b5af762e
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.1.1 * bootstrap-popover.js v2.2.0
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
......
js/bootstrap-scrollspy.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-tab.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-tooltip.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-transition.js
View file @ b5af762e
This diff is collapsed.
js/bootstrap-typeahead.js
View file @ b5af762e
This diff is collapsed.
js/tests/unit/bootstrap-carousel.js
View file @ b5af762e
This diff is collapsed.
js/tests/unit/bootstrap-dropdown.js
View file @ b5af762e
This diff is collapsed.
js/tests/unit/bootstrap-popover.js
View file @ b5af762e
This diff is collapsed.
js/tests/unit/bootstrap-tab.js
View file @ b5af762e
This diff is collapsed.
js/tests/unit/bootstrap-tooltip.js
View file @ b5af762e
This diff is collapsed.
js/tests/unit/bootstrap-typeahead.js
View file @ b5af762e
This diff is collapsed.
js/tests/vendor/jquery.js
View file @ b5af762e
This diff is collapsed.
less/accordion.less
View file @ b5af762e
This diff is collapsed.
less/alerts.less
View file @ b5af762e
This diff is collapsed.
less/bootstrap.less
View file @ b5af762e
This diff is collapsed.
less/breadcrumbs.less
View file @ b5af762e
This diff is collapsed.
less/button-groups.less
View file @ b5af762e
This diff is collapsed.
less/buttons.less
View file @ b5af762e
This diff is collapsed.
less/code.less
View file @ b5af762e
This diff is collapsed.
less/dropdowns.less
View file @ b5af762e
This diff is collapsed.
less/forms.less
View file @ b5af762e
This diff is collapsed.
less/hero-unit.less
View file @ b5af762e
This diff is collapsed.
less/labels-badges.less
View file @ b5af762e
This diff is collapsed.
less/media.less 0 → 100644
View file @ b5af762e
This diff is collapsed.
less/mixins.less
View file @ b5af762e
This diff is collapsed.
less/modals.less
View file @ b5af762e
This diff is collapsed.
less/navbar.less
View file @ b5af762e
This diff is collapsed.
less/navs.less
View file @ b5af762e
This diff is collapsed.
less/pager.less
View file @ b5af762e
This diff is collapsed.
less/pagination.less
View file @ b5af762e
This diff is collapsed.
less/popovers.less
View file @ b5af762e
This diff is collapsed.
less/progress-bars.less
View file @ b5af762e
This diff is collapsed.
less/reset.less
View file @ b5af762e
This diff is collapsed.
less/responsive-767px-max.less
View file @ b5af762e
This diff is collapsed.
less/responsive-navbar.less
View file @ b5af762e
This diff is collapsed.
less/responsive.less
View file @ b5af762e
This diff is collapsed.
less/sprites.less
View file @ b5af762e
This diff is collapsed.
less/tables.less
View file @ b5af762e
This diff is collapsed.
less/tests/buttons.html 0 → 100644
View file @ b5af762e
This diff is collapsed.
less/tests/forms-responsive.html 0 → 100644
View file @ b5af762e
This diff is collapsed.
less/tests/navbar-fixed-top.html 0 → 100644
View file @ b5af762e
This diff is collapsed.
less/tests/navbar-static-top.html 0 → 100644
View file @ b5af762e
This diff is collapsed.
less/tests/navbar.html
View file @ b5af762e
This diff is collapsed.
less/thumbnails.less
View file @ b5af762e
This diff is collapsed.
less/tooltip.less
View file @ b5af762e
This diff is collapsed.
less/type.less
View file @ b5af762e
This diff is collapsed.
less/variables.less
View file @ b5af762e
This diff is collapsed.
less/wells.less
View file @ b5af762e
This diff is collapsed.
package.json
View file @ b5af762e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment