diff --git a/Makefile b/Makefile index 439f7ff1f6ac517efc212e5cc824db31452bec4e..b2f006e6a1f9fef681425426da9c41dca3f72fef 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,11 @@ build: @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 @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v2.2.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 +<<<<<<< HEAD + @echo "/**\n* Bootstrap.js v2.1.2 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.2 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 @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 @echo "Compiling and minifying javascript... ${CHECK} Done" diff --git a/README.md b/README.md index cefe24afb8f9527636f51b48ec7e0319ede67ca4..de1e3866535a15657975c0350e770b45ac7d403d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[Twitter Bootstrap](http://twitter.github.com/bootstrap) [](http://travis-ci.org/twitter/bootstrap) +[Twitter Bootstrap v2.2.2](http://twitter.github.com/bootstrap) [](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). diff --git a/component.json b/component.json index cc3675beff7f7e7e673f673eaaabc147a3c9d10e..eda7edeef5f8c7d441ef59c37581e303453ea43b 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "2.2.1", + "version": "2.2.2", "main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"], "dependencies": { "jquery": "~1.8.0" diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 82fa9cafe69d0be42cd626897622b528acf0d0eb..2a883f047942295268ffeaf30c9c499a876681ec 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,9 @@ /*! - * Bootstrap Responsive v2.2.1 +<<<<<<< HEAD + * Bootstrap Responsive v2.1.2 +======= + * Bootstrap Responsive v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1b519e220009e9277ca53574d82660666b812fd8..0a818dca0f4d8dc380840f66a3192efc1b8d4289 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,9 @@ /*! - * Bootstrap v2.2.1 +<<<<<<< HEAD + * Bootstrap v2.1.2 +======= + * Bootstrap v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -109,6 +113,17 @@ input[type="submit"] { -webkit-appearance: button; } +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; +} + input[type="search"] { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; @@ -126,6 +141,58 @@ textarea { vertical-align: top; } +@media print { + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} + .clearfix { *zoom: 1; } @@ -615,6 +682,10 @@ cite { color: #999999; } +a.muted:hover { + color: #808080; +} + .text-warning { color: #c09853; } @@ -747,6 +818,19 @@ ol.unstyled { list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} + +ul.inline > li, +ol.inline > li { + display: inline-block; + padding-right: 5px; + padding-left: 5px; +} + dl { margin-bottom: 20px; } @@ -883,6 +967,7 @@ pre { code { padding: 2px 4px; color: #d14; + white-space: nowrap; background-color: #f7f7f9; border: 1px solid #e1e1e8; } @@ -1069,7 +1154,6 @@ input[type="checkbox"] { margin-top: 1px \9; *margin-top: 0; line-height: normal; - cursor: pointer; } input[type="file"], @@ -1352,7 +1436,7 @@ input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; @@ -1391,7 +1475,7 @@ input[type="checkbox"][readonly] { border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; @@ -1430,7 +1514,7 @@ input[type="checkbox"][readonly] { border-color: #b94a48; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; @@ -1469,7 +1553,7 @@ input[type="checkbox"][readonly] { border-color: #468847; } -.control-group.info > label, +.control-group.info .control-label, .control-group.info .help-block, .control-group.info .help-inline { color: #3a87ad; @@ -1508,16 +1592,16 @@ input[type="checkbox"][readonly] { border-color: #3a87ad; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; @@ -1623,7 +1707,9 @@ select:focus:required:invalid:focus { .input-append .add-on, .input-prepend .add-on, .input-append .btn, -.input-prepend .btn { +.input-prepend .btn, +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -1656,9 +1742,9 @@ select:focus:required:invalid:focus { border-radius: 4px 0 0 4px; } -.input-append input + .btn-group .btn, -.input-append select + .btn-group .btn, -.input-append .uneditable-input + .btn-group .btn { +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; @@ -1671,7 +1757,8 @@ select:focus:required:invalid:focus { } .input-append .add-on:last-child, -.input-append .btn:last-child { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; @@ -1973,9 +2060,6 @@ table { .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child, .table-bordered tfoot:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; @@ -1989,6 +2073,18 @@ table { -moz-border-radius-bottomright: 4px; } +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; +} + +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; +} + .table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, @@ -2835,7 +2931,7 @@ table th[class*="span"], .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #333333; + color: #ffffff; text-decoration: none; background-color: #0081c2; background-image: -moz-linear-gradient(top, #0088cc, #0077b3); @@ -2951,6 +3047,7 @@ table th[class*="span"], } .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -3051,7 +3148,6 @@ button.close { *margin-left: .3em; font-size: 14px; line-height: 20px; - *line-height: 20px; color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); @@ -3103,10 +3199,6 @@ button.close { .btn:hover { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; @@ -3122,8 +3214,6 @@ button.close { .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3134,7 +3224,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -3170,7 +3259,7 @@ button.close { } .btn-mini { - padding: 1px 6px; + padding: 0 6px; font-size: 10.5px; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -4170,7 +4259,6 @@ input[type="submit"].btn.btn-mini { *z-index: 2; margin-bottom: 20px; overflow: visible; - color: #777777; } .navbar-inner { @@ -4233,6 +4321,7 @@ input[type="submit"].btn.btn-mini { .navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } .navbar-link { @@ -4299,7 +4388,7 @@ input[type="submit"].btn.btn-mini { .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } @@ -4582,10 +4671,6 @@ input[type="submit"].btn.btn-mini { border-radius: 6px 0 6px 6px; } -.navbar-inverse { - color: #999999; -} - .navbar-inverse .navbar-inner { background-color: #1b1b1b; background-image: -moz-linear-gradient(top, #222222, #111111); @@ -4609,6 +4694,14 @@ input[type="submit"].btn.btn-mini { color: #ffffff; } +.navbar-inverse .brand { + color: #999999; +} + +.navbar-inverse .navbar-text { + color: #999999; +} + .navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:hover { color: #ffffff; @@ -4890,7 +4983,7 @@ input[type="submit"].btn.btn-mini { .pagination-mini ul > li > a, .pagination-mini ul > li > span { - padding: 1px 6px; + padding: 0 6px; font-size: 10.5px; } @@ -4972,15 +5065,21 @@ input[type="submit"].btn.btn-mini { .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; width: 560px; +<<<<<<< HEAD margin: -250px 0 0 -280px; +======= + margin-left: -280px; +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; + /* IE6-7 */ + -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -5002,7 +5101,7 @@ input[type="submit"].btn.btn-mini { } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { @@ -5160,6 +5259,7 @@ input[type="submit"].btn.btn-mini { display: none; width: 236px; padding: 1px; + white-space: normal; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); @@ -5416,6 +5516,11 @@ a.thumbnail:hover { border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} + a.label:hover, a.badge:hover { color: #ffffff; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 60782ecea480042ff5fe46f2f574daeafcd96cc7..119a30528e58d1c9676e5e7902fbb90af2b1cd2d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -177,6 +177,16 @@ hr.soften { background: url(../img/bs-docs-masthead-pattern.png) repeat center center; opacity: .4; } +@media +only screen and (-webkit-min-device-pixel-ratio: 2), +only screen and ( min--moz-device-pixel-ratio: 2), +only screen and ( -o-min-device-pixel-ratio: 2/1) { + + .jumbotron:after { + background-size: 150px 150px; + } + +} /* Masthead (docs home) ------------------------- */ @@ -335,8 +345,14 @@ hr.soften { margin-bottom: 0; } .show-grid .show-grid [class*="span"] { + margin-top: 5px; +} +.show-grid [class*="span"] [class*="span"] { background-color: #ccc; } +.show-grid [class*="span"] [class*="span"] [class*="span"] { + background-color: #999; +} diff --git a/docs/assets/ico/favicon.png b/docs/assets/ico/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..073c13c0f6e90ce5cb374da4dd3da707b7195dc9 Binary files /dev/null and b/docs/assets/ico/favicon.png differ diff --git a/docs/assets/img/bs-docs-bootstrap-features.png b/docs/assets/img/bs-docs-bootstrap-features.png index d02c5ca69263fb2aafa45549ce382c6d19fe86c4..7cd8501ae192e5b43eefb5a1b69857a6c9b8278d 100644 Binary files a/docs/assets/img/bs-docs-bootstrap-features.png and b/docs/assets/img/bs-docs-bootstrap-features.png differ diff --git a/docs/assets/img/bs-docs-responsive-illustrations.png b/docs/assets/img/bs-docs-responsive-illustrations.png index 66b564b31120bb7301a5dd67e9de46459f38466e..77c8f18f5ce7363cc4d83eced583e9981ddbe683 100644 Binary files a/docs/assets/img/bs-docs-responsive-illustrations.png and b/docs/assets/img/bs-docs-responsive-illustrations.png differ diff --git a/docs/assets/img/bs-docs-twitter-github.png b/docs/assets/img/bs-docs-twitter-github.png index e49eb46e4cfab3acb048d50d7ece5fa4b80937fb..06100f3989fd170b0a9294ac1c70ff460dba09c2 100644 Binary files a/docs/assets/img/bs-docs-twitter-github.png and b/docs/assets/img/bs-docs-twitter-github.png differ diff --git a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png index a7ac9ef98b8a951d041443b13df01806d31dc7bf..a9d2d434265b874d19dfbfbe471892cb4e1d98f0 100644 Binary files a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png and b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png differ diff --git a/docs/assets/img/examples/bootstrap-example-signin.png b/docs/assets/img/examples/bootstrap-example-signin.png index 39210096b4024ce8f453c6cb6831c535840e1e4c..5f5321cfdf79ed85607a51d7af07db7372ec6d0a 100644 Binary files a/docs/assets/img/examples/bootstrap-example-signin.png and b/docs/assets/img/examples/bootstrap-example-signin.png differ diff --git a/docs/assets/js/README.md b/docs/assets/js/README.md index b58fa1d40746d3300cba2f6fe703699b9ed00691..66903c71a637db76eeb9cf14f125b44b5102e654 100644 --- a/docs/assets/js/README.md +++ b/docs/assets/js/README.md @@ -17,7 +17,7 @@ To target a specific plugin, just include the plugins name as a namespace along --- -### PROGRAMATIC API +### PROGRAMMATIC API We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API. diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 5baab393546410f21a8e77f0c1759d978669740e..f6c7849c3a8b2afb1c2e9df8e0831241e99f9028 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -89,7 +89,7 @@ }) // request built javascript - $('.download-btn').on('click', function () { + $('.download-btn .btn').on('click', function () { var css = $("#components.download input:checked") .map(function () { return this.value }) diff --git a/docs/assets/js/bootstrap-affix.js b/docs/assets/js/bootstrap-affix.js index 0a195f1c8096a949bcb087b81a54b2584d8f12b4..3dcc2afee378da9d4909475fcff5b06050d3ea52 100644 --- a/docs/assets/js/bootstrap-affix.js +++ b/docs/assets/js/bootstrap-affix.js @@ -1,5 +1,9 @@ /* ========================================================== - * bootstrap-affix.js v2.2.1 +<<<<<<< HEAD + * bootstrap-affix.js v2.1.2 +======= + * bootstrap-affix.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 239b1433f5d125059a303b1a7379c55b30a88309..0117f83a060af1f69406bf87dd1d89b8993bae7c 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -1,5 +1,9 @@ /* ========================================================== - * bootstrap-alert.js v2.2.1 +<<<<<<< HEAD + * bootstrap-alert.js v2.1.2 +======= + * bootstrap-alert.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index 002d983a6a092e3ba7cb5cbaf44cacc813684d3b..6710c9785f91f899c0c8186d06cf82a5bfde1cc1 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -1,5 +1,9 @@ /* ============================================================ - * bootstrap-button.js v2.2.1 +<<<<<<< HEAD + * bootstrap-button.js v2.1.2 +======= + * bootstrap-button.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 536b85d72120494ab386ef22bd859e7e97b1c1a0..9c7942a3fba9f2dc3fb444cc028a1803c7508f8e 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -1,5 +1,9 @@ /* ========================================================== - * bootstrap-carousel.js v2.2.1 +<<<<<<< HEAD + * bootstrap-carousel.js v2.1.2 +======= + * bootstrap-carousel.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 2b0a2baade148f468588da5bdbbdeed6aeb02f0d..53a92d6021cc0c514f7ce27077ba3c8fbc126137 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -1,5 +1,9 @@ /* ============================================================= - * bootstrap-collapse.js v2.2.1 +<<<<<<< HEAD + * bootstrap-collapse.js v2.1.2 +======= + * bootstrap-collapse.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 88592b3afd6e8eda23d3f838aa1286d9d4f648d7..bc006315cc55914e0c1d16fc080f0c593ed77ac7 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -1,5 +1,9 @@ /* ============================================================ - * bootstrap-dropdown.js v2.2.1 +<<<<<<< HEAD + * bootstrap-dropdown.js v2.1.2 +======= + * bootstrap-dropdown.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index e267a66e21e0a3aa8b1ff8968b484b27e3155e69..0569cab1d5b480deb18158f66383a43e15b2c824 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -1,5 +1,9 @@ /* ========================================================= - * bootstrap-modal.js v2.2.1 +<<<<<<< HEAD + * bootstrap-modal.js v2.1.2 +======= + * bootstrap-modal.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index 0afe7ec3b2b0c6c103f4efd7463920ed163f0b79..6c6630c0215a70a99deb8da2ec74ee75e7dc1631 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -1,5 +1,9 @@ /* =========================================================== - * bootstrap-popover.js v2.2.1 +<<<<<<< HEAD + * bootstrap-popover.js v2.1.2 +======= + * bootstrap-popover.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index 3ffda2ebe71be02bb572d3ebba71e194fda2d70a..8cc56ca1515f3e6660715a29fca179653f899e1c 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -1,5 +1,9 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.2.1 +<<<<<<< HEAD + * bootstrap-scrollspy.js v2.1.2 +======= + * bootstrap-scrollspy.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index df950350c6bcd20e3fa558105bdd0480b4a1248a..25cc68cb35e34fe74e2510a2d67e4ccb3733b9a6 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -1,5 +1,9 @@ /* ======================================================== - * bootstrap-tab.js v2.2.1 +<<<<<<< HEAD + * bootstrap-tab.js v2.1.2 +======= + * bootstrap-tab.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index de923f7b3edc22e3a7a7a2b8b16d17b8284b289c..8f2a176278a195aa9790ad608ca51343222f4654 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -1,5 +1,9 @@ /* =========================================================== - * bootstrap-tooltip.js v2.2.1 +<<<<<<< HEAD + * bootstrap-tooltip.js v2.1.2 +======= + * bootstrap-tooltip.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -273,4 +277,4 @@ , html: false } -}(window.jQuery); \ No newline at end of file +}(window.jQuery); diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 23973edb418a0b6521569baa160ccbbe168b4b17..a2e3c7779e7ee283e14c885c700e6a22f3785da9 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -1,5 +1,9 @@ /* =================================================== - * bootstrap-transition.js v2.2.1 +<<<<<<< HEAD + * bootstrap-transition.js v2.1.2 +======= + * bootstrap-transition.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 2f3dc274f991085766c16d5c8e06153ffdf426bd..033ecbd15484218698d1bb35172315bd7de3758f 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -1,5 +1,9 @@ /* ============================================================= - * bootstrap-typeahead.js v2.2.1 +<<<<<<< HEAD + * bootstrap-typeahead.js v2.1.2 +======= + * bootstrap-typeahead.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index c753bd6f8a6b4ece9b5c4058c57beac42fea2cc9..944bd940b321c6af113f3ea5b736143d25336685 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1,5 +1,7 @@ +<<<<<<< HEAD +======= /* =================================================== - * bootstrap-transition.js v2.2.1 + * bootstrap-transition.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -58,7 +60,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.2.1 + * bootstrap-alert.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -145,7 +147,7 @@ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.2.1 + * bootstrap-button.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -238,7 +240,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.2.1 + * bootstrap-carousel.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -413,7 +415,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.2.1 + * bootstrap-collapse.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -568,7 +570,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.2.1 + * bootstrap-dropdown.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -715,7 +717,7 @@ .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.2.1 + * bootstrap-modal.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -949,7 +951,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-tooltip.js v2.2.1 + * bootstrap-tooltip.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1224,7 +1226,7 @@ } }(window.jQuery);/* =========================================================== - * bootstrap-popover.js v2.2.1 + * bootstrap-popover.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1326,7 +1328,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.2.1 + * bootstrap-scrollspy.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1476,7 +1478,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.2.1 + * bootstrap-tab.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1608,7 +1610,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.2.1 + * bootstrap-typeahead.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1918,7 +1920,7 @@ }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.2.1 + * bootstrap-affix.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. @@ -2022,4 +2024,5 @@ }) -}(window.jQuery); \ No newline at end of file +}(window.jQuery); +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index 80a9982102278267fc4ef633b5ceccdfefdb450e..55ffbfbc6d5449f0a03333e431d67d456e279059 100644 --- a/docs/assets/js/bootstrap.min.js +++ b/docs/assets/js/bootstrap.min.js @@ -1,6 +1,9 @@ +<<<<<<< HEAD +======= /** -* Bootstrap.js v2.2.1 by @fat & @mdo +* Bootstrap.js v2.2.2 by @fat & @mdo * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ -!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0]});if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(document).on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(document).on("click.dropdown.data-api touchstart.dropdown.data-api",r).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.detach().css({top:0,left:0,display:"block"}).insertAfter(this.$element),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.offset(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.detach(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);n[n.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!1}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file +!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0]});if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(document).on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(document).on("click.dropdown.data-api touchstart.dropdown.data-api",r).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.detach().css({top:0,left:0,display:"block"}).insertAfter(this.$element),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.offset(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.detach(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);n[n.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!1}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 diff --git a/docs/base-css.html b/docs/base-css.html index 10a7dc62eb6d2027b053a94c1ce43e4f0e8f2236..53e61d6c3abd3547e3c8043b6ba524dcfe905780 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -192,7 +202,7 @@ <h2 id="abbreviations">Abbreviations</h2> - <p>Stylized implemenation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p> + <p>Stylized implementation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p> <h3><code><abbr></code></h3> <p>For expanded text on long hover of an abbreviation, include the <code>title</code> attribute.</p> @@ -226,7 +236,7 @@ </address> <address> <strong>Full Name</strong><br> - <a href="mailto:#">first.last@gmail.com</a> + <a href="mailto:#">first.last@example.com</a> </address> </div> <pre class="prettyprint linenums"> @@ -239,7 +249,7 @@ <address> <strong>Full Name</strong><br> - <a href="mailto:#">first.last@gmail.com</a> + <a href="mailto:#">first.last@example.com</a> </address> </pre> @@ -350,7 +360,7 @@ </pre> <h3>Unstyled</h3> - <p>A list of items with no <code>list-style</code> or additional left padding.</p> + <p>Remove the default <code>list-style</code> and left padding on list items (immediate children only).</p> <div class="bs-docs-example"> <ul class="unstyled"> <li>Lorem ipsum dolor sit amet</li> @@ -374,6 +384,21 @@ <ul class="unstyled"> <li>...</li> </ul> +</pre> + + <h3>Inline</h3> + <p>Place all list items on a single line with <code>inline-block</code> and some light padding.</p> + <div class="bs-docs-example"> + <ul class="inline"> + <li>Lorem ipsum</li> + <li>Phasellus iaculis</li> + <li>Nulla volutpat</li> + </ul> + </div> +<pre class="prettyprint linenums"> +<ul class="inline"> + <li>...</li> +</ul> </pre> <h3>Description</h3> @@ -1308,6 +1333,54 @@ For example, <code><section></code> should be wrapped as inlin </ul> </div> </div> +</pre> + + <h4>Segmented dropdown groups</h4> + <form class="bs-docs-example"> + <div class="input-prepend"> + <div class="btn-group"> + <button class="btn" tabindex="-1">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group"> + <button class="btn" tabindex="-1">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + </div> + </form> +<pre class="prettyprint linenums"> +<form> + <div class="input-prepend"> + <div class="btn-group">...</div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group">...</div> + </div> +</form> </pre> <h4>Search form</h4> @@ -1506,6 +1579,15 @@ For example, <code><section></code> should be wrapped as inlin </form> <pre class="prettyprint linenums"> <input class="input-xlarge" id="focusedInput" type="text" value="This is focused..."> +</pre> + + <h3>Invalid inputs</h3> + <p>Style inputs via default browser functionality with <code>:invalid</code>. Specify a <code>type</code> and add the <code>required</code> attribute.</p> + <form class="bs-docs-example form-inline"> + <input class="span3" type="email" placeholder="test@example.com" required> + </form> +<pre class="prettyprint linenums"> +<input class="span3" type="email" required> </pre> <h3>Disabled inputs</h3> @@ -2111,6 +2193,21 @@ For example, <code><section></code> should be wrapped as inlin <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/components.html b/docs/components.html index 8725400f8bf07569a410e621c70813babe74bc7a..d6ad6cb657e592493ebbdf07fbe25585221f49c8 100644 --- a/docs/components.html +++ b/docs/components.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -165,6 +175,27 @@ <h3>Sub menus on dropdowns</h3> <p>Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add <code>.dropdown-submenu</code> to any <code>li</code> in an existing dropdown menu for automatic styling.</p> +<<<<<<< HEAD + <div class="bs-docs-example"> + <div class="dropdown clearfix"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <li><a tabindex="-1" href="#">Action</a></li> + <li><a tabindex="-1" href="#">Another action</a></li> + <li><a tabindex="-1" href="#">Something else here</a></li> + <li class="divider"></li> + <li class="dropdown-submenu"> + <a tabindex="-1" href="#">More options</a> + <ul class="dropdown-menu"> + <li><a tabindex="-1" href="#">Second level link</a></li> + <li><a tabindex="-1" href="#">Second level link</a></li> + <li><a tabindex="-1" href="#">Second level link</a></li> + <li><a tabindex="-1" href="#">Second level link</a></li> + <li><a tabindex="-1" href="#">Second level link</a></li> + </ul> + </li> + </ul> + <div class="dropup" style="float: left; margin-left: 20px;"> +======= <div class="bs-docs-example" style="min-height: 180px;"> <div class="pull-left"> @@ -192,6 +223,7 @@ <div class="pull-left" style="margin-left: 20px;"> <p class="muted">Dropup</p> <div class="dropup"> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> <li><a tabindex="-1" href="#">Action</a></li> <li><a tabindex="-1" href="#">Another action</a></li> @@ -719,7 +751,11 @@ </pre> <h3>Disabled state</h3> +<<<<<<< HEAD + <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.</p> +======= <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.</p> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <div class="bs-docs-example"> <ul class="nav nav-pills"> <li><a href="#">Clickable link</a></li> @@ -1859,6 +1895,9 @@ </tbody> </table> + <h3>Easily collapsible</h3> + <p>For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p> + </section> @@ -2596,6 +2635,21 @@ class="clearfix" <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/customize.html b/docs/customize.html index 30be36ee1631137f4242145d84da69ec41a33541..39648cccdfec60208eb2769c6f10196c29e47771 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -144,7 +154,6 @@ </div><!-- /span --> <div class="span3"> <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="close.less"> Close icon</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label> @@ -370,7 +379,7 @@ <label>@btnPrimaryBackground</label> <input type="text" class="span3" placeholder="@linkColor"> <label>@btnPrimaryBackgroundHighlight</label> - <input type="text" class="span3" placeholder="darken(@white, 10%);"> + <input type="text" class="span3" placeholder="darken(@white, 10%)"> </div><!-- /span --> <div class="span3"> @@ -450,7 +459,7 @@ </h1> </div> <div class="download-btn"> - <a class="btn btn-primary" href="#" >Customize and Download</a> + <a class="btn btn-primary" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> <h4>What's included?</h4> <p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p> </div> @@ -508,6 +517,21 @@ <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/extend.html b/docs/extend.html index f7d509f86a3e57e92a0441b024453d583627922a..c0edd7309856814f812b7b956701dada5add40c1 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -283,6 +293,21 @@ <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/getting-started.html b/docs/getting-started.html index e86e924f3e280c60acf35c1ed989e53334c9061e..fafb2f8a32554810ebfc9b2b0f462c6d4084bd6c 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -110,12 +120,12 @@ <div class="span6"> <h2>Download compiled</h2> <p><strong>Fastest way to get started:</strong> get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.</p> - <p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" >Download Bootstrap</a></p> + <p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p> </div> <div class="span6"> <h2>Download source</h2> <p>Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p> - <p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" >Download Bootstrap source</a></p> + <p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download Bootstrap source</a></p> </div> </div> </section> @@ -267,6 +277,10 @@ <a class="thumbnail" href="examples/marketing-narrow.html"> <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt=""> </a> +<<<<<<< HEAD + <h4>Starter template</h4> + <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p> +======= <h4>Narrow marketing</h4> <p>Slim, lightweight marketing template for small projects or teams.</p> </li> @@ -285,6 +299,29 @@ <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> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 + </li> + + <li class="span3"> + <a class="thumbnail" href="examples/marketing-narrow.html"> + <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt=""> + </a> + <h4>Narrow marketing</h4> + <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/carousel.html"> <img src="assets/img/examples/bootstrap-example-carousel.png" alt=""> @@ -292,6 +329,7 @@ <h4>Carousel jumbotron</h4> <p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p> </li> + </ul> </section> @@ -305,8 +343,8 @@ <h1>What next?</h1> </div> <p class="lead">Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.</p> - <a class="btn btn-large btn-primary" href="./scaffolding.html" >Visit the Bootstrap docs</a> - <a class="btn btn-large" href="./customize.html" style="margin-left: 5px;" >Customize Bootstrap</a> + <a class="btn btn-large btn-primary" href="./scaffolding.html" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Next steps', 'Visit docs']);">Visit the Bootstrap docs</a> + <a class="btn btn-large" href="./customize.html" style="margin-left: 5px;" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Next steps', 'Customize']);">Customize Bootstrap</a> </section> @@ -361,6 +399,21 @@ <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/index.html b/docs/index.html index 54dc3c1f1091501697d06ee95801ba3d1af234fa..fa300c5d75344cbf003d2d395c9cf7062f181f19 100644 --- a/docs/index.html +++ b/docs/index.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -73,6 +83,13 @@ <div class="container"> <h1>Bootstrap</h1> <p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p> +<<<<<<< HEAD + <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.2']);">Download Bootstrap</a></p> + <ul class="masthead-links"> + <li><a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a></li> + <li><a href="./extend.html" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);">Extend</a></li> + <li>Version 2.1.2</li> +======= <p> <a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a> </p> @@ -87,8 +104,9 @@ <a href="./extend.html" >Extend</a> </li> <li> - Version 2.2.1 + Version 2.2.2 </li> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 </ul> </div> </div> @@ -100,7 +118,7 @@ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe> </li> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe> + <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe> </li> <li class="follow-btn"> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> @@ -214,6 +232,21 @@ <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/javascript.html b/docs/javascript.html index bd4d606b33eabe161274a4803e860bbea5d4cb34..999e218288c03775ad323abefd382979c54150fc 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -136,7 +146,11 @@ $("#myModal").modal('show') // initializes and invokes show immed <h3>Events</h3> <p>Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p> +<<<<<<< HEAD <p>All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.</p> +======= + <p>All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.</p> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <pre class="prettyprint linenums"> $('#myModal').on('show', function (e) { if (!data) return e.preventDefault() // stops modal from being shown @@ -181,7 +195,7 @@ $('#myModal').on('show', function (e) { <h3>Static example</h3> <p>A rendered modal with header, body, and set of actions in the footer.</p> <div class="bs-docs-example" style="background-color: #f5f5f5;"> - <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> + <div class="modal" style="position: relative; top: auto; left: auto; right: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3>Modal header</h3> @@ -252,7 +266,11 @@ $('#myModal').on('show', function (e) { <!-- Button to trigger modal --> <a href="#myModal" role="button" class="btn" data-toggle="modal">Launch demo modal</a> +<<<<<<< HEAD +<-- Modal --> +======= <!-- Modal --> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> @@ -507,7 +525,7 @@ $('#myModal').on('hidden', function () { <h3>Methods</h3> <h4>$().dropdown('toggle')</h4> - <p>A programatic api for toggling menus for a given navbar or tabbed navigation.</p> + <p>A programmatic api for toggling menus for a given navbar or tabbed navigation.</p> </section> @@ -636,7 +654,7 @@ $('[data-spy="scroll"]').each(function () { <h2>Example tabs</h2> - <p>Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.</p> + <p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p> <div class="bs-docs-example"> <ul id="myTab" class="nav nav-tabs"> <li class="active"><a href="#home" data-toggle="tab">Home</a></li> @@ -1687,7 +1705,7 @@ $('[data-spy="affix"]').each(function () { <td>offset</td> <td>number | function | object</td> <td>10</td> - <td>Pixels to offset from screen when calculating position of scroll. If a single number is provide, the offset will be applied in both top and left directions. To listen for a single direction, or multiple unique offsets, just provided an object <code>offset: { x: 10 }</code>. Use a function when you need to dynamically provide an offset (useful for some responsive designs).</td> + <td>Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and left directions. To listen for a single direction, or multiple unique offsets, just provide an object <code>offset: { x: 10 }</code>. Use a function when you need to dynamically provide an offset (useful for some responsive designs).</td> </tr> </tbody> </table> @@ -1744,6 +1762,21 @@ $('[data-spy="affix"]').each(function () { <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 681ec1fa332c16045f2b9ef87ce20454ed9159ab..40f4c64d204b3a26503eeb8027ec6fa3440f45dc 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -19,12 +19,22 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="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"> + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-146052-10']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -123,7 +133,7 @@ <p>These styles can be found within <strong>scaffolding.less</strong>.</p> <h3>Reset via Normalize</h3> - <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> + <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> </section> @@ -301,13 +311,21 @@ </pre> <h2>Fluid nesting</h2> - <p>Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.</p> + <p>Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.</p> <div class="row-fluid show-grid"> <div class="span12"> Fluid 12 <div class="row-fluid show-grid"> <div class="span6"> Fluid 6 + <div class="row-fluid show-grid"> + <div class="span6"> + Fluid 6 + </div> + <div class="span6"> + Fluid 6 + </div> + </div> </div> <div class="span6"> Fluid 6 @@ -320,7 +338,17 @@ <div class="span12"> Fluid 12 <div class="row-fluid"> +<<<<<<< HEAD <div class="span6">Fluid 6</div> +======= + <div class="span6"> + Fluid 6 + <div class="row-fluid"> + <div class="span6">Fluid 6</div> + <div class="span6">Fluid 6</div> + </div> + </div> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <div class="span6">Fluid 6</div> </div> </div> @@ -581,6 +609,21 @@ <script src="assets/js/application.js"></script> + <!-- Analytics + ================================================== --> + <script> + var _gauges = _gauges || []; + (function() { + var t = document.createElement('script'); + t.type = 'text/javascript'; + t.async = true; + t.id = 'gauges-tracker'; + t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); + t.src = '//secure.gaug.es/track.js'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(t, s); + })(); + </script> </body> </html> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index deaec189ad10bfbc84ce5bd825a2d9fa9d19fbba..db4196033901069756c57ff0a8b725c5af0aaa63 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -19,7 +19,7 @@ <![endif]--> <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="assets/ico/favicon.ico"> + <link rel="shortcut icon" href="assets/ico/favicon.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="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index e0a0280687d0897e3293f8b4e7a24e732f13d318..29c4cebb1e18256f8b96e6b831842cbb4b835a28 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -127,7 +127,7 @@ {{! Abbreviations }} <h2 id="abbreviations">{{_i}}Abbreviations{{/i}}</h2> - <p>{{_i}}Stylized implemenation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p> + <p>{{_i}}Stylized implementation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p> <h3><code><abbr></code></h3> <p>{{_i}}For expanded text on long hover of an abbreviation, include the <code>title</code> attribute.{{/i}}</p> @@ -162,7 +162,7 @@ </address> <address> <strong>{{_i}}Full Name{{/i}}</strong><br> - <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a> + <a href="mailto:#">{{_i}}first.last@example.com{{/i}}</a> </address> </div> <pre class="prettyprint linenums"> @@ -175,7 +175,7 @@ <address> <strong>{{_i}}Full Name{{/i}}</strong><br> - <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a> + <a href="mailto:#">{{_i}}first.last@example.com{{/i}}</a> </address> </pre> @@ -287,7 +287,7 @@ </pre> <h3>{{_i}}Unstyled{{/i}}</h3> - <p>{{_i}}A list of items with no <code>list-style</code> or additional left padding.{{/i}}</p> + <p>{{_i}}Remove the default <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p> <div class="bs-docs-example"> <ul class="unstyled"> <li>Lorem ipsum dolor sit amet</li> @@ -311,6 +311,21 @@ <ul class="unstyled"> <li>...</li> </ul> +</pre> + + <h3>{{_i}}Inline{{/i}}</h3> + <p>{{_i}}Place all list items on a single line with <code>inline-block</code> and some light padding.{{/i}}</p> + <div class="bs-docs-example"> + <ul class="inline"> + <li>Lorem ipsum</li> + <li>Phasellus iaculis</li> + <li>Nulla volutpat</li> + </ul> + </div> +<pre class="prettyprint linenums"> +<ul class="inline"> + <li>...</li> +</ul> </pre> <h3>{{_i}}Description{{/i}}</h3> @@ -1245,6 +1260,54 @@ </ul> </div> </div> +</pre> + + <h4>{{_i}}Segmented dropdown groups{{/i}}</h4> + <form class="bs-docs-example"> + <div class="input-prepend"> + <div class="btn-group"> + <button class="btn" tabindex="-1">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">{{_i}}Action{{/i}}</a></li> + <li><a href="#">{{_i}}Another action{{/i}}</a></li> + <li><a href="#">{{_i}}Something else here{{/i}}</a></li> + <li class="divider"></li> + <li><a href="#">{{_i}}Separated link{{/i}}</a></li> + </ul> + </div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group"> + <button class="btn" tabindex="-1">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">{{_i}}Action{{/i}}</a></li> + <li><a href="#">{{_i}}Another action{{/i}}</a></li> + <li><a href="#">{{_i}}Something else here{{/i}}</a></li> + <li class="divider"></li> + <li><a href="#">{{_i}}Separated link{{/i}}</a></li> + </ul> + </div> + </div> + </form> +<pre class="prettyprint linenums"> +<form> + <div class="input-prepend"> + <div class="btn-group">...</div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group">...</div> + </div> +</form> </pre> <h4>{{_i}}Search form{{/i}}</h4> @@ -1443,6 +1506,15 @@ </form> <pre class="prettyprint linenums"> <input class="input-xlarge" id="focusedInput" type="text" value="{{_i}}This is focused...{{/i}}"> +</pre> + + <h3>{{_i}}Invalid inputs{{/i}}</h3> + <p>{{_i}}Style inputs via default browser functionality with <code>:invalid</code>. Specify a <code>type</code> and add the <code>required</code> attribute.{{/i}}</p> + <form class="bs-docs-example form-inline"> + <input class="span3" type="email" placeholder="test@example.com" required> + </form> +<pre class="prettyprint linenums"> +<input class="span3" type="email" required> </pre> <h3>{{_i}}Disabled inputs{{/i}}</h3> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 3c024451c21531f36a7e1e6f0f4857a6b1d110e7..06ac6ad54a0038baa0a4e0674aca0808d3103e7c 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -94,11 +94,33 @@ <h3>{{_i}}Sub menus on dropdowns{{/i}}</h3> <p>{{_i}}Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add <code>.dropdown-submenu</code> to any <code>li</code> in an existing dropdown menu for automatic styling.{{/i}}</p> +<<<<<<< HEAD + <div class="bs-docs-example"> + <div class="dropdown clearfix"> + <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> + <li><a tabindex="-1" href="#">{{_i}}Action{{/i}}</a></li> + <li><a tabindex="-1" href="#">{{_i}}Another action{{/i}}</a></li> + <li><a tabindex="-1" href="#">{{_i}}Something else here{{/i}}</a></li> + <li class="divider"></li> + <li class="dropdown-submenu"> + <a tabindex="-1" href="#">{{_i}}More options{{/i}}</a> + <ul class="dropdown-menu"> + <li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li> + <li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li> + <li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li> + <li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li> + <li><a tabindex="-1" href="#">{{_i}}Second level link{{/i}}</a></li> + </ul> + </li> + </ul> + <div class="dropup" style="float: left; margin-left: 20px;"> +======= <div class="bs-docs-example" style="min-height: 180px;"> <div class="pull-left"> <p class="muted">Default</p> <div class="dropdown clearfix"> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;"> <li><a tabindex="-1" href="#">{{_i}}Action{{/i}}</a></li> <li><a tabindex="-1" href="#">{{_i}}Another action{{/i}}</a></li> @@ -116,6 +138,9 @@ </li> </ul> </div> +<<<<<<< HEAD + </div> +======= </div>{{! /.pull-left }} <div class="pull-left" style="margin-left: 20px;"> @@ -162,6 +187,7 @@ </div> </div>{{! /.pull-left }} +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 </div>{{! /example }} <pre class="prettyprint linenums"> <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"> @@ -648,7 +674,11 @@ </pre> <h3>{{_i}}Disabled state{{/i}}</h3> +<<<<<<< HEAD + <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.{{/i}}</p> +======= <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.{{/i}}</p> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <div class="bs-docs-example"> <ul class="nav nav-pills"> <li><a href="#">{{_i}}Clickable link{{/i}}</a></li> @@ -1788,6 +1818,9 @@ </tbody> </table> + <h3>{{_i}}Easily collapsible{{/i}}</h3> + <p>{{_i}}For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.{{/i}}</p> + </section> diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 386f6930a3f5eb3508666f61422763d3395595c4..8d8a2f92a7ac86b0baa17924aa34534eb40ced1c 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -73,7 +73,6 @@ </div><!-- /span --> <div class="span3"> <h3>{{_i}}Miscellaneous{{/i}}</h3> - <label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> {{_i}}Media object{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> {{_i}}Wells{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> {{_i}}Close icon{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> {{_i}}Utilities{{/i}}</label> @@ -299,7 +298,7 @@ <label>@btnPrimaryBackground</label> <input type="text" class="span3" placeholder="@linkColor"> <label>@btnPrimaryBackgroundHighlight</label> - <input type="text" class="span3" placeholder="darken(@white, 10%);"> + <input type="text" class="span3" placeholder="darken(@white, 10%)"> </div><!-- /span --> <div class="span3"> @@ -379,7 +378,7 @@ </h1> </div> <div class="download-btn"> - <a class="btn btn-primary" href="#" {{#production}}onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);"{{/production}}>Customize and Download</a> + <a class="btn btn-primary" href="#" {{#production}}onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);"{{/production}}>{{_i}}Customize and Download{{/i}}</a> <h4>{{_i}}What's included?{{/i}}</h4> <p>{{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}</p> </div> diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 2eec7ff7699a5fda90984051fdbf483d945d6dba..fc2fd42547bf5e7e6cdbcfbb44f075a67bc35f73 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -196,6 +196,10 @@ <a class="thumbnail" href="examples/marketing-narrow.html"> <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt=""> </a> +<<<<<<< HEAD + <h4>{{_i}}Starter template{{/i}}</h4> + <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p> +======= <h4>{{_i}}Narrow marketing{{/i}}</h4> <p>{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}</p> </li> @@ -220,7 +224,31 @@ </a> <h4>{{_i}}Carousel jumbotron{{/i}}</h4> <p>{{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}</p> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 </li> + + <li class="span3"> + <a class="thumbnail" href="examples/marketing-narrow.html"> + <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt=""> + </a> + <h4>{{_i}}Narrow marketing{{/i}}</h4> + <p>{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}</p> + </li> + <li class="span3"> + <a class="thumbnail" href="examples/signin.html"> + <img src="assets/img/examples/bootstrap-example-signin.png" alt=""> + </a> + <h4>{{_i}}Sign in{{/i}}</h4> + <p>{{_i}}Barebones sign in form with custom, larger form controls and a flexible layout.{{/i}}</p> + </li> + <li class="span3"> + <a class="thumbnail" href="examples/carousel.html"> + <img src="assets/img/examples/bootstrap-example-carousel.png" alt=""> + </a> + <h4>{{_i}}Carousel jumbotron{{/i}}</h4> + <p>{{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}</p> + </li> + </ul> </section> diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index ab3578fdbf2bc4074439b44f926d98a2d73e6264..dda1f317491d76a626e15fb1cb22464608c1653b 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -2,8 +2,15 @@ <div class="container"> <h1>{{_i}}Bootstrap{{/i}}</h1> <p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p> +<<<<<<< HEAD + <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a></p> + <ul class="masthead-links"> + <li><a href="http://github.com/twitter/bootstrap" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"{{/production}}>{{_i}}GitHub project{{/i}}</a></li> + <li><a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a></li> + <li>{{_i}}Version 2.1.2{{/i}}</li> +======= <p> - <a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.1']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a> + <a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a> </p> <ul class="masthead-links"> <li> @@ -16,8 +23,9 @@ <a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a> </li> <li> - {{_i}}Version 2.2.1{{/i}} + {{_i}}Version 2.2.2{{/i}} </li> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 </ul> </div> </div> @@ -29,7 +37,7 @@ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe> </li> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe> + <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe> </li> <li class="follow-btn"> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">{{_i}}Follow @twbootstrap{{/i}}</a> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 72d1fc5bba3a213812e853f2a4c26416f545a8af..532e7eb564625f1e36e50051a422b5cec96460f3 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -65,7 +65,11 @@ $("#myModal").modal('show') // initializes and invokes show immed <h3>{{_i}}Events{{/i}}</h3> <p>{{_i}}Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.{{/i}}</p> +<<<<<<< HEAD <p>{{_i}}All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.{{/i}}</p> +======= + <p>{{_i}}All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.{{/i}}</p> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <pre class="prettyprint linenums"> $('#myModal').on('show', function (e) { if (!data) return e.preventDefault() // stops modal from being shown @@ -111,7 +115,7 @@ $('#myModal').on('show', function (e) { <h3>{{_i}}Static example{{/i}}</h3> <p>{{_i}}A rendered modal with header, body, and set of actions in the footer.{{/i}}</p> <div class="bs-docs-example" style="background-color: #f5f5f5;"> - <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> + <div class="modal" style="position: relative; top: auto; left: auto; right: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3>{{_i}}Modal header{{/i}}</h3> @@ -182,7 +186,11 @@ $('#myModal').on('show', function (e) { <!-- Button to trigger modal --> <a href="#myModal" role="button" class="btn" data-toggle="modal">{{_i}}Launch demo modal{{/i}}</a> +<<<<<<< HEAD +<-- Modal --> +======= <!-- Modal --> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> @@ -437,7 +445,7 @@ $('#myModal').on('hidden', function () { <h3>{{_i}}Methods{{/i}}</h3> <h4>$().dropdown('toggle')</h4> - <p>{{_i}}A programatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p> + <p>{{_i}}A programmatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p> </section> @@ -566,7 +574,7 @@ $('[data-spy="scroll"]').each(function () { <h2>{{_i}}Example tabs{{/i}}</h2> - <p>{{_i}}Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.{{/i}}</p> + <p>{{_i}}Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.{{/i}}</p> <div class="bs-docs-example"> <ul id="myTab" class="nav nav-tabs"> <li class="active"><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li> @@ -1617,7 +1625,7 @@ $('[data-spy="affix"]').each(function () { <td>{{_i}}offset{{/i}}</td> <td>{{_i}}number | function | object{{/i}}</td> <td>{{_i}}10{{/i}}</td> - <td>{{_i}}Pixels to offset from screen when calculating position of scroll. If a single number is provide, the offset will be applied in both top and left directions. To listen for a single direction, or multiple unique offsets, just provided an object <code>offset: { x: 10 }</code>. Use a function when you need to dynamically provide an offset (useful for some responsive designs).{{/i}}</td> + <td>{{_i}}Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and left directions. To listen for a single direction, or multiple unique offsets, just provide an object <code>offset: { x: 10 }</code>. Use a function when you need to dynamically provide an offset (useful for some responsive designs).{{/i}}</td> </tr> </tbody> </table> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 85ae5ea0293d42f4795ec5456a04134224ce4391..e55eeba3869e6552c34f7ca7be15688d207f9a52 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -52,7 +52,7 @@ <p>{{_i}}These styles can be found within <strong>scaffolding.less</strong>.{{/i}}</p> <h3>{{_i}}Reset via Normalize{{/i}}</h3> - <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p> + <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p> </section> @@ -230,13 +230,21 @@ </pre> <h2>{{_i}}Fluid nesting{{/i}}</h2> - <p>{{_i}}Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.{{/i}}</p> + <p>{{_i}}Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.{{/i}}</p> <div class="row-fluid show-grid"> <div class="span12"> {{_i}}Fluid 12{{/i}} <div class="row-fluid show-grid"> <div class="span6"> {{_i}}Fluid 6{{/i}} + <div class="row-fluid show-grid"> + <div class="span6"> + {{_i}}Fluid 6{{/i}} + </div> + <div class="span6"> + {{_i}}Fluid 6{{/i}} + </div> + </div> </div> <div class="span6"> {{_i}}Fluid 6{{/i}} @@ -249,7 +257,17 @@ <div class="span12"> {{_i}}Fluid 12{{/i}} <div class="row-fluid"> +<<<<<<< HEAD <div class="span6">{{_i}}Fluid 6{{/i}}</div> +======= + <div class="span6"> + {{_i}}Fluid 6{{/i}} + <div class="row-fluid"> + <div class="span6">{{_i}}Fluid 6{{/i}}</div> + <div class="span6">{{_i}}Fluid 6{{/i}}</div> + </div> + </div> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <div class="span6">{{_i}}Fluid 6{{/i}}</div> </div> </div> diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index 0a195f1c8096a949bcb087b81a54b2584d8f12b4..3dcc2afee378da9d4909475fcff5b06050d3ea52 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -1,5 +1,9 @@ /* ========================================================== - * bootstrap-affix.js v2.2.1 +<<<<<<< HEAD + * bootstrap-affix.js v2.1.2 +======= + * bootstrap-affix.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 239b1433f5d125059a303b1a7379c55b30a88309..0117f83a060af1f69406bf87dd1d89b8993bae7c 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,5 +1,9 @@ /* ========================================================== - * bootstrap-alert.js v2.2.1 +<<<<<<< HEAD + * bootstrap-alert.js v2.1.2 +======= + * bootstrap-alert.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 002d983a6a092e3ba7cb5cbaf44cacc813684d3b..6710c9785f91f899c0c8186d06cf82a5bfde1cc1 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,5 +1,9 @@ /* ============================================================ - * bootstrap-button.js v2.2.1 +<<<<<<< HEAD + * bootstrap-button.js v2.1.2 +======= + * bootstrap-button.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 536b85d72120494ab386ef22bd859e7e97b1c1a0..9c7942a3fba9f2dc3fb444cc028a1803c7508f8e 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,5 +1,9 @@ /* ========================================================== - * bootstrap-carousel.js v2.2.1 +<<<<<<< HEAD + * bootstrap-carousel.js v2.1.2 +======= + * bootstrap-carousel.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 2b0a2baade148f468588da5bdbbdeed6aeb02f0d..53a92d6021cc0c514f7ce27077ba3c8fbc126137 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,5 +1,9 @@ /* ============================================================= - * bootstrap-collapse.js v2.2.1 +<<<<<<< HEAD + * bootstrap-collapse.js v2.1.2 +======= + * bootstrap-collapse.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 88592b3afd6e8eda23d3f838aa1286d9d4f648d7..fdc34dc1090b30290dce850c00205b342d410a82 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,5 +1,9 @@ /* ============================================================ +<<<<<<< HEAD * bootstrap-dropdown.js v2.2.1 +======= + * bootstrap-dropdown.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -80,7 +84,10 @@ isActive = $parent.hasClass('open') - if (!isActive || (isActive && e.keyCode == 27)) return $this.click() + if (!isActive || (isActive && e.keyCode == 27)) { + if(e.keyCode == 27) $('a[data-toggle=dropdown]', $parent)[0].focus(); + return $this.click() + } $items = $('[role=menu] li:not(.divider) a', $parent) @@ -95,6 +102,9 @@ $items .eq(index) .focus() + + // console.log(e.keyCode) + } } @@ -145,4 +155,4 @@ .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) -}(window.jQuery); \ No newline at end of file +}(window.jQuery); diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index e267a66e21e0a3aa8b1ff8968b484b27e3155e69..0569cab1d5b480deb18158f66383a43e15b2c824 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,5 +1,9 @@ /* ========================================================= - * bootstrap-modal.js v2.2.1 +<<<<<<< HEAD + * bootstrap-modal.js v2.1.2 +======= + * bootstrap-modal.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 0afe7ec3b2b0c6c103f4efd7463920ed163f0b79..6c6630c0215a70a99deb8da2ec74ee75e7dc1631 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,5 +1,9 @@ /* =========================================================== - * bootstrap-popover.js v2.2.1 +<<<<<<< HEAD + * bootstrap-popover.js v2.1.2 +======= + * bootstrap-popover.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 3ffda2ebe71be02bb572d3ebba71e194fda2d70a..8cc56ca1515f3e6660715a29fca179653f899e1c 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,5 +1,9 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.2.1 +<<<<<<< HEAD + * bootstrap-scrollspy.js v2.1.2 +======= + * bootstrap-scrollspy.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index df950350c6bcd20e3fa558105bdd0480b4a1248a..25cc68cb35e34fe74e2510a2d67e4ccb3733b9a6 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,5 +1,9 @@ /* ======================================================== - * bootstrap-tab.js v2.2.1 +<<<<<<< HEAD + * bootstrap-tab.js v2.1.2 +======= + * bootstrap-tab.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index de923f7b3edc22e3a7a7a2b8b16d17b8284b289c..8f2a176278a195aa9790ad608ca51343222f4654 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,5 +1,9 @@ /* =========================================================== - * bootstrap-tooltip.js v2.2.1 +<<<<<<< HEAD + * bootstrap-tooltip.js v2.1.2 +======= + * bootstrap-tooltip.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -273,4 +277,4 @@ , html: false } -}(window.jQuery); \ No newline at end of file +}(window.jQuery); diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 23973edb418a0b6521569baa160ccbbe168b4b17..a2e3c7779e7ee283e14c885c700e6a22f3785da9 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,5 +1,9 @@ /* =================================================== - * bootstrap-transition.js v2.2.1 +<<<<<<< HEAD + * bootstrap-transition.js v2.1.2 +======= + * bootstrap-transition.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 2f3dc274f991085766c16d5c8e06153ffdf426bd..033ecbd15484218698d1bb35172315bd7de3758f 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,5 +1,9 @@ /* ============================================================= - * bootstrap-typeahead.js v2.2.1 +<<<<<<< HEAD + * bootstrap-typeahead.js v2.1.2 +======= + * bootstrap-typeahead.js v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/less/bootstrap.less b/less/bootstrap.less index 14bb3f0444fec773d71fd90c7fcee6bc95a4f2be..7a4ef2618f404b7d3b5db3edcebb5a90058f1194 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,9 @@ /*! - * Bootstrap v2.2.1 +<<<<<<< HEAD + * Bootstrap v2.1.2 +======= + * Bootstrap v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/less/button-groups.less b/less/button-groups.less index 46837e628a86156721253e70e7dcee9d68823866..8c3b9ff045797822c418ad00c60c577d5e330950 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -58,41 +58,25 @@ // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match .btn-group > .btn:first-child { margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + .border-top-left-radius(@baseBorderRadius); + .border-bottom-left-radius(@baseBorderRadius); } // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + .border-top-right-radius(@baseBorderRadius); + .border-bottom-right-radius(@baseBorderRadius); } // Reset corners for large buttons .btn-group > .btn.large:first-child { margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; + .border-top-left-radius(@borderRadiusLarge); + .border-bottom-left-radius(@borderRadiusLarge); } .btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; + .border-top-right-radius(@borderRadiusLarge); + .border-bottom-right-radius(@borderRadiusLarge); } // On hover/focus/active, bring the proper btn to front @@ -229,14 +213,14 @@ margin-top: -1px; } .btn-group-vertical .btn:first-child { - .border-radius(4px 4px 0 0); + .border-radius(@baseBorderRadius @baseBorderRadius 0 0); } .btn-group-vertical .btn:last-child { - .border-radius(0 0 4px 4px); + .border-radius(0 0 @baseBorderRadius @baseBorderRadius); } .btn-group-vertical .btn-large:first-child { - .border-radius(6px 6px 0 0); + .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0); } .btn-group-vertical .btn-large:last-child { - .border-radius(0 0 6px 6px); + .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge); } diff --git a/less/buttons.less b/less/buttons.less index 63f2d86c8ff505a10d470e3a604e16411b898432..e0afbed96be7136ae538bc0bef7e1fa713757a62 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -14,7 +14,6 @@ margin-bottom: 0; // For input.btn font-size: @baseFontSize; line-height: @baseLineHeight; - *line-height: @baseLineHeight; text-align: center; vertical-align: middle; cursor: pointer; @@ -30,8 +29,6 @@ &:hover { color: @grayDark; text-decoration: none; - background-color: darken(@white, 10%); - *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */ background-position: 0 -15px; // transition is only when going to hover, otherwise the background @@ -47,8 +44,6 @@ // Active state &.active, &:active { - background-color: darken(@white, 10%); - background-color: darken(@white, 15%) e("\9"); background-image: none; outline: 0; .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); @@ -58,7 +53,6 @@ &.disabled, &[disabled] { cursor: default; - background-color: darken(@white, 10%); background-image: none; .opacity(65); .box-shadow(none); diff --git a/less/code.less b/less/code.less index 5495b15ec956eb7ab3571737602e341523e9546a..ea1e749ae219d85e9bd5593d776d2025f0e0ebfe 100644 --- a/less/code.less +++ b/less/code.less @@ -19,6 +19,7 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } // Blocks of code diff --git a/less/dropdowns.less b/less/dropdowns.less index 26ca0f9ea89b077f6ff21551157f5f5d11969858..95fd16a31f8b0eb98fabe18fdad0362c33886f44 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -162,15 +162,17 @@ .dropdown-submenu { position: relative; } +<<<<<<< HEAD + +======= +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 // Default dropdowns .dropdown-submenu > .dropdown-menu { top: 0; left: 100%; margin-top: -6px; margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; + .border-radius(0 6px 6px 6px); } .dropdown-submenu:hover > .dropdown-menu { display: block; @@ -182,9 +184,13 @@ bottom: 0; margin-top: 0; margin-bottom: -2px; +<<<<<<< HEAD -webkit-border-radius: 5px 5px 5px 0; -moz-border-radius: 5px 5px 5px 0; border-radius: 5px 5px 5px 0; +======= + .border-radius(5px 5px 5px 0); +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 } // Caret to indicate there is a submenu @@ -215,9 +221,7 @@ > .dropdown-menu { left: -100%; margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; + .border-radius(6px 0 6px 6px); } } @@ -232,6 +236,7 @@ // Typeahead // --------- .typeahead { + z-index: 1051; margin-top: 2px; // give it some space to breathe .border-radius(@baseBorderRadius); } diff --git a/less/forms.less b/less/forms.less index e142f2ac378e5d9ef534948e7fe0dc93a51e51ae..f1f7d3e6490405d922fdc22f86d39aceb58ee6b1 100644 --- a/less/forms.less +++ b/less/forms.less @@ -138,7 +138,6 @@ input[type="checkbox"] { *margin-top: 0; /* IE7 */ margin-top: 1px \9; /* IE8-9 */ line-height: normal; - cursor: pointer; } // Reset width of input images, buttons, radios, checkboxes @@ -311,11 +310,14 @@ textarea[class*="span"], // Redeclare the fluid grid collapse since we undo the float for inputs .row-fluid .controls-row [class*="span"] { float: left; +<<<<<<< HEAD +======= } // Explicity set top padding on all checkboxes/radios, not just first-child .controls-row .checkbox[class*="span"], .controls-row .radio[class*="span"] { padding-top: 5px; +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 } @@ -367,9 +369,9 @@ input[type="checkbox"][readonly] { // HTML5 invalid states // Shares styles with the .control-group.error above -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; &:focus { @@ -463,7 +465,8 @@ select:focus:required:invalid { border: 1px solid #ccc; } .add-on, - .btn { + .btn, + .btn-group > .dropdown-toggle { vertical-align: top; .border-radius(0); } @@ -490,7 +493,7 @@ select:focus:required:invalid { select, .uneditable-input { .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); - + .btn-group .btn { + + .btn-group .btn:last-child { .border-radius(0 @inputBorderRadius @inputBorderRadius 0); } } @@ -500,7 +503,8 @@ select:focus:required:invalid { margin-left: -1px; } .add-on:last-child, - .btn:last-child { + .btn:last-child, + .btn-group:last-child > .dropdown-toggle { .border-radius(0 @inputBorderRadius @inputBorderRadius 0); } } diff --git a/less/labels-badges.less b/less/labels-badges.less index d118a0190eba325c13616e60bb8efe3dfff72355..9c3a40bfbf8231b4310990e708ddc4296579a1ea 100644 --- a/less/labels-badges.less +++ b/less/labels-badges.less @@ -27,6 +27,14 @@ .border-radius(9px); } +// Empty labels/badges collapse +.label, +.badge { + &:empty { + display: none; + } +} + // Hover state, but only for links a { &.label:hover, diff --git a/less/mixins.less b/less/mixins.less index 98aa2b8a5838fbf16b0d3640fb4ef1f14c3b7be3..b734bab2dc4c589dad2492b73107b960c2fdd3f6 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -163,7 +163,7 @@ // Mixin for form field states .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { // Set the text color - > label, + .control-label, .help-block, .help-inline { color: @textColor; diff --git a/less/modals.less b/less/modals.less index 90b86670f4980ac27f3449606d5e6d6e1a550edf..fbc48590883fa51cd24d6aa78353b8d8ccd1018f 100644 --- a/less/modals.less +++ b/less/modals.less @@ -23,11 +23,11 @@ // Base modal .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: @zindexModal; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: @white; border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); @@ -42,7 +42,7 @@ .transition(e('opacity .3s linear, top .3s ease-out')); top: -25%; } - &.fade.in { top: 50%; } + &.fade.in { top: 10%; } } .modal-header { padding: 9px 15px; diff --git a/less/navbar.less b/less/navbar.less index f69e048994682e68ddcc679849c5d57d8ab862c4..b5673d4f1857c34b1560c2d0680256b1de4b6d49 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -10,7 +10,6 @@ .navbar { overflow: visible; margin-bottom: @baseLineHeight; - color: @navbarText; // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar *position: relative; @@ -67,6 +66,7 @@ .navbar-text { margin-bottom: 0; line-height: @navbarHeight; + color: @navbarText; } // Janky solution for now to account for links outside the .nav @@ -123,7 +123,7 @@ } .input-append, .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left input { margin-top: 0; // remove the margin on top since it's on the parent @@ -202,7 +202,11 @@ .navbar-fixed-top, .navbar-static-top { .navbar-inner { +<<<<<<< HEAD + .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)"); +======= .box-shadow(~"0 1px 10px rgba(0,0,0,.1)"); +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 } } @@ -210,7 +214,11 @@ .navbar-fixed-bottom { bottom: 0; .navbar-inner { +<<<<<<< HEAD + .box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)"); +======= .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)"); +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 } } @@ -379,7 +387,6 @@ // ------------------------- .navbar-inverse { - color: @navbarInverseText; .navbar-inner { #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); @@ -395,6 +402,14 @@ } } + .brand { + color: @navbarInverseBrandColor; + } + + .navbar-text { + color: @navbarInverseText; + } + .nav > li > a:focus, .nav > li > a:hover { background-color: @navbarInverseLinkBackgroundHover; @@ -470,6 +485,3 @@ } } - - - diff --git a/less/popovers.less b/less/popovers.less index a4c4bb0e07b9993603247723c1ab5a5907914c51..4a36db4e8de64a0ff8c6b20aaf8aa24372ec0050 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -20,12 +20,14 @@ .border-radius(6px); .box-shadow(0 5px 10px rgba(0,0,0,.2)); + // Overrides for proper insertion + white-space: normal; + // Offset the popover to account for the popover arrow &.top { margin-top: -10px; } &.right { margin-left: 10px; } &.bottom { margin-top: 10px; } &.left { margin-left: -10px; } - } .popover-title { diff --git a/less/reset.less b/less/reset.less index 2abdee46243e03d4dee533d4157e63ac0a956b41..6ec3f5fd7eb9b7e975319455e38db14a0d45635a 100644 --- a/less/reset.less +++ b/less/reset.less @@ -1,5 +1,5 @@ // -// Modals +// Reset CSS // Adapted from http://github.com/necolas/normalize.css // -------------------------------------------------- @@ -122,10 +122,18 @@ input[type="submit"] { -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. } +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} input[type="search"] { // Appearance in Safari/Chrome - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; + .box-sizing(content-box); -webkit-appearance: textfield; } input[type="search"]::-webkit-search-decoration, @@ -136,3 +144,73 @@ textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } + + +// Printing +// ------------------------- +// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css + +@media print { + + * { + text-shadow: none !important; + color: #000 !important; // Black prints faster: h5bp.com/s + background: transparent !important; + box-shadow: none !important; + } + + a, + a:visited { + text-decoration: underline; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + // Don't show links for images, or javascript/internal links + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + + thead { + display: table-header-group; // h5bp.com/t + } + + tr, + img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + @page { + margin: 0.5cm; + } + + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + + h2, + h3 { + page-break-after: avoid; + } +} \ No newline at end of file diff --git a/less/responsive.less b/less/responsive.less index aa28baaec6480b889e7a1be13949f219d8327efd..6ca190f08a2692f2dd11ed937b89e443ea0784fd 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,5 +1,9 @@ /*! - * Bootstrap Responsive v2.2.1 +<<<<<<< HEAD + * Bootstrap Responsive v2.1.2 +======= + * Bootstrap Responsive v2.2.2 +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/less/tables.less b/less/tables.less index 3f2c7f783bd727c415b8dcb4e85a40ec538625ec..124e0ba1b4d1646c2b245c827d17ba6eb04cd2cb 100644 --- a/less/tables.less +++ b/less/tables.less @@ -91,49 +91,51 @@ table { // For first th or td in the first row in the first thead or tbody thead:first-child tr:first-child th:first-child, tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + .border-top-left-radius(@baseBorderRadius); } thead:first-child tr:first-child th:last-child, tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + .border-top-right-radius(@baseBorderRadius); } - // For first th or td in the first row in the first thead or tbody + // For first th or td in the last row in the last thead or tbody thead:last-child tr:last-child th:first-child, tbody:last-child tr:last-child td:first-child, tfoot:last-child tr:last-child td:first-child { - .border-radius(0 0 0 4px); - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; + .border-bottom-left-radius(@baseBorderRadius); } thead:last-child tr:last-child th:last-child, tbody:last-child tr:last-child td:last-child, tfoot:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; + .border-bottom-right-radius(@baseBorderRadius); } + // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot + tfoot + tbody:last-child tr:last-child td:first-child { + .border-bottom-left-radius(0); + } + tfoot + tbody:last-child tr:last-child td:last-child { + .border-bottom-right-radius(0); + } + + // Special fixes to round the left border on the first td/th caption + thead tr:first-child th:first-child, caption + tbody tr:first-child td:first-child, colgroup + thead tr:first-child th:first-child, colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + .border-top-left-radius(@baseBorderRadius); } caption + thead tr:first-child th:last-child, caption + tbody tr:first-child td:last-child, colgroup + thead tr:first-child th:last-child, colgroup + tbody tr:first-child td:last-child { +<<<<<<< HEAD -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-topright: 4px; +======= + .border-top-right-radius(@baseBorderRadius); +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 } } diff --git a/less/tests/navbar-fixed-top.html b/less/tests/navbar-fixed-top.html index 97b86fdef1a2e3fb79f4b8e701cd2b812289e0fd..c09d6494851e324919bafe61ea96ee73227efa64 100644 --- a/less/tests/navbar-fixed-top.html +++ b/less/tests/navbar-fixed-top.html @@ -42,11 +42,17 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> +<<<<<<< HEAD + <div class="nav-collapse"> +======= <div class="nav-collapse collapse"> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> +<<<<<<< HEAD +======= <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu"> @@ -59,6 +65,7 @@ <li><a href="#">One more separated link</a></li> </ul> </li> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 </ul> <ul class="nav pull-right"> <li><a href="./navbar.html">Default</a></li> diff --git a/less/tests/navbar-static-top.html b/less/tests/navbar-static-top.html index 505ecb6086c7c8204d6d7b365087908d254540ff..0b10a410de1a168da3e75645c26def8096129910 100644 --- a/less/tests/navbar-static-top.html +++ b/less/tests/navbar-static-top.html @@ -44,11 +44,17 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> +<<<<<<< HEAD + <div class="nav-collapse"> +======= <div class="nav-collapse collapse"> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> +<<<<<<< HEAD +======= <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu"> @@ -61,6 +67,7 @@ <li><a href="#">One more separated link</a></li> </ul> </li> +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 </ul> <ul class="nav pull-right"> <li><a href="./navbar.html">Default</a></li> diff --git a/less/tests/navbar.html b/less/tests/navbar.html index c72da71a44ca6459657c8b579f15845ce9e3f4a0..ac11328a0a18c03fd7d2b60de0ee8ce7dcf7d2aa 100644 --- a/less/tests/navbar.html +++ b/less/tests/navbar.html @@ -70,6 +70,11 @@ <li><a href="./navbar-static-top.html">Static top</a></li> <li><a href="./navbar-fixed-top.html">Fixed top</a></li> </ul> + <ul class="nav pull-right"> + <li class="active"><a href="./navbar.html">Default</a></li> + <li><a href="./navbar-static-top.html">Static top</a></li> + <li><a href="./navbar-fixed-top.html">Fixed top</a></li> + </ul> </div><!--/.nav-collapse --> </div> </div> diff --git a/less/type.less b/less/type.less index 3b428e79de6d6e3c13c5873500aa4a13c9c76d64..683a30772614fba24b221439ea45dc959bfd346d 100644 --- a/less/type.less +++ b/less/type.less @@ -20,33 +20,27 @@ p { // Emphasis & misc // ------------------------- -small { - font-size: 85%; // Ex: 14px base font * 85% = about 12px -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -cite { - font-style: normal; -} +// Ex: 14px base font * 85% = about 12px +small { font-size: 85%; } + +strong { font-weight: bold; } +em { font-style: italic; } +cite { font-style: normal; } // Utility classes -.muted { - color: @grayLight; -} -.text-warning { color: @warningText; } +.muted { color: @grayLight; } +a.muted:hover { color: darken(@grayLight, 10%); } + +.text-warning { color: @warningText; } a.text-warning:hover { color: darken(@warningText, 10%); } -.text-error { color: @errorText; } -a.text-error:hover { color: darken(@errorText, 10%); } +.text-error { color: @errorText; } +a.text-error:hover { color: darken(@errorText, 10%); } -.text-info { color: @infoText; } -a.text-info:hover { color: darken(@infoText, 10%); } +.text-info { color: @infoText; } +a.text-info:hover { color: darken(@infoText, 10%); } -.text-success { color: @successText; } +.text-success { color: @successText; } a.text-success:hover { color: darken(@successText, 10%); } @@ -112,12 +106,26 @@ ol ul { li { line-height: @baseLineHeight; } + +// Remove default list styles ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +// Single-line list items +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; + & > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; + } +} + // Description Lists dl { margin-bottom: @baseLineHeight; diff --git a/less/variables.less b/less/variables.less index 3fb5274c3abf4acf2d6ca04bdd21e30c126755bf..de36074fd9f41190da24130c0ce3f9f4a3321205 100644 --- a/less/variables.less +++ b/less/variables.less @@ -68,7 +68,7 @@ @paddingLarge: 11px 19px; // 44px @paddingSmall: 2px 10px; // 26px -@paddingMini: 1px 6px; // 24px +@paddingMini: 0 6px; // 22px @baseBorderRadius: 4px; @borderRadiusLarge: 6px; @@ -126,7 +126,7 @@ @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; -@dropdownLinkColorActive: @dropdownLinkColor; +@dropdownLinkColorActive: @white; @dropdownLinkBackgroundActive: @linkColor; @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; diff --git a/package.json b/package.json index efe95a7fc6550b10115baddc1616ba4f23a966ce..aa75754f2745b9fc5e22ba53760f71b7554460b9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,11 @@ { "name": "bootstrap" , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." - , "version": "2.2.1" +<<<<<<< HEAD + , "version": "2.1.2" +======= + , "version": "2.2.2" +>>>>>>> 8b417c39e7d5b10a1ef54c54c225858857cff5e3 , "keywords": ["bootstrap", "css"] , "homepage": "http://twitter.github.com/bootstrap/" , "author": "Twitter Inc."