From: Dominic Barnes Date: Tue, 28 Feb 2012 04:55:35 +0000 (-0600) Subject: undoing what I suspect are the 'dirty' parts of this commit X-Git-Tag: v2.0.2~78^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d12737719f3750037409de299b4040d3d09dcf0f;p=thirdparty%2Fbootstrap.git undoing what I suspect are the 'dirty' parts of this commit --- diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9141dab432..a61ae844d8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index e62643f063..447a865c8e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -10,8 +10,7 @@ .clearfix { *zoom: 1; } -.clearfix:before, -.clearfix:after { +.clearfix:before, .clearfix:after { display: table; content: ""; } @@ -100,12 +99,10 @@ /* CSS3 spec*/ } - .input-prepend input[class*="span"], - .input-append input[class*="span"] { + .input-prepend input[class*="span"], .input-append input[class*="span"] { width: auto; } - input[type="checkbox"], - input[type="radio"] { + input[type="checkbox"], input[type="radio"] { border: 1px solid #ccc; } .form-horizontal .control-group > label { @@ -154,8 +151,7 @@ .row { margin-left: 0; } - .row > [class*="span"], - .row-fluid > [class*="span"] { + .row > [class*="span"], .row-fluid > [class*="span"] { float: none; display: block; width: auto; @@ -167,8 +163,7 @@ margin-left: -20px; *zoom: 1; } - .row:before, - .row:after { + .row:before, .row:after { display: table; content: ""; } @@ -179,9 +174,7 @@ float: left; margin-left: 20px; } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { + .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 724px; } .span1 { @@ -260,8 +253,7 @@ width: 100%; *zoom: 1; } - .row-fluid:before, - .row-fluid:after { + .row-fluid:before, .row-fluid:after { display: table; content: ""; } @@ -311,69 +303,43 @@ .row-fluid > .span12 { width: 99.999999993%; } - input, - textarea, - .uneditable-input { + input, textarea, .uneditable-input { margin-left: 0; } - input > .span1, - textarea > .span1, - .uneditable-input > .span1 { + input > .span1, textarea > .span1, .uneditable-input > .span1 { width: 32px; } - input > .span2, - textarea > .span2, - .uneditable-input > .span2 { + input > .span2, textarea > .span2, .uneditable-input > .span2 { width: 94px; } - input > .span3, - textarea > .span3, - .uneditable-input > .span3 { + input > .span3, textarea > .span3, .uneditable-input > .span3 { width: 156px; } - input > .span4, - textarea > .span4, - .uneditable-input > .span4 { + input > .span4, textarea > .span4, .uneditable-input > .span4 { width: 218px; } - input > .span5, - textarea > .span5, - .uneditable-input > .span5 { + input > .span5, textarea > .span5, .uneditable-input > .span5 { width: 280px; } - input > .span6, - textarea > .span6, - .uneditable-input > .span6 { + input > .span6, textarea > .span6, .uneditable-input > .span6 { width: 342px; } - input > .span7, - textarea > .span7, - .uneditable-input > .span7 { + input > .span7, textarea > .span7, .uneditable-input > .span7 { width: 404px; } - input > .span8, - textarea > .span8, - .uneditable-input > .span8 { + input > .span8, textarea > .span8, .uneditable-input > .span8 { width: 466px; } - input > .span9, - textarea > .span9, - .uneditable-input > .span9 { + input > .span9, textarea > .span9, .uneditable-input > .span9 { width: 528px; } - input > .span10, - textarea > .span10, - .uneditable-input > .span10 { + input > .span10, textarea > .span10, .uneditable-input > .span10 { width: 590px; } - input > .span11, - textarea > .span11, - .uneditable-input > .span11 { + input > .span11, textarea > .span11, .uneditable-input > .span11 { width: 652px; } - input > .span12, - textarea > .span12, - .uneditable-input > .span12 { + input > .span12, textarea > .span12, .uneditable-input > .span12 { width: 714px; } } @@ -417,8 +383,7 @@ color: #999999; text-shadow: none; } - .navbar .nav > li > a, - .navbar .dropdown-menu a { + .navbar .nav > li > a, .navbar .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -429,8 +394,7 @@ .navbar .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { + .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover { background-color: #222222; } .navbar .dropdown-menu { @@ -451,15 +415,13 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { + .navbar .dropdown-menu:before, .navbar .dropdown-menu:after { display: none; } .navbar .dropdown-menu .divider { display: none; } - .navbar-form, - .navbar-search { + .navbar-form, .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; @@ -496,8 +458,7 @@ margin-left: -30px; *zoom: 1; } - .row:before, - .row:after { + .row:before, .row:after { display: table; content: ""; } @@ -508,9 +469,7 @@ float: left; margin-left: 30px; } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { + .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 1170px; } .span1 { @@ -589,8 +548,7 @@ width: 100%; *zoom: 1; } - .row-fluid:before, - .row-fluid:after { + .row-fluid:before, .row-fluid:after { display: table; content: ""; } @@ -640,69 +598,43 @@ .row-fluid > .span12 { width: 100%; } - input, - textarea, - .uneditable-input { + input, textarea, .uneditable-input { margin-left: 0; } - input > .span1, - textarea > .span1, - .uneditable-input > .span1 { + input > .span1, textarea > .span1, .uneditable-input > .span1 { width: 60px; } - input > .span2, - textarea > .span2, - .uneditable-input > .span2 { + input > .span2, textarea > .span2, .uneditable-input > .span2 { width: 160px; } - input > .span3, - textarea > .span3, - .uneditable-input > .span3 { + input > .span3, textarea > .span3, .uneditable-input > .span3 { width: 260px; } - input > .span4, - textarea > .span4, - .uneditable-input > .span4 { + input > .span4, textarea > .span4, .uneditable-input > .span4 { width: 360px; } - input > .span5, - textarea > .span5, - .uneditable-input > .span5 { + input > .span5, textarea > .span5, .uneditable-input > .span5 { width: 460px; } - input > .span6, - textarea > .span6, - .uneditable-input > .span6 { + input > .span6, textarea > .span6, .uneditable-input > .span6 { width: 560px; } - input > .span7, - textarea > .span7, - .uneditable-input > .span7 { + input > .span7, textarea > .span7, .uneditable-input > .span7 { width: 660px; } - input > .span8, - textarea > .span8, - .uneditable-input > .span8 { + input > .span8, textarea > .span8, .uneditable-input > .span8 { width: 760px; } - input > .span9, - textarea > .span9, - .uneditable-input > .span9 { + input > .span9, textarea > .span9, .uneditable-input > .span9 { width: 860px; } - input > .span10, - textarea > .span10, - .uneditable-input > .span10 { + input > .span10, textarea > .span10, .uneditable-input > .span10 { width: 960px; } - input > .span11, - textarea > .span11, - .uneditable-input > .span11 { + input > .span11, textarea > .span11, .uneditable-input > .span11 { width: 1060px; } - input > .span12, - textarea > .span12, - .uneditable-input > .span12 { + input > .span12, textarea > .span12, .uneditable-input > .span12 { width: 1160px; } .thumbnails { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0416d70a94..e47dbb25fd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -19,9 +19,7 @@ nav, section { display: block; } -audio, -canvas, -video { +audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; @@ -39,12 +37,10 @@ a:focus { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -a:hover, -a:active { +a:hover, a:active { outline: 0; } -sub, -sup { +sub, sup { position: relative; font-size: 75%; line-height: 0; @@ -69,13 +65,11 @@ textarea { font-size: 100%; vertical-align: middle; } -button, -input { +button, input { *overflow: visible; line-height: normal; } -button::-moz-focus-inner, -input::-moz-focus-inner { +button::-moz-focus-inner, input::-moz-focus-inner { padding: 0; border: 0; } @@ -92,8 +86,7 @@ input[type="search"] { -moz-box-sizing: content-box; box-sizing: content-box; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; } textarea { @@ -103,8 +96,7 @@ textarea { .clearfix { *zoom: 1; } -.clearfix:before, -.clearfix:after { +.clearfix:before, .clearfix:after { display: table; content: ""; } @@ -131,8 +123,7 @@ a:hover { margin-left: -20px; *zoom: 1; } -.row:before, -.row:after { +.row:before, .row:after { display: table; content: ""; } @@ -143,9 +134,7 @@ a:hover { float: left; margin-left: 20px; } -.container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { +.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; } .span1 { @@ -224,8 +213,7 @@ a:hover { width: 100%; *zoom: 1; } -.row-fluid:before, -.row-fluid:after { +.row-fluid:before, .row-fluid:after { display: table; content: ""; } @@ -280,8 +268,7 @@ a:hover { margin-right: auto; *zoom: 1; } -.container:before, -.container:after { +.container:before, .container:after { display: table; content: ""; } @@ -293,8 +280,7 @@ a:hover { padding-right: 20px; *zoom: 1; } -.container-fluid:before, -.container-fluid:after { +.container-fluid:before, .container-fluid:after { display: table; content: ""; } @@ -358,9 +344,7 @@ h3 { h3 small { font-size: 14px; } -h4, -h5, -h6 { +h4, h5, h6 { line-height: 18px; } h4 { @@ -385,8 +369,7 @@ h6 { .page-header h1 { line-height: 1; } -ul, -ol { +ul, ol { padding: 0; margin: 0 0 9px 25px; } @@ -405,16 +388,14 @@ ol { li { line-height: 18px; } -ul.unstyled, -ol.unstyled { +ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } dl { margin-bottom: 18px; } -dt, -dd { +dt, dd { line-height: 18px; } dt { @@ -423,45 +404,6 @@ dt { dd { margin-left: 9px; } -dl.horizontal dt { - float: left; - clear: left; - width: 120px; - text-align: right; -} -dl.horizontal dd { - margin-left: 130px; -} -dl.horizontal.horizontal-mini dt { - width: 50px; -} -dl.horizontal.horizontal-mini dd { - margin-left: 60px; -} -dl.horizontal.horizontal-small dt { - width: 90px; -} -dl.horizontal.horizontal-small dd { - margin-left: 100px; -} -dl.horizontal.horizontal-large dt { - width: 140px; -} -dl.horizontal.horizontal-large dd { - margin-left: 150px; -} -dl.horizontal.horizontal-xlarge dt { - width: 170px; -} -dl.horizontal.horizontal-xlarge dd { - margin-left: 180px; -} -dl.horizontal.horizontal-xxlarge dt { - width: 190px; -} -dl.horizontal.horizontal-xxlarge dd { - margin-left: 200px; -} hr { margin: 18px 0; border: 0; @@ -511,8 +453,7 @@ blockquote.pull-right { border-left: 0; border-right: 5px solid #eeeeee; } -blockquote.pull-right p, -blockquote.pull-right small { +blockquote.pull-right p, blockquote.pull-right small { text-align: right; } q:before, @@ -533,8 +474,7 @@ small { cite { font-style: normal; } -code, -pre { +code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; @@ -643,14 +583,10 @@ select, width: auto; height: auto; } -label input, -label textarea, -label select { +label input, label textarea, label select { display: block; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { +input[type="image"], input[type="checkbox"], input[type="radio"] { width: auto; height: auto; padding: 0; @@ -681,14 +617,11 @@ input[type="file"] { -moz-box-shadow: none; box-shadow: none; } -input[type="button"], -input[type="reset"], -input[type="submit"] { +input[type="button"], input[type="reset"], input[type="submit"] { width: auto; height: auto; } -select, -input[type="file"] { +select, input[type="file"] { height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ @@ -704,8 +637,7 @@ select { width: 220px; background-color: #ffffff; } -select[multiple], -select[size] { +select[multiple], select[size] { height: auto; } input[type="image"] { @@ -719,32 +651,26 @@ textarea { input[type="hidden"] { display: none; } -.radio, -.checkbox { +.radio, .checkbox { padding-left: 18px; } -.radio input[type="radio"], -.checkbox input[type="checkbox"] { +.radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; margin-left: -18px; } -.controls > .radio:first-child, -.controls > .checkbox:first-child { +.controls > .radio:first-child, .controls > .checkbox:first-child { padding-top: 5px; } -.radio.inline, -.checkbox.inline { +.radio.inline, .checkbox.inline { display: inline-block; padding-top: 5px; margin-bottom: 0; vertical-align: middle; } -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { +.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { +input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -754,8 +680,7 @@ textarea { -o-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; } -input:focus, -textarea:focus { +input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); @@ -801,69 +726,43 @@ textarea[class*="span"], float: none; margin-left: 0; } -input, -textarea, -.uneditable-input { +input, textarea, .uneditable-input { margin-left: 0; } -input > .span1, -textarea > .span1, -.uneditable-input > .span1 { +input > .span1, textarea > .span1, .uneditable-input > .span1 { width: 50px; } -input > .span2, -textarea > .span2, -.uneditable-input > .span2 { +input > .span2, textarea > .span2, .uneditable-input > .span2 { width: 130px; } -input > .span3, -textarea > .span3, -.uneditable-input > .span3 { +input > .span3, textarea > .span3, .uneditable-input > .span3 { width: 210px; } -input > .span4, -textarea > .span4, -.uneditable-input > .span4 { +input > .span4, textarea > .span4, .uneditable-input > .span4 { width: 290px; } -input > .span5, -textarea > .span5, -.uneditable-input > .span5 { +input > .span5, textarea > .span5, .uneditable-input > .span5 { width: 370px; } -input > .span6, -textarea > .span6, -.uneditable-input > .span6 { +input > .span6, textarea > .span6, .uneditable-input > .span6 { width: 450px; } -input > .span7, -textarea > .span7, -.uneditable-input > .span7 { +input > .span7, textarea > .span7, .uneditable-input > .span7 { width: 530px; } -input > .span8, -textarea > .span8, -.uneditable-input > .span8 { +input > .span8, textarea > .span8, .uneditable-input > .span8 { width: 610px; } -input > .span9, -textarea > .span9, -.uneditable-input > .span9 { +input > .span9, textarea > .span9, .uneditable-input > .span9 { width: 690px; } -input > .span10, -textarea > .span10, -.uneditable-input > .span10 { +input > .span10, textarea > .span10, .uneditable-input > .span10 { width: 770px; } -input > .span11, -textarea > .span11, -.uneditable-input > .span11 { +input > .span11, textarea > .span11, .uneditable-input > .span11 { width: 850px; } -input > .span12, -textarea > .span12, -.uneditable-input > .span12 { +input > .span12, textarea > .span12, .uneditable-input > .span12 { width: 930px; } input[disabled], @@ -876,90 +775,65 @@ textarea[readonly] { border-color: #ddd; cursor: not-allowed; } -.control-group.warning > label, -.control-group.warning .help-block, -.control-group.warning .help-inline { +.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { +.control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; border-color: #c09853; } -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { +.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: 0 0 6px #dbc59e; -moz-box-shadow: 0 0 6px #dbc59e; box-shadow: 0 0 6px #dbc59e; } -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { +.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #c09853; background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, -.control-group.error .help-block, -.control-group.error .help-inline { +.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea { +.control-group.error input, .control-group.error select, .control-group.error textarea { color: #b94a48; border-color: #b94a48; } -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { +.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: 0 0 6px #d59392; -moz-box-shadow: 0 0 6px #d59392; box-shadow: 0 0 6px #d59392; } -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { +.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #b94a48; background-color: #f2dede; border-color: #b94a48; } -.control-group.success > label, -.control-group.success .help-block, -.control-group.success .help-inline { +.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } -.control-group.success input, -.control-group.success select, -.control-group.success textarea { +.control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; border-color: #468847; } -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { +.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: 0 0 6px #7aba7b; -moz-box-shadow: 0 0 6px #7aba7b; box-shadow: 0 0 6px #7aba7b; } -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { +.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #468847; background-color: #dff0d8; border-color: #468847; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; @@ -973,8 +847,7 @@ select:focus:required:invalid:focus { border-top: 1px solid #ddd; *zoom: 1; } -.form-actions:before, -.form-actions:after { +.form-actions:before, .form-actions:after { display: table; content: ""; } @@ -996,8 +869,7 @@ select:focus:required:invalid:focus { ::-webkit-input-placeholder { color: #999999; } -.help-block, -.help-inline { +.help-block, .help-inline { color: #555555; } .help-block { @@ -1013,8 +885,7 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { +.input-prepend, .input-append { margin-bottom: 5px; *zoom: 1; } @@ -1025,8 +896,7 @@ select:focus:required:invalid:focus { display: table; content: ""; } -.input-prepend:after, -.input-append:after { +.input-prepend:after, .input-append:after { clear: both; } .input-prepend input, @@ -1048,12 +918,10 @@ select:focus:required:invalid:focus { position: relative; z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-prepend .uneditable-input, .input-append .uneditable-input { border-left-color: #ccc; } -.input-prepend .add-on, -.input-append .add-on { +.input-prepend .add-on, .input-append .add-on { float: left; display: block; width: auto; @@ -1072,8 +940,7 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-prepend .active, -.input-append .active { +.input-prepend .active, .input-append .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,8 +949,7 @@ select:focus:required:invalid:focus { /* IE6-7 */ } -.input-append input, -.input-append select .uneditable-input { +.input-append input, .input-append select .uneditable-input { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; @@ -1132,9 +998,7 @@ select:focus:required:invalid:focus { display: inline-block; margin-bottom: 0; } -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { +.form-search .hide, .form-inline .hide, .form-horizontal .hide { display: none; } .form-search label, @@ -1178,8 +1042,7 @@ legend + .control-group { margin-bottom: 18px; *zoom: 1; } -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { +.form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; } @@ -1211,8 +1074,7 @@ table { width: 100%; margin-bottom: 18px; } -.table th, -.table td { +.table th, .table td { padding: 8px; line-height: 18px; text-align: left; @@ -1225,15 +1087,13 @@ table { .table thead th { vertical-align: bottom; } -.table thead:first-child tr th, -.table thead:first-child tr td { +.table thead:first-child tr th, .table thead:first-child tr td { border-top: 0; } .table tbody + tbody { border-top: 2px solid #ddd; } -.table-condensed th, -.table-condensed td { +.table-condensed th, .table-condensed td { padding: 4px 5px; } .table-bordered { @@ -1245,46 +1105,37 @@ table { -moz-border-radius: 4px; border-radius: 4px; } -.table-bordered th, -.table-bordered td { +.table-bordered th, .table-bordered td { border-left: 1px solid #ddd; } -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { +.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { border-top: 0; border-bottom: 1px solid #ddd; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -moz-border-radius: 4px 0 0 0; border-radius: 4px 0 0 0; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { -webkit-border-radius: 0 4px 0 0; -moz-border-radius: 0 4px 0 0; border-radius: 0 4px 0 0; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { +.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody: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; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { -webkit-border-radius: 0 0 4px 0; -moz-border-radius: 0 0 4px 0; border-radius: 0 0 4px 0; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table tbody tr:hover td, .table tbody tr:hover th { background-color: #f5f5f5; } table .span1 { @@ -1407,8 +1258,7 @@ table .span24 { width: 1884px; margin-left: 0; } -[class^="icon-"], -[class*=" icon-"] { +[class^="icon-"], [class*=" icon-"] { display: inline-block; width: 14px; height: 14px; @@ -1419,8 +1269,7 @@ table .span24 { background-repeat: no-repeat; *margin-right: .3em; } -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { +[class^="icon-"]:last-child, [class*=" icon-"]:last-child { *margin-left: 0; } .icon-white { @@ -1792,8 +1641,7 @@ table .span24 { .dropdown-toggle { *margin-bottom: -3px; } -.dropdown-toggle:active, -.open .dropdown-toggle { +.dropdown-toggle:active, .open .dropdown-toggle { outline: 0; } .caret { @@ -1814,8 +1662,7 @@ table .span24 { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open.dropdown .caret { +.dropdown:hover .caret, .open.dropdown .caret { opacity: 1; filter: alpha(opacity=100); } @@ -1869,9 +1716,7 @@ table .span24 { color: #555555; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; background-color: #0088cc; @@ -1891,14 +1736,12 @@ table .span24 { left: auto; right: 0; } -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { +.dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; content: "\2191"; } -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { +.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 1px; @@ -2008,8 +1851,7 @@ table .span24 { .btn[disabled] { background-color: #e6e6e6; } -.btn:active, -.btn.active { +.btn:active, .btn.active { background-color: #cccccc \9; } .btn:first-child { @@ -2031,8 +1873,7 @@ table .span24 { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -.btn.active, -.btn:active { +.btn.active, .btn:active { background-image: none; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2041,8 +1882,7 @@ table .span24 { background-color: #d9d9d9 \9; outline: 0; } -.btn.disabled, -.btn[disabled] { +.btn.disabled, .btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; @@ -2120,8 +1960,7 @@ table .span24 { .btn-primary[disabled] { background-color: #0044cc; } -.btn-primary:active, -.btn-primary.active { +.btn-primary:active, .btn-primary.active { background-color: #003399 \9; } .btn-warning { @@ -2145,8 +1984,7 @@ table .span24 { .btn-warning[disabled] { background-color: #f89406; } -.btn-warning:active, -.btn-warning.active { +.btn-warning:active, .btn-warning.active { background-color: #c67605 \9; } .btn-danger { @@ -2170,8 +2008,7 @@ table .span24 { .btn-danger[disabled] { background-color: #bd362f; } -.btn-danger:active, -.btn-danger.active { +.btn-danger:active, .btn-danger.active { background-color: #942a25 \9; } .btn-success { @@ -2195,8 +2032,7 @@ table .span24 { .btn-success[disabled] { background-color: #51a351; } -.btn-success:active, -.btn-success.active { +.btn-success:active, .btn-success.active { background-color: #408140 \9; } .btn-info { @@ -2220,8 +2056,7 @@ table .span24 { .btn-info[disabled] { background-color: #2f96b4; } -.btn-info:active, -.btn-info.active { +.btn-info:active, .btn-info.active { background-color: #24748c \9; } .btn-inverse { @@ -2245,27 +2080,22 @@ table .span24 { .btn-inverse[disabled] { background-color: #222222; } -.btn-inverse:active, -.btn-inverse.active { +.btn-inverse:active, .btn-inverse.active { background-color: #080808 \9; } -button.btn, -input[type="submit"].btn { +button.btn, input[type="submit"].btn { *padding-top: 2px; *padding-bottom: 2px; } -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { +button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { padding: 0; border: 0; } -button.btn.btn-large, -input[type="submit"].btn.btn-large { +button.btn.btn-large, input[type="submit"].btn.btn-large { *padding-top: 7px; *padding-bottom: 7px; } -button.btn.btn-small, -input[type="submit"].btn.btn-small { +button.btn.btn-small, input[type="submit"].btn.btn-small { *padding-top: 3px; *padding-bottom: 3px; } @@ -2274,8 +2104,7 @@ input[type="submit"].btn.btn-small { *zoom: 1; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { +.btn-group:before, .btn-group:after { display: table; content: ""; } @@ -2316,8 +2145,7 @@ input[type="submit"].btn.btn-small { -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } -.btn-group .btn:last-child, -.btn-group .dropdown-toggle { +.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; @@ -2334,8 +2162,7 @@ input[type="submit"].btn.btn-small { -moz-border-radius-bottomleft: 6px; border-bottom-left-radius: 6px; } -.btn-group .btn.large:last-child, -.btn-group .large.dropdown-toggle { +.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; @@ -2349,8 +2176,7 @@ input[type="submit"].btn.btn-small { .btn-group .btn.active { z-index: 2; } -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { +.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; } .btn-group .dropdown-toggle { @@ -2382,8 +2208,7 @@ input[type="submit"].btn.btn-small { margin-top: 7px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { +.btn:hover .caret, .open.btn-group .caret { opacity: 1; filter: alpha(opacity=100); } @@ -2425,8 +2250,7 @@ input[type="submit"].btn.btn-small { border-color: #d6e9c6; color: #468847; } -.alert-danger, -.alert-error { +.alert-danger, .alert-error { background-color: #f2dede; border-color: #eed3d7; color: #b94a48; @@ -2440,8 +2264,7 @@ input[type="submit"].btn.btn-small { padding-top: 14px; padding-bottom: 14px; } -.alert-block > p, -.alert-block > ul { +.alert-block > p, .alert-block > ul { margin-bottom: 0; } .alert-block p + p { @@ -2477,8 +2300,7 @@ input[type="submit"].btn.btn-small { padding-right: 14px; margin-bottom: 0; } -.nav-list > li > a, -.nav-list .nav-header { +.nav-list > li > a, .nav-list .nav-header { margin-left: -15px; margin-right: -15px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); @@ -2486,8 +2308,7 @@ input[type="submit"].btn.btn-small { .nav-list > li > a { padding: 3px 15px; } -.nav-list .active > a, -.nav-list .active > a:hover { +.nav-list .active > a, .nav-list .active > a:hover { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; @@ -2504,8 +2325,7 @@ input[type="submit"].btn.btn-small { *width: 100%; *margin: -5px 0 5px; } -.nav-tabs, -.nav-pills { +.nav-tabs, .nav-pills { *zoom: 1; } .nav-tabs:before, @@ -2515,16 +2335,13 @@ input[type="submit"].btn.btn-small { display: table; content: ""; } -.nav-tabs:after, -.nav-pills:after { +.nav-tabs:after, .nav-pills:after { clear: both; } -.nav-tabs > li, -.nav-pills > li { +.nav-tabs > li, .nav-pills > li { float: left; } -.nav-tabs > li > a, -.nav-pills > li > a { +.nav-tabs > li > a, .nav-pills > li > a { padding-right: 12px; padding-left: 12px; margin-right: 2px; @@ -2548,8 +2365,7 @@ input[type="submit"].btn.btn-small { .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #dddddd; } -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a, .nav-tabs > .active > a:hover { color: #555555; background-color: #ffffff; border: 1px solid #ddd; @@ -2565,8 +2381,7 @@ input[type="submit"].btn.btn-small { -moz-border-radius: 5px; border-radius: 5px; } -.nav-pills .active > a, -.nav-pills .active > a:hover { +.nav-pills .active > a, .nav-pills .active > a:hover { color: #ffffff; background-color: #0088cc; } @@ -2605,8 +2420,7 @@ input[type="submit"].btn.btn-small { .nav-pills.nav-stacked > li:last-child > a { margin-bottom: 1px; } -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { +.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu { margin-top: 1px; border-width: 1px; } @@ -2615,19 +2429,16 @@ input[type="submit"].btn.btn-small { -moz-border-radius: 4px; border-radius: 4px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { +.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { border-top-color: #0088cc; border-bottom-color: #0088cc; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { +.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { border-top-color: #005580; border-bottom-color: #005580; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { +.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { border-top-color: #333333; border-bottom-color: #333333; } @@ -2635,16 +2446,12 @@ input[type="submit"].btn.btn-small { color: #000000; cursor: pointer; } -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > .open.active > a:hover { +.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { color: #ffffff; background-color: #999999; border-color: #999999; } -.nav .open .caret, -.nav .open.active .caret, -.nav .open a:hover .caret { +.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; @@ -2656,8 +2463,7 @@ input[type="submit"].btn.btn-small { .tabbable { *zoom: 1; } -.tabbable:before, -.tabbable:after { +.tabbable:before, .tabbable:after { display: table; content: ""; } @@ -2668,17 +2474,13 @@ input[type="submit"].btn.btn-small { display: table; width: 100%; } -.tabs-below .nav-tabs, -.tabs-right .nav-tabs, -.tabs-left .nav-tabs { +.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { border-bottom: 0; } -.tab-content > .tab-pane, -.pill-content > .pill-pane { +.tab-content > .tab-pane, .pill-content > .pill-pane { display: none; } -.tab-content > .active, -.pill-content > .active { +.tab-content > .active, .pill-content > .active { display: block; } .tabs-below .nav-tabs { @@ -2697,16 +2499,13 @@ input[type="submit"].btn.btn-small { border-bottom-color: transparent; border-top-color: #ddd; } -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover { +.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabs-left .nav-tabs > li, -.tabs-right .nav-tabs > li { +.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { float: none; } -.tabs-left .nav-tabs > li > a, -.tabs-right .nav-tabs > li > a { +.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a { min-width: 74px; margin-right: 0; margin-bottom: 3px; @@ -2725,8 +2524,7 @@ input[type="submit"].btn.btn-small { .tabs-left .nav-tabs > li > a:hover { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover { +.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2744,8 +2542,7 @@ input[type="submit"].btn.btn-small { .tabs-right .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover { +.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } @@ -2804,8 +2601,7 @@ input[type="submit"].btn.btn-small { .btn-navbar[disabled] { background-color: #222222; } -.btn-navbar:active, -.btn-navbar.active { +.btn-navbar:active, .btn-navbar.active { background-color: #080808 \9; } .btn-navbar .icon-bar { @@ -2846,8 +2642,7 @@ input[type="submit"].btn.btn-small { margin-bottom: 0; line-height: 40px; } -.navbar .btn, -.navbar .btn-group { +.navbar .btn, .navbar .btn-group { margin-top: 5px; } .navbar .btn-group .btn { @@ -2857,8 +2652,7 @@ input[type="submit"].btn.btn-small { margin-bottom: 0; *zoom: 1; } -.navbar-form:before, -.navbar-form:after { +.navbar-form:before, .navbar-form:after { display: table; content: ""; } @@ -2871,23 +2665,18 @@ input[type="submit"].btn.btn-small { .navbar-form .checkbox { margin-top: 5px; } -.navbar-form input, -.navbar-form select { +.navbar-form input, .navbar-form select { display: inline-block; margin-bottom: 0; } -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { +.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { margin-top: 3px; } -.navbar-form .input-append, -.navbar-form .input-prepend { +.navbar-form .input-append, .navbar-form .input-prepend { margin-top: 6px; white-space: nowrap; } -.navbar-form .input-append input, -.navbar-form .input-prepend input { +.navbar-form .input-append input, .navbar-form .input-prepend input { margin-top: 0; } .navbar-search { @@ -2927,8 +2716,7 @@ input[type="submit"].btn.btn-small { background-color: #999999; background-color: rgba(255, 255, 255, 0.5); } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { +.navbar-search .search-query:focus, .navbar-search .search-query.focused { padding: 5px 10px; color: #333333; text-shadow: 0 1px 0 #ffffff; @@ -2939,16 +2727,14 @@ input[type="submit"].btn.btn-small { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } -.navbar-fixed-top, -.navbar-fixed-bottom { +.navbar-fixed-top, .navbar-fixed-bottom { position: fixed; right: 0; left: 0; z-index: 1030; margin-bottom: 0; } -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; -webkit-border-radius: 0; @@ -2988,8 +2774,7 @@ input[type="submit"].btn.btn-small { color: #ffffff; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { +.navbar .nav .active > a, .navbar .nav .active > a:hover { color: #ffffff; text-decoration: none; background-color: #222222; @@ -3046,8 +2831,7 @@ input[type="submit"].btn.btn-small { bottom: -6px; top: auto; } -.navbar .nav .dropdown-toggle .caret, -.navbar .nav .open.dropdown .caret { +.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; } @@ -3055,26 +2839,21 @@ input[type="submit"].btn.btn-small { opacity: 1; filter: alpha(opacity=100); } -.navbar .nav .open > .dropdown-toggle, -.navbar .nav .active > .dropdown-toggle, -.navbar .nav .open.active > .dropdown-toggle { +.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { background-color: transparent; } .navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu, -.navbar .nav .dropdown-menu.pull-right { +.navbar .nav.pull-right .dropdown-menu, .navbar .nav .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .nav.pull-right .dropdown-menu:before, -.navbar .nav .dropdown-menu.pull-right:before { +.navbar .nav.pull-right .dropdown-menu:before, .navbar .nav .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .nav.pull-right .dropdown-menu:after, -.navbar .nav .dropdown-menu.pull-right:after { +.navbar .nav.pull-right .dropdown-menu:after, .navbar .nav .dropdown-menu.pull-right:after { left: auto; right: 13px; } @@ -3139,17 +2918,14 @@ input[type="submit"].btn.btn-small { border: 1px solid #ddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination a:hover, .pagination .active a { background-color: #f5f5f5; } .pagination .active a { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination .disabled span, .pagination .disabled a, .pagination .disabled a:hover { color: #999999; background-color: transparent; cursor: default; @@ -3178,8 +2954,7 @@ input[type="submit"].btn.btn-small { text-align: center; *zoom: 1; } -.pager:before, -.pager:after { +.pager:before, .pager:after { display: table; content: ""; } @@ -3232,8 +3007,7 @@ input[type="submit"].btn.btn-small { .modal-backdrop.fade { opacity: 0; } -.modal-backdrop, -.modal-backdrop.fade.in { +.modal-backdrop, .modal-backdrop.fade.in { opacity: 0.8; filter: alpha(opacity=80); } @@ -3301,8 +3075,7 @@ input[type="submit"].btn.btn-small { box-shadow: inset 0 1px 0 #ffffff; *zoom: 1; } -.modal-footer:before, -.modal-footer:after { +.modal-footer:before, .modal-footer:after { display: table; content: ""; } @@ -3476,9 +3249,7 @@ input[type="submit"].btn.btn-small { -moz-background-clip: padding-box; background-clip: padding-box; } -.popover-content p, -.popover-content ul, -.popover-content ol { +.popover-content p, .popover-content ul, .popover-content ol { margin-bottom: 0; } .thumbnails { @@ -3486,8 +3257,7 @@ input[type="submit"].btn.btn-small { list-style: none; *zoom: 1; } -.thumbnails:before, -.thumbnails:after { +.thumbnails:before, .thumbnails:after { display: table; content: ""; } @@ -3811,16 +3581,13 @@ a.thumbnail:hover { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel .active, .carousel .next, .carousel .prev { display: block; } .carousel .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel .next, .carousel .prev { position: absolute; top: 0; width: 100%; @@ -3831,8 +3598,7 @@ a.thumbnail:hover { .carousel .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel .next.left, .carousel .prev.right { left: 0; } .carousel .active.left { @@ -3880,8 +3646,7 @@ a.thumbnail:hover { background: #333333; background: rgba(0, 0, 0, 0.75); } -.carousel-caption h4, -.carousel-caption p { +.carousel-caption h4, .carousel-caption p { color: #ffffff; } .hero-unit { diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index e7bfd09bf2..d76e51e8c9 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -206,7 +206,7 @@ title = $e.attr('data-original-title') || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - title = (title || '').toString().replace(/(^\s*|\s*$)/, "") + title = title.toString().replace(/(^\s*|\s*$)/, "") return title }