From: Mark Otto Date: Sun, 13 Jan 2013 12:26:52 +0000 (-0800) Subject: Merge branch '2.3.0-wip' into 3.0.0-wip X-Git-Tag: v3.0.0-rc1~820 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d8d5c783815d83bddc6969052f1600c45246d57;p=thirdparty%2Fbootstrap.git Merge branch '2.3.0-wip' into 3.0.0-wip Conflicts: Makefile README.md component.json docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/assets/js/bootstrap-affix.js docs/assets/js/bootstrap-alert.js docs/assets/js/bootstrap-button.js docs/assets/js/bootstrap-carousel.js docs/assets/js/bootstrap-collapse.js docs/assets/js/bootstrap-dropdown.js docs/assets/js/bootstrap-modal.js docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap-scrollspy.js docs/assets/js/bootstrap-tab.js docs/assets/js/bootstrap-tooltip.js docs/assets/js/bootstrap-transition.js docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/components.html docs/css.html docs/examples/fluid.html docs/extend.html docs/getting-started.html docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/extend.mustache docs/templates/pages/getting-started.mustache docs/templates/pages/index.mustache docs/templates/pages/javascript.mustache js/bootstrap-affix.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-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-tooltip.js js/bootstrap-transition.js js/bootstrap-typeahead.js less/bootstrap.less less/buttons.less less/forms.less less/navbar.less less/popovers.less less/responsive-767px-max.less less/responsive.less less/tables.less less/tooltip.less less/type.less less/variables.less package.json --- 7d8d5c783815d83bddc6969052f1600c45246d57 diff --cc Makefile index 0e01355456,620af52590..18f77c2254 --- a/Makefile +++ b/Makefile @@@ -59,19 -62,46 +59,46 @@@ clean # recess & uglifyjs are required # - bootstrap: - mkdir -p bootstrap/fonts - mkdir -p bootstrap/css -bootstrap: bootstrap-img bootstrap-css bootstrap-js ++bootstrap: bootstrap-fonts bootstrap-css bootstrap-js + + + # + # JS COMPILE + # + bootstrap-js: bootstrap/js/*.js + + bootstrap/js/*.js: js/*.js mkdir -p bootstrap/js - cp fonts/* bootstrap/fonts/ - ./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css - ./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css 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 > bootstrap/js/bootstrap.js ./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js + # + # CSS COMPLILE + # + + bootstrap-css: bootstrap/css/*.css + + bootstrap/css/*.css: less/*.less + mkdir -p bootstrap/css + ./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css + ./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + ./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css + ./node_modules/.bin/recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css + + # -# IMAGES ++# FONTS + # + -bootstrap-img: bootstrap/img/* ++bootstrap-fonts: bootstrap/fonts/* + -bootstrap/img/*: img/* - mkdir -p bootstrap/img - cp img/* bootstrap/img/ ++bootstrap/fonts/*: fonts/* ++ mkdir -p bootstrap/fonts ++ cp fonts/* bootstrap/fonts/ + + # # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) # @@@ -93,4 -123,4 +120,4 @@@ watch watchr -e "watch('less/.*\.less') { system 'make' }" - .PHONY: docs watch gh-pages -.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js ++.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js diff --cc README.md index 2714cdf9ee,4f74a15f2b..786453e0e5 --- a/README.md +++ b/README.md @@@ -1,4 -1,8 +1,8 @@@ - # [Twitter Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) + + + + -# [Bootstrap v2.3.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) ++# [Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). diff --cc docs/assets/css/bootstrap.css index 10a05729c9,57325606f2..dc4ff24a02 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -1439,33 -2053,51 +1439,39 @@@ table } .table-bordered thead:first-child tr:first-child > th:first-child, - .table-bordered tbody:first-child tr:first-child > td:first-child { + .table-bordered tbody:first-child tr:first-child > td:first-child, + .table-bordered tbody:first-child tr:first-child > th:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .table-bordered thead:first-child tr:first-child > th:last-child, - .table-bordered tbody:first-child tr:first-child > td:last-child { + .table-bordered tbody:first-child tr:first-child > td:last-child, + .table-bordered tbody:first-child tr:first-child > th:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } .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 { + .table-bordered tbody:last-child tr:last-child > th:first-child, + .table-bordered tfoot:last-child tr:last-child > td:first-child, + .table-bordered tfoot:last-child tr:last-child > th:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } .table-bordered thead:last-child tr:last-child > th:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child, - .table-bordered tfoot:last-child tr:last-child > td:last-child { + .table-bordered tbody:last-child tr:last-child > th:last-child, + .table-bordered tfoot:last-child tr:last-child > td:last-child, + .table-bordered tfoot:last-child tr:last-child > th:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 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:first-child { + border-bottom-left-radius: 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 tfoot + tbody:last-child tr:last-child > td:last-child { + border-bottom-right-radius: 0; } .table-bordered caption + thead tr:first-child th:first-child, @@@ -1499,690 -2137,714 +1505,690 @@@ table th[class*="span"] margin-left: 0; } - .table tbody tr.success td { -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; ++.table tbody tr.success > td { + background-color: #dff0d8; +} + - .table tbody tr.error td { ++.table tbody tr.error > td { + background-color: #f2dede; +} + - .table tbody tr.warning td { ++.table tbody tr.warning > td { + background-color: #fcf8e3; +} + - .table tbody tr.info td { ++.table tbody tr.info > td { + background-color: #d9edf7; +} + - .table-hover tbody tr.success:hover td { ++.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; +} + - .table-hover tbody tr.error:hover td { ++.table-hover tbody tr.error:hover > td { + background-color: #ebcccc; +} + - .table-hover tbody tr.warning:hover td { ++.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; +} + - .table-hover tbody tr.info:hover td { ++.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; +@font-face { + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + src: url('../fonts/glyphiconshalflings-regular.eot'); + src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); } -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; +[class^="glyphicon-"]:before { + font-family: 'Glyphicons Halflings'; + font-style: normal; + line-height: 1; } -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; +.glyphicon-glass:before { + content: "\e001"; } -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; +.glyphicon-music:before { + content: "\e002"; } -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; +.glyphicon-search:before { + content: "\e003"; } -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; +.glyphicon-envelope:before { + content: "\2709"; } -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; +.glyphicon-heart:before { + content: "\e005"; } -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; +.glyphicon-star:before { + content: "\e006"; } -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; +.glyphicon-star-empty:before { + content: "\e007"; } -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; +.glyphicon-user:before { + content: "\e008"; } -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; +.glyphicon-film:before { + content: "\e009"; } -.table tbody tr.success > td { - background-color: #dff0d8; +.glyphicon-th-large:before { + content: "\e010"; } -.table tbody tr.error > td { - background-color: #f2dede; +.glyphicon-th:before { + content: "\e011"; } -.table tbody tr.warning > td { - background-color: #fcf8e3; +.glyphicon-th-list:before { + content: "\e012"; } -.table tbody tr.info > td { - background-color: #d9edf7; +.glyphicon-ok:before { + content: "\e013"; } -.table-hover tbody tr.success:hover > td { - background-color: #d0e9c6; +.glyphicon-remove:before { + content: "\e014"; } -.table-hover tbody tr.error:hover > td { - background-color: #ebcccc; +.glyphicon-zoom-in:before { + content: "\e015"; } -.table-hover tbody tr.warning:hover > td { - background-color: #faf2cc; +.glyphicon-zoom-out:before { + content: "\e016"; } -.table-hover tbody tr.info:hover > td { - background-color: #c4e3f3; +.glyphicon-off:before { + content: "\e017"; } -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; +.glyphicon-signal:before { + content: "\e018"; } -/* White icons with optional class, or on hover/active states of certain elements */ +.glyphicon-cog:before { + content: "\e019"; +} -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); +.glyphicon-trash:before { + content: "\e020"; } -.icon-glass { - background-position: 0 0; +.glyphicon-home:before { + content: "\e021"; } -.icon-music { - background-position: -24px 0; +.glyphicon-file:before { + content: "\e022"; } -.icon-search { - background-position: -48px 0; +.glyphicon-time:before { + content: "\e023"; } -.icon-envelope { - background-position: -72px 0; +.glyphicon-road:before { + content: "\e024"; } -.icon-heart { - background-position: -96px 0; +.glyphicon-download-alt:before { + content: "\e025"; } -.icon-star { - background-position: -120px 0; +.glyphicon-download:before { + content: "\e026"; } -.icon-star-empty { - background-position: -144px 0; +.glyphicon-upload:before { + content: "\e027"; } -.icon-user { - background-position: -168px 0; +.glyphicon-inbox:before { + content: "\e028"; } -.icon-film { - background-position: -192px 0; +.glyphicon-play-circle:before { + content: "\e029"; } -.icon-th-large { - background-position: -216px 0; +.glyphicon-repeat:before { + content: "\e030"; } -.icon-th { - background-position: -240px 0; +.glyphicon-refresh:before { + content: "\e031"; } -.icon-th-list { - background-position: -264px 0; +.glyphicon-list-alt:before { + content: "\e032"; } -.icon-ok { - background-position: -288px 0; +.glyphicon-lock:before { + content: "\e033"; } -.icon-remove { - background-position: -312px 0; +.glyphicon-flag:before { + content: "\e034"; } -.icon-zoom-in { - background-position: -336px 0; +.glyphicon-headphones:before { + content: "\e035"; } -.icon-zoom-out { - background-position: -360px 0; +.glyphicon-volume-off:before { + content: "\e036"; } -.icon-off { - background-position: -384px 0; +.glyphicon-volume-down:before { + content: "\e037"; } -.icon-signal { - background-position: -408px 0; +.glyphicon-volume-up:before { + content: "\e038"; } -.icon-cog { - background-position: -432px 0; +.glyphicon-qrcode:before { + content: "\e039"; } -.icon-trash { - background-position: -456px 0; +.glyphicon-barcode:before { + content: "\e040"; } -.icon-home { - background-position: 0 -24px; +.glyphicon-tag:before { + content: "\e041"; } -.icon-file { - background-position: -24px -24px; +.glyphicon-tags:before { + content: "\e042"; } -.icon-time { - background-position: -48px -24px; +.glyphicon-book:before { + content: "\e043"; } -.icon-road { - background-position: -72px -24px; +.glyphicon-bookmark:before { + content: "\e044"; } -.icon-download-alt { - background-position: -96px -24px; +.glyphicon-print:before { + content: "\e045"; } -.icon-download { - background-position: -120px -24px; +.glyphicon-camera:before { + content: "\e046"; } -.icon-upload { - background-position: -144px -24px; +.glyphicon-font:before { + content: "\e047"; } -.icon-inbox { - background-position: -168px -24px; +.glyphicon-bold:before { + content: "\e048"; } -.icon-play-circle { - background-position: -192px -24px; +.glyphicon-italic:before { + content: "\e049"; } -.icon-repeat { - background-position: -216px -24px; +.glyphicon-text-height:before { + content: "\e050"; } -.icon-refresh { - background-position: -240px -24px; +.glyphicon-text-width:before { + content: "\e051"; } -.icon-list-alt { - background-position: -264px -24px; +.glyphicon-align-left:before { + content: "\e052"; } -.icon-lock { - background-position: -287px -24px; +.glyphicon-align-center:before { + content: "\e053"; } -.icon-flag { - background-position: -312px -24px; +.glyphicon-align-right:before { + content: "\e054"; } -.icon-headphones { - background-position: -336px -24px; +.glyphicon-align-justify:before { + content: "\e055"; } -.icon-volume-off { - background-position: -360px -24px; +.glyphicon-list:before { + content: "\e056"; } -.icon-volume-down { - background-position: -384px -24px; +.glyphicon-indent-left:before { + content: "\e057"; } -.icon-volume-up { - background-position: -408px -24px; +.glyphicon-indent-right:before { + content: "\e058"; } -.icon-qrcode { - background-position: -432px -24px; +.glyphicon-facetime-video:before { + content: "\e059"; } -.icon-barcode { - background-position: -456px -24px; +.glyphicon-picture:before { + content: "\e060"; } -.icon-tag { - background-position: 0 -48px; +.glyphicon-pencil:before { + content: "\270f"; } -.icon-tags { - background-position: -25px -48px; +.glyphicon-map-marker:before { + content: "\e062"; } -.icon-book { - background-position: -48px -48px; +.glyphicon-adjust:before { + content: "\e063"; } -.icon-bookmark { - background-position: -72px -48px; +.glyphicon-tint:before { + content: "\e064"; } -.icon-print { - background-position: -96px -48px; +.glyphicon-edit:before { + content: "\e065"; } -.icon-camera { - background-position: -120px -48px; +.glyphicon-share:before { + content: "\e066"; } -.icon-font { - background-position: -144px -48px; +.glyphicon-check:before { + content: "\e067"; } -.icon-bold { - background-position: -167px -48px; +.glyphicon-move:before { + content: "\e068"; } -.icon-italic { - background-position: -192px -48px; +.glyphicon-step-backward:before { + content: "\e069"; } -.icon-text-height { - background-position: -216px -48px; +.glyphicon-fast-backward:before { + content: "\e070"; } -.icon-text-width { - background-position: -240px -48px; +.glyphicon-backward:before { + content: "\e071"; } -.icon-align-left { - background-position: -264px -48px; +.glyphicon-play:before { + content: "\e072"; } -.icon-align-center { - background-position: -288px -48px; +.glyphicon-pause:before { + content: "\e073"; } -.icon-align-right { - background-position: -312px -48px; +.glyphicon-stop:before { + content: "\e074"; } -.icon-align-justify { - background-position: -336px -48px; +.glyphicon-forward:before { + content: "\e075"; } -.icon-list { - background-position: -360px -48px; +.glyphicon-fast-forward:before { + content: "\e076"; } -.icon-indent-left { - background-position: -384px -48px; +.glyphicon-step-forward:before { + content: "\e077"; } -.icon-indent-right { - background-position: -408px -48px; +.glyphicon-eject:before { + content: "\e078"; } -.icon-facetime-video { - background-position: -432px -48px; +.glyphicon-chevron-left:before { + content: "\e079"; } -.icon-picture { - background-position: -456px -48px; +.glyphicon-chevron-right:before { + content: "\e080"; } -.icon-pencil { - background-position: 0 -72px; +.glyphicon-plus-sign:before { + content: "\e081"; } -.icon-map-marker { - background-position: -24px -72px; +.glyphicon-minus-sign:before { + content: "\e082"; } -.icon-adjust { - background-position: -48px -72px; +.glyphicon-remove-sign:before { + content: "\e083"; } -.icon-tint { - background-position: -72px -72px; +.glyphicon-ok-sign:before { + content: "\e084"; } -.icon-edit { - background-position: -96px -72px; +.glyphicon-question-sign:before { + content: "\e085"; } -.icon-share { - background-position: -120px -72px; +.glyphicon-info-sign:before { + content: "\e086"; } -.icon-check { - background-position: -144px -72px; +.glyphicon-screenshot:before { + content: "\e087"; } -.icon-move { - background-position: -168px -72px; +.glyphicon-remove-circle:before { + content: "\e088"; } -.icon-step-backward { - background-position: -192px -72px; +.glyphicon-ok-circle:before { + content: "\e089"; } -.icon-fast-backward { - background-position: -216px -72px; +.glyphicon-ban-circle:before { + content: "\e090"; } -.icon-backward { - background-position: -240px -72px; +.glyphicon-arrow-left:before { + content: "\e091"; } -.icon-play { - background-position: -264px -72px; +.glyphicon-arrow-right:before { + content: "\e092"; } -.icon-pause { - background-position: -288px -72px; +.glyphicon-arrow-up:before { + content: "\e093"; } -.icon-stop { - background-position: -312px -72px; +.glyphicon-arrow-down:before { + content: "\e094"; } -.icon-forward { - background-position: -336px -72px; +.glyphicon-share-alt:before { + content: "\e095"; } -.icon-fast-forward { - background-position: -360px -72px; +.glyphicon-resize-full:before { + content: "\e096"; } -.icon-step-forward { - background-position: -384px -72px; +.glyphicon-resize-small:before { + content: "\e097"; } -.icon-eject { - background-position: -408px -72px; +.glyphicon-plus:before { + content: "\002b"; } -.icon-chevron-left { - background-position: -432px -72px; +.glyphicon-minus:before { + content: "\2212"; } -.icon-chevron-right { - background-position: -456px -72px; +.glyphicon-asterisk:before { + content: "\002a"; } -.icon-plus-sign { - background-position: 0 -96px; +.glyphicon-exclamation-sign:before { + content: "\e101"; } -.icon-minus-sign { - background-position: -24px -96px; +.glyphicon-gift:before { + content: "\e102"; } -.icon-remove-sign { - background-position: -48px -96px; +.glyphicon-leaf:before { + content: "\e103"; } -.icon-ok-sign { - background-position: -72px -96px; +.glyphicon-fire:before { + content: "\e104"; } -.icon-question-sign { - background-position: -96px -96px; +.glyphicon-eye-open:before { + content: "\e105"; } -.icon-info-sign { - background-position: -120px -96px; +.glyphicon-eye-close:before { + content: "\e106"; } -.icon-screenshot { - background-position: -144px -96px; +.glyphicon-warning-sign:before { + content: "\e107"; } -.icon-remove-circle { - background-position: -168px -96px; +.glyphicon-plane:before { + content: "\e108"; } -.icon-ok-circle { - background-position: -192px -96px; +.glyphicon-calendar:before { + content: "\e109"; } -.icon-ban-circle { - background-position: -216px -96px; +.glyphicon-random:before { + content: "\e110"; } -.icon-arrow-left { - background-position: -240px -96px; +.glyphicon-comment:before { + content: "\e111"; } -.icon-arrow-right { - background-position: -264px -96px; +.glyphicon-magnet:before { + content: "\e112"; } -.icon-arrow-up { - background-position: -289px -96px; +.glyphicon-chevron-up:before { + content: "\e113"; } -.icon-arrow-down { - background-position: -312px -96px; +.glyphicon-chevron-down:before { + content: "\e114"; } -.icon-share-alt { - background-position: -336px -96px; +.glyphicon-retweet:before { + content: "\e115"; } -.icon-resize-full { - background-position: -360px -96px; +.glyphicon-shopping-cart:before { + content: "\e116"; } -.icon-resize-small { - background-position: -384px -96px; +.glyphicon-folder-close:before { + content: "\e117"; } -.icon-plus { - background-position: -408px -96px; +.glyphicon-folder-open:before { + content: "\e118"; } -.icon-minus { - background-position: -433px -96px; +.glyphicon-resize-vertical:before { + content: "\e119"; } -.icon-asterisk { - background-position: -456px -96px; +.glyphicon-resize-horizontal:before { + content: "\e120"; } -.icon-exclamation-sign { - background-position: 0 -120px; +.glyphicon-hdd:before { + content: "\e121"; } -.icon-gift { - background-position: -24px -120px; +.glyphicon-bullhorn:before { + content: "\e122"; } -.icon-leaf { - background-position: -48px -120px; +.glyphicon-bell:before { + content: "\e123"; } -.icon-fire { - background-position: -72px -120px; +.glyphicon-certificate:before { + content: "\e124"; } -.icon-eye-open { - background-position: -96px -120px; +.glyphicon-thumbs-up:before { + content: "\e125"; } -.icon-eye-close { - background-position: -120px -120px; +.glyphicon-thumbs-down:before { + content: "\e126"; } -.icon-warning-sign { - background-position: -144px -120px; +.glyphicon-hand-right:before { + content: "\e127"; } -.icon-plane { - background-position: -168px -120px; +.glyphicon-hand-left:before { + content: "\e128"; } -.icon-calendar { - background-position: -192px -120px; +.glyphicon-hand-up:before { + content: "\e129"; } -.icon-random { - width: 16px; - background-position: -216px -120px; +.glyphicon-hand-down:before { + content: "\e130"; } -.icon-comment { - background-position: -240px -120px; +.glyphicon-circle-arrow-right:before { + content: "\e131"; } -.icon-magnet { - background-position: -264px -120px; +.glyphicon-circle-arrow-left:before { + content: "\e132"; } -.icon-chevron-up { - background-position: -288px -120px; +.glyphicon-circle-arrow-up:before { + content: "\e133"; } -.icon-chevron-down { - background-position: -313px -119px; +.glyphicon-circle-arrow-down:before { + content: "\e134"; } -.icon-retweet { - background-position: -336px -120px; +.glyphicon-globe:before { + content: "\e135"; } -.icon-shopping-cart { - background-position: -360px -120px; +.glyphicon-wrench:before { + content: "\e136"; } -.icon-folder-close { - background-position: -384px -120px; +.glyphicon-tasks:before { + content: "\e137"; } -.icon-folder-open { - width: 16px; - background-position: -408px -120px; +.glyphicon-filter:before { + content: "\e138"; } -.icon-resize-vertical { - background-position: -432px -119px; +.glyphicon-briefcase:before { + content: "\e139"; } -.icon-resize-horizontal { - background-position: -456px -118px; +.glyphicon-fullscreen:before { + content: "\e140"; } -.icon-hdd { - background-position: 0 -144px; +.glyphicon-dashboard:before { + content: "\e141"; } -.icon-bullhorn { - background-position: -24px -144px; +.glyphicon-paperclip:before { + content: "\e142"; } -.icon-bell { - background-position: -48px -144px; +.glyphicon-heart-empty:before { + content: "\e143"; } -.icon-certificate { - background-position: -72px -144px; +.glyphicon-link:before { + content: "\e144"; } -.icon-thumbs-up { - background-position: -96px -144px; +.glyphicon-phone:before { + content: "\e145"; } -.icon-thumbs-down { - background-position: -120px -144px; +.glyphicon-pushpin:before { + content: "\e146"; } -.icon-hand-right { - background-position: -144px -144px; +.glyphicon-euro:before { + content: "\20ac"; } -.icon-hand-left { - background-position: -168px -144px; +.glyphicon-usd:before { + content: "\e148"; } -.icon-hand-up { - background-position: -192px -144px; +.glyphicon-gbp:before { + content: "\e149"; } -.icon-hand-down { - background-position: -216px -144px; +.glyphicon-sort:before { + content: "\e150"; } -.icon-circle-arrow-right { - background-position: -240px -144px; +.glyphicon-sort-by-alphabet:before { + content: "\e151"; } -.icon-circle-arrow-left { - background-position: -264px -144px; +.glyphicon-sort-by-alphabet-alt:before { + content: "\e152"; } -.icon-circle-arrow-up { - background-position: -288px -144px; +.glyphicon-sort-by-order:before { + content: "\e153"; } -.icon-circle-arrow-down { - background-position: -312px -144px; +.glyphicon-sort-by-order-alt:before { + content: "\e154"; } -.icon-globe { - background-position: -336px -144px; +.glyphicon-sort-by-attributes:before { + content: "\e155"; } -.icon-wrench { - background-position: -360px -144px; +.glyphicon-sort-by-attributes-alt:before { + content: "\e156"; } -.icon-tasks { - background-position: -384px -144px; +.glyphicon-unchecked:before { + content: "\e157"; } -.icon-filter { - background-position: -408px -144px; +.glyphicon-expand:before { + content: "\e158"; } -.icon-briefcase { - background-position: -432px -144px; +.glyphicon-collapse:before { + content: "\e159"; } -.icon-fullscreen { - background-position: -456px -144px; +.glyphicon-collapse-top:before { + content: "\e160"; } .dropup, @@@ -3963,9 -5346,15 +3970,13 @@@ fieldset[disabled] .navbar-inverse .btn line-height: 18px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } + .popover-title:empty { + display: none; + } + .popover-content { padding: 9px 14px; } diff --cc docs/assets/js/bootstrap.js index 22925ee713,bd123341de..f0a03ee823 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@@ -1311,8 -1343,9 +1343,9 @@@ return this } - }(window.jQuery);/* =========================================================== + }(window.jQuery); + /* =========================================================== - * bootstrap-popover.js v2.2.2 + * bootstrap-popover.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. diff --cc docs/components.html index c0dfd6cc79,bbb0dc39d4..17ea3a0d46 --- a/docs/components.html +++ b/docs/components.html @@@ -158,7 -161,110 +158,26 @@@ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> ... </ul> + + +

Disabled menu options

+

Add .disabled to a <li> in the dropdown to disable the link.

+
+
+ +
+
+ 
+ <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
+   <li><a tabindex="-1" href="#">Regular link</a></li>
+   <li><a tabindex="-1" href="#">Disabled link</a></li>
+   <li><a tabindex="-1" href="#">Another link</a></li>
+ </ul>
- -

Sub menus on dropdowns

-

Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add .dropdown-submenu to any li in an existing dropdown menu for automatic styling.

-
- -
-

Default

-
- -
-
- -
-

Dropup

-
- -
-
- -
-

Left submenu

-
- -
-
- -
-
 -<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
 -  ...
 -  <li class="dropdown-submenu">
 -    <a tabindex="-1" href="#">More options</a>
 -    <ul class="dropdown-menu">
 -      ...
 -    </ul>
 -  </li>
 -</ul>
 -
- diff --cc docs/getting-started.html index 3bd33e8a57,c798670f88..99996c4f82 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@@ -237,17 -240,17 +237,17 @@@

5. Examples

Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.

-