From: Mark Otto Date: Thu, 20 Dec 2012 08:02:52 +0000 (-0800) Subject: Merge branch '2.2.3' into 3.0.0-wip X-Git-Tag: v3.0.0-rc1~836^2~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72f13e2870c431f132b9f63cc9d7e87bc6810425;p=thirdparty%2Fbootstrap.git Merge branch '2.2.3' 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/assets/js/bootstrap.min.js docs/index.html docs/templates/pages/base-css.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/responsive.less less/type.less package.json --- 72f13e2870c431f132b9f63cc9d7e87bc6810425 diff --cc Makefile index 218e156795,b048c22882..0e01355456 --- a/Makefile +++ b/Makefile @@@ -16,10 -18,11 +16,10 @@@ build @jshint js/*.js --config js/.jshintrc @jshint js/tests/unit/*.js --config js/.jshintrc @echo "Running JSHint on javascript... ${CHECK} Done" - @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} - @./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} @echo "Compiling LESS with Recess... ${CHECK} Done" @node docs/build - @cp img/* docs/assets/img/ + @cp fonts/* docs/assets/fonts/ @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/ @echo "Compiling documentation... ${CHECK} Done" @@@ -60,14 -63,16 +60,14 @@@ clean # bootstrap: - mkdir -p bootstrap/img + mkdir -p bootstrap/fonts mkdir -p bootstrap/css mkdir -p bootstrap/js - cp img/* bootstrap/img/ + cp fonts/* bootstrap/fonts/ - recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css - recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.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 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 - uglifyjs bootstrap/js/bootstrap.js -nc > bootstrap/js/bootstrap.min.tmp.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 diff --cc docs/assets/css/bootstrap-responsive.css index 398c81c521,ee4722b523..0000000000 deleted file mode 100644,100644 --- a/docs/assets/css/bootstrap-responsive.css +++ /dev/null @@@ -1,1092 -1,1092 +1,0 @@@ --/*! - * Bootstrap Responsive v3.0.0 - * Bootstrap Responsive v2.2.3 -- * -- * Copyright 2012 Twitter, Inc -- * Licensed under the Apache License v2.0 -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Designed and built with all the love in the world @twitter by @mdo and @fat. -- */ - - @-ms-viewport { - width: device-width; - } -- --.clearfix { -- *zoom: 1; --} -- --.clearfix:before, --.clearfix:after { -- display: table; -- line-height: 0; -- content: ""; --} -- --.clearfix:after { -- clear: both; --} -- --.hide-text { -- font: 0/0 a; -- color: transparent; -- text-shadow: none; -- background-color: transparent; -- border: 0; --} -- --.input-block-level { -- display: block; -- width: 100%; -- min-height: 30px; -- -webkit-box-sizing: border-box; -- -moz-box-sizing: border-box; -- box-sizing: border-box; -} - -@-ms-viewport { - width: device-width; --} -- --.hidden { -- display: none; -- visibility: hidden; --} -- --.visible-phone { -- display: none !important; --} -- --.visible-tablet { -- display: none !important; --} -- --.hidden-desktop { -- display: none !important; --} -- --.visible-desktop { -- display: inherit !important; --} -- --@media (min-width: 768px) and (max-width: 979px) { -- .hidden-desktop { -- display: inherit !important; -- } -- .visible-desktop { -- display: none !important ; -- } -- .visible-tablet { -- display: inherit !important; -- } -- .hidden-tablet { -- display: none !important; -- } --} -- --@media (max-width: 767px) { -- .hidden-desktop { -- display: inherit !important; -- } -- .visible-desktop { -- display: none !important; -- } -- .visible-phone { -- display: inherit !important; -- } -- .hidden-phone { -- display: none !important; -- } --} -- --@media (min-width: 1200px) { -- .row { -- margin-left: -30px; -- *zoom: 1; -- } -- .row:before, -- .row:after { -- display: table; -- line-height: 0; -- content: ""; -- } -- .row:after { -- clear: both; -- } -- [class*="span"] { -- float: left; -- min-height: 1px; -- margin-left: 30px; -- } -- .container, -- .navbar-static-top .container, -- .navbar-fixed-top .container, -- .navbar-fixed-bottom .container { -- width: 1170px; -- } -- .span12 { -- width: 1170px; -- } -- .span11 { -- width: 1070px; -- } -- .span10 { -- width: 970px; -- } -- .span9 { -- width: 870px; -- } -- .span8 { -- width: 770px; -- } -- .span7 { -- width: 670px; -- } -- .span6 { -- width: 570px; -- } -- .span5 { -- width: 470px; -- } -- .span4 { -- width: 370px; -- } -- .span3 { -- width: 270px; -- } -- .span2 { -- width: 170px; -- } -- .span1 { -- width: 70px; -- } -- .offset12 { -- margin-left: 1230px; -- } -- .offset11 { -- margin-left: 1130px; -- } -- .offset10 { -- margin-left: 1030px; -- } -- .offset9 { -- margin-left: 930px; -- } -- .offset8 { -- margin-left: 830px; -- } -- .offset7 { -- margin-left: 730px; -- } -- .offset6 { -- margin-left: 630px; -- } -- .offset5 { -- margin-left: 530px; -- } -- .offset4 { -- margin-left: 430px; -- } -- .offset3 { -- margin-left: 330px; -- } -- .offset2 { -- margin-left: 230px; -- } -- .offset1 { -- margin-left: 130px; -- } -- .row-fluid { -- width: 100%; -- *zoom: 1; -- } -- .row-fluid:before, -- .row-fluid:after { -- display: table; -- line-height: 0; -- content: ""; -- } -- .row-fluid:after { -- clear: both; -- } -- .row-fluid [class*="span"] { -- display: block; -- float: left; -- width: 100%; -- min-height: 30px; -- margin-left: 2.564102564102564%; -- *margin-left: 2.5109110747408616%; -- -webkit-box-sizing: border-box; -- -moz-box-sizing: border-box; -- box-sizing: border-box; -- } -- .row-fluid [class*="span"]:first-child { -- margin-left: 0; -- } -- .row-fluid .controls-row [class*="span"] + [class*="span"] { -- margin-left: 2.564102564102564%; -- } -- .row-fluid .span12 { -- width: 100%; -- *width: 99.94680851063829%; -- } -- .row-fluid .span11 { -- width: 91.45299145299145%; -- *width: 91.39979996362975%; -- } -- .row-fluid .span10 { -- width: 82.90598290598291%; -- *width: 82.8527914166212%; -- } -- .row-fluid .span9 { -- width: 74.35897435897436%; -- *width: 74.30578286961266%; -- } -- .row-fluid .span8 { -- width: 65.81196581196582%; -- *width: 65.75877432260411%; -- } -- .row-fluid .span7 { -- width: 57.26495726495726%; -- *width: 57.21176577559556%; -- } -- .row-fluid .span6 { -- width: 48.717948717948715%; -- *width: 48.664757228587014%; -- } -- .row-fluid .span5 { -- width: 40.17094017094017%; -- *width: 40.11774868157847%; -- } -- .row-fluid .span4 { -- width: 31.623931623931625%; -- *width: 31.570740134569924%; -- } -- .row-fluid .span3 { -- width: 23.076923076923077%; -- *width: 23.023731587561375%; -- } -- .row-fluid .span2 { -- width: 14.52991452991453%; -- *width: 14.476723040552828%; -- } -- .row-fluid .span1 { -- width: 5.982905982905983%; -- *width: 5.929714493544281%; -- } -- .row-fluid .offset12 { -- margin-left: 105.12820512820512%; -- *margin-left: 105.02182214948171%; -- } -- .row-fluid .offset12:first-child { -- margin-left: 102.56410256410257%; -- *margin-left: 102.45771958537915%; -- } -- .row-fluid .offset11 { -- margin-left: 96.58119658119658%; -- *margin-left: 96.47481360247316%; -- } -- .row-fluid .offset11:first-child { -- margin-left: 94.01709401709402%; -- *margin-left: 93.91071103837061%; -- } -- .row-fluid .offset10 { -- margin-left: 88.03418803418803%; -- *margin-left: 87.92780505546462%; -- } -- .row-fluid .offset10:first-child { -- margin-left: 85.47008547008548%; -- *margin-left: 85.36370249136206%; -- } -- .row-fluid .offset9 { -- margin-left: 79.48717948717949%; -- *margin-left: 79.38079650845607%; -- } -- .row-fluid .offset9:first-child { -- margin-left: 76.92307692307693%; -- *margin-left: 76.81669394435352%; -- } -- .row-fluid .offset8 { -- margin-left: 70.94017094017094%; -- *margin-left: 70.83378796144753%; -- } -- .row-fluid .offset8:first-child { -- margin-left: 68.37606837606839%; -- *margin-left: 68.26968539734497%; -- } -- .row-fluid .offset7 { -- margin-left: 62.393162393162385%; -- *margin-left: 62.28677941443899%; -- } -- .row-fluid .offset7:first-child { -- margin-left: 59.82905982905982%; -- *margin-left: 59.72267685033642%; -- } -- .row-fluid .offset6 { -- margin-left: 53.84615384615384%; -- *margin-left: 53.739770867430444%; -- } -- .row-fluid .offset6:first-child { -- margin-left: 51.28205128205128%; -- *margin-left: 51.175668303327875%; -- } -- .row-fluid .offset5 { -- margin-left: 45.299145299145295%; -- *margin-left: 45.1927623204219%; -- } -- .row-fluid .offset5:first-child { -- margin-left: 42.73504273504273%; -- *margin-left: 42.62865975631933%; -- } -- .row-fluid .offset4 { -- margin-left: 36.75213675213675%; -- *margin-left: 36.645753773413354%; -- } -- .row-fluid .offset4:first-child { -- margin-left: 34.18803418803419%; -- *margin-left: 34.081651209310785%; -- } -- .row-fluid .offset3 { -- margin-left: 28.205128205128204%; -- *margin-left: 28.0987452264048%; -- } -- .row-fluid .offset3:first-child { -- margin-left: 25.641025641025642%; -- *margin-left: 25.53464266230224%; -- } -- .row-fluid .offset2 { -- margin-left: 19.65811965811966%; -- *margin-left: 19.551736679396257%; -- } -- .row-fluid .offset2:first-child { -- margin-left: 17.094017094017094%; -- *margin-left: 16.98763411529369%; -- } -- .row-fluid .offset1 { -- margin-left: 11.11111111111111%; -- *margin-left: 11.004728132387708%; -- } -- .row-fluid .offset1:first-child { -- margin-left: 8.547008547008547%; -- *margin-left: 8.440625568285142%; -- } -- input, -- textarea, -- .uneditable-input { -- margin-left: 0; -- } -- .controls-row [class*="span"] + [class*="span"] { -- margin-left: 30px; -- } -- input.span12, -- textarea.span12, -- .uneditable-input.span12 { -- width: 1156px; -- } -- input.span11, -- textarea.span11, -- .uneditable-input.span11 { -- width: 1056px; -- } -- input.span10, -- textarea.span10, -- .uneditable-input.span10 { -- width: 956px; -- } -- input.span9, -- textarea.span9, -- .uneditable-input.span9 { -- width: 856px; -- } -- input.span8, -- textarea.span8, -- .uneditable-input.span8 { -- width: 756px; -- } -- input.span7, -- textarea.span7, -- .uneditable-input.span7 { -- width: 656px; -- } -- input.span6, -- textarea.span6, -- .uneditable-input.span6 { -- width: 556px; -- } -- input.span5, -- textarea.span5, -- .uneditable-input.span5 { -- width: 456px; -- } -- input.span4, -- textarea.span4, -- .uneditable-input.span4 { -- width: 356px; -- } -- input.span3, -- textarea.span3, -- .uneditable-input.span3 { -- width: 256px; -- } -- input.span2, -- textarea.span2, -- .uneditable-input.span2 { -- width: 156px; -- } -- input.span1, -- textarea.span1, -- .uneditable-input.span1 { -- width: 56px; -- } -- .thumbnails { -- margin-left: -30px; -- } -- .thumbnails > li { -- margin-left: 30px; -- } -- .row-fluid .thumbnails { -- margin-left: 0; -- } --} -- --@media (min-width: 768px) and (max-width: 979px) { -- .row { -- margin-left: -20px; -- *zoom: 1; -- } -- .row:before, -- .row:after { -- display: table; -- line-height: 0; -- content: ""; -- } -- .row:after { -- clear: both; -- } -- [class*="span"] { -- float: left; -- min-height: 1px; -- margin-left: 20px; -- } -- .container, -- .navbar-static-top .container, -- .navbar-fixed-top .container, -- .navbar-fixed-bottom .container { -- width: 724px; -- } -- .span12 { -- width: 724px; -- } -- .span11 { -- width: 662px; -- } -- .span10 { -- width: 600px; -- } -- .span9 { -- width: 538px; -- } -- .span8 { -- width: 476px; -- } -- .span7 { -- width: 414px; -- } -- .span6 { -- width: 352px; -- } -- .span5 { -- width: 290px; -- } -- .span4 { -- width: 228px; -- } -- .span3 { -- width: 166px; -- } -- .span2 { -- width: 104px; -- } -- .span1 { -- width: 42px; -- } -- .offset12 { -- margin-left: 764px; -- } -- .offset11 { -- margin-left: 702px; -- } -- .offset10 { -- margin-left: 640px; -- } -- .offset9 { -- margin-left: 578px; -- } -- .offset8 { -- margin-left: 516px; -- } -- .offset7 { -- margin-left: 454px; -- } -- .offset6 { -- margin-left: 392px; -- } -- .offset5 { -- margin-left: 330px; -- } -- .offset4 { -- margin-left: 268px; -- } -- .offset3 { -- margin-left: 206px; -- } -- .offset2 { -- margin-left: 144px; -- } -- .offset1 { -- margin-left: 82px; -- } -- .row-fluid { -- width: 100%; -- *zoom: 1; -- } -- .row-fluid:before, -- .row-fluid:after { -- display: table; -- line-height: 0; -- content: ""; -- } -- .row-fluid:after { -- clear: both; -- } -- .row-fluid [class*="span"] { -- display: block; -- float: left; -- width: 100%; -- min-height: 30px; -- margin-left: 2.7624309392265194%; -- *margin-left: 2.709239449864817%; -- -webkit-box-sizing: border-box; -- -moz-box-sizing: border-box; -- box-sizing: border-box; -- } -- .row-fluid [class*="span"]:first-child { -- margin-left: 0; -- } -- .row-fluid .controls-row [class*="span"] + [class*="span"] { -- margin-left: 2.7624309392265194%; -- } -- .row-fluid .span12 { -- width: 100%; -- *width: 99.94680851063829%; -- } -- .row-fluid .span11 { -- width: 91.43646408839778%; -- *width: 91.38327259903608%; -- } -- .row-fluid .span10 { -- width: 82.87292817679558%; -- *width: 82.81973668743387%; -- } -- .row-fluid .span9 { -- width: 74.30939226519337%; -- *width: 74.25620077583166%; -- } -- .row-fluid .span8 { -- width: 65.74585635359117%; -- *width: 65.69266486422946%; -- } -- .row-fluid .span7 { -- width: 57.18232044198895%; -- *width: 57.12912895262725%; -- } -- .row-fluid .span6 { -- width: 48.61878453038674%; -- *width: 48.56559304102504%; -- } -- .row-fluid .span5 { -- width: 40.05524861878453%; -- *width: 40.00205712942283%; -- } -- .row-fluid .span4 { -- width: 31.491712707182323%; -- *width: 31.43852121782062%; -- } -- .row-fluid .span3 { -- width: 22.92817679558011%; -- *width: 22.87498530621841%; -- } -- .row-fluid .span2 { -- width: 14.3646408839779%; -- *width: 14.311449394616199%; -- } -- .row-fluid .span1 { -- width: 5.801104972375691%; -- *width: 5.747913483013988%; -- } -- .row-fluid .offset12 { -- margin-left: 105.52486187845304%; -- *margin-left: 105.41847889972962%; -- } -- .row-fluid .offset12:first-child { -- margin-left: 102.76243093922652%; -- *margin-left: 102.6560479605031%; -- } -- .row-fluid .offset11 { -- margin-left: 96.96132596685082%; -- *margin-left: 96.8549429881274%; -- } -- .row-fluid .offset11:first-child { -- margin-left: 94.1988950276243%; -- *margin-left: 94.09251204890089%; -- } -- .row-fluid .offset10 { -- margin-left: 88.39779005524862%; -- *margin-left: 88.2914070765252%; -- } -- .row-fluid .offset10:first-child { -- margin-left: 85.6353591160221%; -- *margin-left: 85.52897613729868%; -- } -- .row-fluid .offset9 { -- margin-left: 79.8342541436464%; -- *margin-left: 79.72787116492299%; -- } -- .row-fluid .offset9:first-child { -- margin-left: 77.07182320441989%; -- *margin-left: 76.96544022569647%; -- } -- .row-fluid .offset8 { -- margin-left: 71.2707182320442%; -- *margin-left: 71.16433525332079%; -- } -- .row-fluid .offset8:first-child { -- margin-left: 68.50828729281768%; -- *margin-left: 68.40190431409427%; -- } -- .row-fluid .offset7 { -- margin-left: 62.70718232044199%; -- *margin-left: 62.600799341718584%; -- } -- .row-fluid .offset7:first-child { -- margin-left: 59.94475138121547%; -- *margin-left: 59.838368402492065%; -- } -- .row-fluid .offset6 { -- margin-left: 54.14364640883978%; -- *margin-left: 54.037263430116376%; -- } -- .row-fluid .offset6:first-child { -- margin-left: 51.38121546961326%; -- *margin-left: 51.27483249088986%; -- } -- .row-fluid .offset5 { -- margin-left: 45.58011049723757%; -- *margin-left: 45.47372751851417%; -- } -- .row-fluid .offset5:first-child { -- margin-left: 42.81767955801105%; -- *margin-left: 42.71129657928765%; -- } -- .row-fluid .offset4 { -- margin-left: 37.01657458563536%; -- *margin-left: 36.91019160691196%; -- } -- .row-fluid .offset4:first-child { -- margin-left: 34.25414364640884%; -- *margin-left: 34.14776066768544%; -- } -- .row-fluid .offset3 { -- margin-left: 28.45303867403315%; -- *margin-left: 28.346655695309746%; -- } -- .row-fluid .offset3:first-child { -- margin-left: 25.69060773480663%; -- *margin-left: 25.584224756083227%; -- } -- .row-fluid .offset2 { -- margin-left: 19.88950276243094%; -- *margin-left: 19.783119783707537%; -- } -- .row-fluid .offset2:first-child { -- margin-left: 17.12707182320442%; -- *margin-left: 17.02068884448102%; -- } -- .row-fluid .offset1 { -- margin-left: 11.32596685082873%; -- *margin-left: 11.219583872105325%; -- } -- .row-fluid .offset1:first-child { -- margin-left: 8.56353591160221%; -- *margin-left: 8.457152932878806%; -- } -- input, -- textarea, -- .uneditable-input { -- margin-left: 0; -- } -- .controls-row [class*="span"] + [class*="span"] { -- margin-left: 20px; -- } -- input.span12, -- textarea.span12, -- .uneditable-input.span12 { -- width: 710px; -- } -- input.span11, -- textarea.span11, -- .uneditable-input.span11 { -- width: 648px; -- } -- input.span10, -- textarea.span10, -- .uneditable-input.span10 { -- width: 586px; -- } -- input.span9, -- textarea.span9, -- .uneditable-input.span9 { -- width: 524px; -- } -- input.span8, -- textarea.span8, -- .uneditable-input.span8 { -- width: 462px; -- } -- input.span7, -- textarea.span7, -- .uneditable-input.span7 { -- width: 400px; -- } -- input.span6, -- textarea.span6, -- .uneditable-input.span6 { -- width: 338px; -- } -- input.span5, -- textarea.span5, -- .uneditable-input.span5 { -- width: 276px; -- } -- input.span4, -- textarea.span4, -- .uneditable-input.span4 { -- width: 214px; -- } -- input.span3, -- textarea.span3, -- .uneditable-input.span3 { -- width: 152px; -- } -- input.span2, -- textarea.span2, -- .uneditable-input.span2 { -- width: 90px; -- } -- input.span1, -- textarea.span1, -- .uneditable-input.span1 { -- width: 28px; -- } --} -- --@media (max-width: 767px) { -- body { -- padding-right: 20px; -- padding-left: 20px; -- } -- .navbar-fixed-top, -- .navbar-fixed-bottom, -- .navbar-static-top { -- margin-right: -20px; -- margin-left: -20px; -- } -- .container-fluid { -- padding: 0; -- } -- .dl-horizontal dt { -- float: none; -- width: auto; -- clear: none; -- text-align: left; -- } -- .dl-horizontal dd { -- margin-left: 0; -- } -- .container { -- width: auto; -- } -- .row-fluid { -- width: 100%; -- } -- .row, -- .thumbnails { -- margin-left: 0; -- } -- .thumbnails > li { -- float: none; -- margin-left: 0; -- } -- [class*="span"], -- .uneditable-input[class*="span"], -- .row-fluid [class*="span"] { -- display: block; -- float: none; -- width: 100%; -- margin-left: 0; -- -webkit-box-sizing: border-box; -- -moz-box-sizing: border-box; -- box-sizing: border-box; -- } -- .span12, -- .row-fluid .span12 { -- width: 100%; -- -webkit-box-sizing: border-box; -- -moz-box-sizing: border-box; -- box-sizing: border-box; -- } -- .row-fluid [class*="offset"]:first-child { -- margin-left: 0; -- } -- .input-large, -- .input-xlarge, -- .input-xxlarge, -- input[class*="span"], -- select[class*="span"], -- textarea[class*="span"], -- .uneditable-input { -- display: block; -- width: 100%; -- min-height: 30px; -- -webkit-box-sizing: border-box; -- -moz-box-sizing: border-box; -- box-sizing: border-box; -- } -- .input-prepend input, -- .input-append input, -- .input-prepend input[class*="span"], -- .input-append input[class*="span"] { -- display: inline-block; -- width: auto; -- } -- .controls-row [class*="span"] + [class*="span"] { -- margin-left: 0; -- } -- .modal { -- position: fixed; -- top: 20px; -- right: 20px; -- left: 20px; -- width: auto; -- margin: 0; -- } -- .modal.fade { -- top: -100px; -- } -- .modal.fade.in { -- top: 20px; -- } --} -- --@media (max-width: 480px) { -- .nav-collapse { -- -webkit-transform: translate3d(0, 0, 0); -- } -- .page-header h1 small { -- display: block; -- line-height: 20px; -- } -- input[type="checkbox"], -- input[type="radio"] { -- border: 1px solid #ccc; -- } -- .form-horizontal .control-label { -- float: none; -- width: auto; -- padding-top: 0; -- text-align: left; -- } -- .form-horizontal .controls { -- margin-left: 0; -- } -- .form-horizontal .control-list { -- padding-top: 0; -- } -- .form-horizontal .form-actions { -- padding-right: 10px; -- padding-left: 10px; -- } -- .media .pull-left, -- .media .pull-right { -- display: block; -- float: none; -- margin-bottom: 10px; -- } -- .media-object { -- margin-right: 0; -- margin-left: 0; -- } -- .modal { -- top: 10px; -- right: 10px; -- left: 10px; -- } -- .modal-header .close { -- padding: 10px; -- margin: -10px; -- } -- .carousel-caption { -- position: static; -- } --} -- --@media (max-width: 979px) { -- body { -- padding-top: 0; -- } -- .navbar-fixed-top, -- .navbar-fixed-bottom { -- position: static; -- } -- .navbar-fixed-top { -- margin-bottom: 20px; -- } -- .navbar-fixed-bottom { -- margin-top: 20px; -- } -- .navbar-fixed-top .navbar-inner, -- .navbar-fixed-bottom .navbar-inner { -- padding: 5px; -- } -- .navbar .container { -- width: auto; -- padding: 0; -- } -- .navbar .brand { -- padding-right: 10px; -- padding-left: 10px; -- margin: 0 0 0 -5px; -- } -- .nav-collapse { -- clear: both; -- } -- .nav-collapse .nav { -- float: none; -- margin: 0 0 10px; -- } -- .nav-collapse .nav > li { -- float: none; -- } -- .nav-collapse .nav > li > a { -- margin-bottom: 2px; -- } -- .nav-collapse .nav > .divider-vertical { -- display: none; -- } -- .nav-collapse .nav .nav-header { -- color: #777777; -- text-shadow: none; -- } -- .nav-collapse .nav > li > a, -- .nav-collapse .dropdown-menu a { -- padding: 9px 15px; -- font-weight: bold; -- color: #777777; -- -webkit-border-radius: 3px; -- -moz-border-radius: 3px; -- border-radius: 3px; -- } -- .nav-collapse .btn { -- padding: 4px 10px 4px; -- font-weight: normal; -- -webkit-border-radius: 4px; -- -moz-border-radius: 4px; -- border-radius: 4px; -- } -- .nav-collapse .dropdown-menu li + li a { -- margin-bottom: 2px; -- } -- .nav-collapse .nav > li > a:hover, -- .nav-collapse .dropdown-menu a:hover { -- background-color: #f2f2f2; -- } -- .navbar-inverse .nav-collapse .nav > li > a, -- .navbar-inverse .nav-collapse .dropdown-menu a { -- color: #999999; -- } -- .navbar-inverse .nav-collapse .nav > li > a:hover, -- .navbar-inverse .nav-collapse .dropdown-menu a:hover { -- background-color: #111111; -- } -- .nav-collapse.in .btn-group { -- padding: 0; -- margin-top: 5px; -- } -- .nav-collapse .dropdown-menu { -- position: static; -- top: auto; -- left: auto; -- display: none; -- float: none; -- max-width: none; -- padding: 0; -- margin: 0 15px; -- background-color: transparent; -- border: none; -- -webkit-border-radius: 0; -- -moz-border-radius: 0; -- border-radius: 0; -- -webkit-box-shadow: none; -- -moz-box-shadow: none; -- box-shadow: none; -- } -- .nav-collapse .open > .dropdown-menu { -- display: block; -- } -- .nav-collapse .dropdown-menu:before, -- .nav-collapse .dropdown-menu:after { -- display: none; -- } -- .nav-collapse .dropdown-menu .divider { -- display: none; -- } -- .nav-collapse .nav > li > .dropdown-menu:before, -- .nav-collapse .nav > li > .dropdown-menu:after { -- display: none; -- } -- .nav-collapse .navbar-form, -- .nav-collapse .navbar-search { -- float: none; -- padding: 10px 15px; -- margin: 10px 0; -- border-top: 1px solid #f2f2f2; -- border-bottom: 1px solid #f2f2f2; -- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -- } -- .navbar-inverse .nav-collapse .navbar-form, -- .navbar-inverse .nav-collapse .navbar-search { -- border-top-color: #111111; -- border-bottom-color: #111111; -- } -- .navbar .nav-collapse .nav.pull-right { -- float: none; -- margin-left: 0; -- } -- .nav-collapse, -- .nav-collapse.collapse { -- height: 0; -- overflow: hidden; -- } -- .navbar .btn-navbar { -- display: block; -- } -- .navbar-static .navbar-inner { -- padding-right: 10px; -- padding-left: 10px; -- } --} -- --@media (min-width: 980px) { -- .nav-collapse.collapse { -- height: auto !important; -- overflow: visible !important; -- } --} diff --cc docs/assets/css/bootstrap.css index b88f21cd73,9b77c47b87..1a8f313f88 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -4852,23 -5968,31 +4855,48 @@@ a.badge:hover filter: alpha(opacity=90); } +.carousel-control .control { + position: absolute; + top: 50%; + z-index: 5; + display: block; + margin-top: -35px; + margin-left: 30px; + font-size: 80px; + font-weight: 100; + color: #fff; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); +} + +.carousel-control.right .control { + margin-left: 70px; +} + + .carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; + } + + .carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; + } + + .carousel-indicators .active { + background-color: #fff; + } + .carousel-caption { position: absolute; right: 0; @@@ -4958,516 -6065,3 +4986,520 @@@ .affix { position: fixed; } + +.control-block-level { + display: block; + width: 100%; +} + ++@-ms-viewport { ++ width: device-width; ++} ++ +.hidden { + display: none; + visibility: hidden; +} + +.visible-phone { + display: none !important; +} + +.visible-tablet { + display: none !important; +} + +.hidden-desktop { + display: none !important; +} + +.visible-desktop { + display: inherit !important; +} + +@media (min-width: 768px) and (max-width: 979px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important ; + } + .visible-tablet { + display: inherit !important; + } + .hidden-tablet { + display: none !important; + } +} + +@media (max-width: 767px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important; + } + .visible-phone { + display: inherit !important; + } + .hidden-phone { + display: none !important; + } +} + +@media (min-width: 1200px) { + .container { + max-width: 1170px; + } + .row { + margin-right: -15px; + margin-left: -15px; + } + .row:before, + .row:after { + display: table; + content: " "; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + min-height: 1px; + padding-right: 15px; + padding-left: 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .span12 { + width: 100%; + } + .span11 { + width: 91.66666666666666%; + } + .span10 { + width: 83.33333333333334%; + } + .span9 { + width: 75%; + } + .span8 { + width: 66.66666666666666%; + } + .span7 { + width: 58.333333333333336%; + } + .span6 { + width: 50%; + } + .span5 { + width: 41.66666666666667%; + } + .span4 { + width: 33.33333333333333%; + } + .span3 { + width: 25%; + } + .span2 { + width: 16.666666666666664%; + } + .span1 { + width: 8.333333333333332%; + } + .offset12 { + margin-left: 100%; + } + .offset11 { + margin-left: 91.66666666666666%; + } + .offset10 { + margin-left: 83.33333333333334%; + } + .offset9 { + margin-left: 75%; + } + .offset8 { + margin-left: 66.66666666666666%; + } + .offset7 { + margin-left: 58.333333333333336%; + } + .offset6 { + margin-left: 50%; + } + .offset5 { + margin-left: 41.66666666666667%; + } + .offset4 { + margin-left: 33.33333333333333%; + } + .offset3 { + margin-left: 25%; + } + .offset2 { + margin-left: 16.666666666666664%; + } + .offset1 { + margin-left: 8.333333333333332%; + } +} + +@media (min-width: 768px) and (max-width: 979px) { + .row { + margin-right: -10px; + margin-left: -10px; + } + .row:before, + .row:after { + display: table; + content: " "; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + min-height: 1px; + padding-right: 10px; + padding-left: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .span12 { + width: 100%; + } + .span11 { + width: 91.66666666666666%; + } + .span10 { + width: 83.33333333333334%; + } + .span9 { + width: 75%; + } + .span8 { + width: 66.66666666666666%; + } + .span7 { + width: 58.333333333333336%; + } + .span6 { + width: 50%; + } + .span5 { + width: 41.66666666666667%; + } + .span4 { + width: 33.33333333333333%; + } + .span3 { + width: 25%; + } + .span2 { + width: 16.666666666666664%; + } + .span1 { + width: 8.333333333333332%; + } + .offset12 { + margin-left: 100%; + } + .offset11 { + margin-left: 91.66666666666666%; + } + .offset10 { + margin-left: 83.33333333333334%; + } + .offset9 { + margin-left: 75%; + } + .offset8 { + margin-left: 66.66666666666666%; + } + .offset7 { + margin-left: 58.333333333333336%; + } + .offset6 { + margin-left: 50%; + } + .offset5 { + margin-left: 41.66666666666667%; + } + .offset4 { + margin-left: 33.33333333333333%; + } + .offset3 { + margin-left: 25%; + } + .offset2 { + margin-left: 16.666666666666664%; + } + .offset1 { + margin-left: 8.333333333333332%; + } +} + +@media (max-width: 767px) { + body { + padding-right: 20px; + padding-left: 20px; + } + .navbar-fixed-top, + .navbar-fixed-bottom, + .navbar-static-top { + margin-right: -20px; + margin-left: -20px; + } + .dl-horizontal dt { + float: none; + width: auto; + clear: none; + text-align: left; + } + .dl-horizontal dd { + margin-left: 0; + } + .container { + width: auto; + } + [class*="span"], + .uneditable-input[class*="span"] { + display: block; + float: none; + width: 100%; + margin-left: 0; + } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + } + .input-prepend input, + .input-append input, + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + display: inline-block; + width: auto; + } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 0; + } + .modal { + position: fixed; + top: 20px; + right: 20px; + left: 20px; + width: auto; + margin: 0; + } + .modal.fade { + top: -100px; + } + .modal.fade.in { + top: 20px; + } +} + +@media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } + .page-header h1 small { + display: block; + line-height: 20px; + } + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; + } + .form-horizontal .control-label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .form-horizontal .controls { + margin-left: 0; + } + .form-horizontal .control-list { + padding-top: 0; + } + .form-horizontal .form-actions { + padding-right: 10px; + padding-left: 10px; + } + .media .pull-left, + .media .pull-right { + display: block; + float: none; + margin-bottom: 10px; + } + .media-object { + margin-right: 0; + margin-left: 0; + } + .modal { + top: 10px; + right: 10px; + left: 10px; + } + .modal-header .close { + padding: 10px; + margin: -10px; + } + .carousel-caption { + position: static; + } +} + +@media (max-width: 979px) { + body { + padding-top: 0; + } + .navbar-fixed-top, + .navbar-fixed-bottom { + position: static; + } + .navbar-fixed-top { + margin-bottom: 20px; + } + .navbar-fixed-bottom { + margin-top: 20px; + } + .navbar-fixed-top, + .navbar-fixed-bottom { + padding: 5px; + } + .navbar .container { + width: auto; + padding: 0; + } + .navbar .brand { + padding-right: 10px; + padding-left: 10px; + margin: 0 0 0 -5px; + } + .nav-collapse { + clear: both; + } + .nav-collapse .nav { + float: none; + margin: 0 0 10px; + } + .nav-collapse .nav > li { + float: none; + } + .nav-collapse .nav > li > a { + margin-bottom: 2px; + } + .nav-collapse .nav > .divider-vertical { + display: none; + } + .nav-collapse .nav .nav-header { + color: #777777; + text-shadow: none; + } + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { + padding: 9px 15px; + font-weight: bold; + color: #777777; + border-radius: 3px; + } + .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + border-radius: 4px; + } + .nav-collapse .dropdown-menu li + li a { + margin-bottom: 2px; + } + .nav-collapse .nav > li > a:hover, + .nav-collapse .dropdown-menu a:hover { + background-color: #f2f2f2; + } + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; + } + .navbar-inverse .nav-collapse .nav > li > a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:hover { + background-color: #111111; + } + .nav-collapse.in .btn-group { + padding: 0; + margin-top: 5px; + } + .nav-collapse .dropdown-menu { + position: static; + top: auto; + left: auto; + display: none; + float: none; + max-width: none; + padding: 0; + margin: 0 15px; + background-color: transparent; + border: none; + border-radius: 0; + -webkit-box-shadow: none; + box-shadow: none; + } + .nav-collapse .open > .dropdown-menu { + display: block; + } + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { + display: none; + } + .nav-collapse .dropdown-menu .divider { + display: none; + } + .nav-collapse .nav > li > .dropdown-menu:before, + .nav-collapse .nav > li > .dropdown-menu:after { + display: none; + } + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + float: none; + padding: 10px 15px; + margin: 10px 0; + border-top: 1px solid #f2f2f2; + border-bottom: 1px solid #f2f2f2; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; + } + .navbar .nav-collapse .nav.pull-right { + float: none; + margin-left: 0; + } + .nav-collapse, + .nav-collapse.collapse { + height: 0; + overflow: hidden; + } + .navbar .btn-navbar { + display: block; + } + .navbar-static { + padding-right: 10px; + padding-left: 10px; + } +} + +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; + } +} diff --cc docs/index.html index 62a3ecb355,33b8ff9568..d7dd74ff54 --- a/docs/index.html +++ b/docs/index.html @@@ -83,9 -86,28 +83,7 @@@
  • Extend
    • --
  • - Version 3.0.0 - Version 2.2.3 -
    • - - - - -
    -
    -
    diff --cc docs/javascript.html index d3e780980d,a10360bf3d..26d6021cc6 --- a/docs/javascript.html +++ b/docs/javascript.html @@@ -1673,16 -1676,8 +1678,17 @@@ $('.carousel').carousel(

    Call the affix plugin via JavaScript:

    $('#navbar').affix()
    +

    Methods

    +

    .affix('refresh')

    +

    When using affix in conjunction with adding or removing of elements from the DOM, you'll want to call the refresh method:

    +
     +$('[data-spy="affix"]').each(function () {
 +  $(this).affix('refresh')
 +});
 +

    Options

    Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-offset-top="200".

    ++ diff --cc docs/templates/pages/index.mustache index e5eb6960b9,c3c03b4035..b0eb23bf24 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@@ -7,17 -7,36 +7,15 @@@

    - - - -
    -
    -
    diff --cc docs/templates/pages/javascript.mustache index b55a7c82c1,de79776671..a99e46b940 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@@ -1346,13 -1345,18 +1346,18 @@@ $('#myCollapsible').on('hidden', functi ================================================== -->
    diff --cc less/carousel.less index 264631fad2,b321e5bb5a..e175f94775 --- a/less/carousel.less +++ b/less/carousel.less @@@ -100,27 -103,34 +100,52 @@@ text-decoration: none; .opacity(90); } + + // Toggles + .control { + position: absolute; + top: 50%; + z-index: 5; + display: block; + margin-top: -35px; + margin-left: 30px; + font-size: 80px; + font-weight: 100; + color: #fff; + text-shadow: 0 1px 2px rgba(0,0,0,.6); + } + &.right .control { + margin-left: 70px; + } } + // Carousel indicator pips + // ----------------------------- + .carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; + + li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255,255,255,.25); + border-radius: 5px; + } + .active { + background-color: #fff; + } + } + // Caption for text below images // -----------------------------