diff --git a/bootstrap/css/bootstrap.css b/bootstrap/css/bootstrap.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bootstrap/img/glyphicons-halflings-white.png b/bootstrap/img/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689 Binary files /dev/null and b/bootstrap/img/glyphicons-halflings-white.png differ diff --git a/bootstrap/img/glyphicons-halflings.png b/bootstrap/img/glyphicons-halflings.png new file mode 100644 index 0000000000000000000000000000000000000000..92d4445dfd0af414835467132cf50c7c38a303af Binary files /dev/null and b/bootstrap/img/glyphicons-halflings.png differ diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 83f3d3d6b9e17d5a3ac8eb55342acfa8fa7ba1f4..42c944b1d07b0be6a85a963618cb60469165ff9b 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 447a865c8ed9fb1fb46b6d58052a1bdf999fcdbb..25453a16bbba0faf2ad75f6be352db1a1a088a0f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -10,7 +10,8 @@ .clearfix { *zoom: 1; } -.clearfix:before, .clearfix:after { +.clearfix:before, +.clearfix:after { display: table; content: ""; } @@ -99,10 +100,12 @@ /* 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 { @@ -151,7 +154,8 @@ .row { margin-left: 0; } - .row > [class*="span"], .row-fluid > [class*="span"] { + .row > [class*="span"], + .row-fluid > [class*="span"] { float: none; display: block; width: auto; @@ -163,7 +167,8 @@ margin-left: -20px; *zoom: 1; } - .row:before, .row:after { + .row:before, + .row:after { display: table; content: ""; } @@ -174,7 +179,9 @@ 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 { @@ -253,7 +260,8 @@ width: 100%; *zoom: 1; } - .row-fluid:before, .row-fluid:after { + .row-fluid:before, + .row-fluid:after { display: table; content: ""; } @@ -267,79 +275,105 @@ .row-fluid > [class*="span"]:first-child { margin-left: 0; } - .row-fluid > .span1 { + .row-fluid .span1 { width: 5.801104972%; } - .row-fluid > .span2 { + .row-fluid .span2 { width: 14.364640883%; } - .row-fluid > .span3 { + .row-fluid .span3 { width: 22.928176794%; } - .row-fluid > .span4 { + .row-fluid .span4 { width: 31.491712705%; } - .row-fluid > .span5 { + .row-fluid .span5 { width: 40.055248616%; } - .row-fluid > .span6 { + .row-fluid .span6 { width: 48.618784527%; } - .row-fluid > .span7 { + .row-fluid .span7 { width: 57.182320438000005%; } - .row-fluid > .span8 { + .row-fluid .span8 { width: 65.74585634900001%; } - .row-fluid > .span9 { + .row-fluid .span9 { width: 74.30939226%; } - .row-fluid > .span10 { + .row-fluid .span10 { width: 82.87292817100001%; } - .row-fluid > .span11 { + .row-fluid .span11 { width: 91.436464082%; } - .row-fluid > .span12 { + .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; } } @@ -383,7 +417,8 @@ 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; @@ -394,7 +429,8 @@ .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 { @@ -415,13 +451,15 @@ -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; @@ -458,7 +496,8 @@ margin-left: -30px; *zoom: 1; } - .row:before, .row:after { + .row:before, + .row:after { display: table; content: ""; } @@ -469,7 +508,9 @@ 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 { @@ -548,7 +589,8 @@ width: 100%; *zoom: 1; } - .row-fluid:before, .row-fluid:after { + .row-fluid:before, + .row-fluid:after { display: table; content: ""; } @@ -562,79 +604,105 @@ .row-fluid > [class*="span"]:first-child { margin-left: 0; } - .row-fluid > .span1 { + .row-fluid .span1 { width: 5.982905983%; } - .row-fluid > .span2 { + .row-fluid .span2 { width: 14.529914530000001%; } - .row-fluid > .span3 { + .row-fluid .span3 { width: 23.076923077%; } - .row-fluid > .span4 { + .row-fluid .span4 { width: 31.623931624%; } - .row-fluid > .span5 { + .row-fluid .span5 { width: 40.170940171000005%; } - .row-fluid > .span6 { + .row-fluid .span6 { width: 48.717948718%; } - .row-fluid > .span7 { + .row-fluid .span7 { width: 57.264957265%; } - .row-fluid > .span8 { + .row-fluid .span8 { width: 65.81196581200001%; } - .row-fluid > .span9 { + .row-fluid .span9 { width: 74.358974359%; } - .row-fluid > .span10 { + .row-fluid .span10 { width: 82.905982906%; } - .row-fluid > .span11 { + .row-fluid .span11 { width: 91.45299145300001%; } - .row-fluid > .span12 { + .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 e47dbb25fdcfd1a526f74692e24bf82d6742626e..ee84d2aa1555422b36f01a69d19f7a0751433ebd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -19,7 +19,9 @@ nav, section { display: block; } -audio, canvas, video { +audio, +canvas, +video { display: inline-block; *display: inline; *zoom: 1; @@ -37,10 +39,12 @@ 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; @@ -65,11 +69,13 @@ 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; } @@ -86,7 +92,8 @@ 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 { @@ -96,7 +103,8 @@ textarea { .clearfix { *zoom: 1; } -.clearfix:before, .clearfix:after { +.clearfix:before, +.clearfix:after { display: table; content: ""; } @@ -123,7 +131,8 @@ a:hover { margin-left: -20px; *zoom: 1; } -.row:before, .row:after { +.row:before, +.row:after { display: table; content: ""; } @@ -134,7 +143,9 @@ 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 { @@ -213,7 +224,8 @@ a:hover { width: 100%; *zoom: 1; } -.row-fluid:before, .row-fluid:after { +.row-fluid:before, +.row-fluid:after { display: table; content: ""; } @@ -227,40 +239,40 @@ a:hover { .row-fluid > [class*="span"]:first-child { margin-left: 0; } -.row-fluid > .span1 { +.row-fluid .span1 { width: 6.382978723%; } -.row-fluid > .span2 { +.row-fluid .span2 { width: 14.89361702%; } -.row-fluid > .span3 { +.row-fluid .span3 { width: 23.404255317%; } -.row-fluid > .span4 { +.row-fluid .span4 { width: 31.914893614%; } -.row-fluid > .span5 { +.row-fluid .span5 { width: 40.425531911%; } -.row-fluid > .span6 { +.row-fluid .span6 { width: 48.93617020799999%; } -.row-fluid > .span7 { +.row-fluid .span7 { width: 57.446808505%; } -.row-fluid > .span8 { +.row-fluid .span8 { width: 65.95744680199999%; } -.row-fluid > .span9 { +.row-fluid .span9 { width: 74.468085099%; } -.row-fluid > .span10 { +.row-fluid .span10 { width: 82.97872339599999%; } -.row-fluid > .span11 { +.row-fluid .span11 { width: 91.489361693%; } -.row-fluid > .span12 { +.row-fluid .span12 { width: 99.99999998999999%; } .container { @@ -268,7 +280,8 @@ a:hover { margin-right: auto; *zoom: 1; } -.container:before, .container:after { +.container:before, +.container:after { display: table; content: ""; } @@ -280,7 +293,8 @@ a:hover { padding-right: 20px; *zoom: 1; } -.container-fluid:before, .container-fluid:after { +.container-fluid:before, +.container-fluid:after { display: table; content: ""; } @@ -344,7 +358,9 @@ h3 { h3 small { font-size: 14px; } -h4, h5, h6 { +h4, +h5, +h6 { line-height: 18px; } h4 { @@ -369,7 +385,8 @@ h6 { .page-header h1 { line-height: 1; } -ul, ol { +ul, +ol { padding: 0; margin: 0 0 9px 25px; } @@ -388,14 +405,16 @@ 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 { @@ -453,7 +472,8 @@ 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, @@ -474,7 +494,8 @@ small { cite { font-style: normal; } -code, pre { +code, +pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; @@ -583,10 +604,14 @@ 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; @@ -617,11 +642,14 @@ 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 */ @@ -637,7 +665,8 @@ select { width: 220px; background-color: #ffffff; } -select[multiple], select[size] { +select[multiple], +select[size] { height: auto; } input[type="image"] { @@ -651,26 +680,32 @@ 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); @@ -680,7 +715,8 @@ input, 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); @@ -726,43 +762,69 @@ 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], @@ -775,65 +837,90 @@ 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; @@ -847,7 +934,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec border-top: 1px solid #ddd; *zoom: 1; } -.form-actions:before, .form-actions:after { +.form-actions:before, +.form-actions:after { display: table; content: ""; } @@ -869,7 +957,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ::-webkit-input-placeholder { color: #999999; } -.help-block, .help-inline { +.help-block, +.help-inline { color: #555555; } .help-block { @@ -885,7 +974,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec vertical-align: middle; padding-left: 5px; } -.input-prepend, .input-append { +.input-prepend, +.input-append { margin-bottom: 5px; *zoom: 1; } @@ -896,7 +986,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: table; content: ""; } -.input-prepend:after, .input-append:after { +.input-prepend:after, +.input-append:after { clear: both; } .input-prepend input, @@ -918,10 +1009,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec 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; @@ -940,7 +1033,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec -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; } @@ -949,7 +1043,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec /* 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; @@ -998,7 +1093,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec 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, @@ -1042,7 +1139,8 @@ 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: ""; } @@ -1074,7 +1172,8 @@ table { width: 100%; margin-bottom: 18px; } -.table th, .table td { +.table th, +.table td { padding: 8px; line-height: 18px; text-align: left; @@ -1087,13 +1186,15 @@ 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 { @@ -1105,37 +1206,46 @@ 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 { @@ -1258,7 +1368,8 @@ table .span24 { width: 1884px; margin-left: 0; } -[class^="icon-"], [class*=" icon-"] { +[class^="icon-"], +[class*=" icon-"] { display: inline-block; width: 14px; height: 14px; @@ -1269,7 +1380,8 @@ 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 { @@ -1641,7 +1753,8 @@ table .span24 { .dropdown-toggle { *margin-bottom: -3px; } -.dropdown-toggle:active, .open .dropdown-toggle { +.dropdown-toggle:active, +.open .dropdown-toggle { outline: 0; } .caret { @@ -1662,7 +1775,8 @@ 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); } @@ -1716,7 +1830,9 @@ 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; @@ -1736,12 +1852,14 @@ 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; @@ -1851,7 +1969,8 @@ table .span24 { .btn[disabled] { background-color: #e6e6e6; } -.btn:active, .btn.active { +.btn:active, +.btn.active { background-color: #cccccc \9; } .btn:first-child { @@ -1873,7 +1992,8 @@ 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); @@ -1882,7 +2002,8 @@ table .span24 { background-color: #d9d9d9 \9; outline: 0; } -.btn.disabled, .btn[disabled] { +.btn.disabled, +.btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; @@ -1960,7 +2081,8 @@ 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 { @@ -1984,7 +2106,8 @@ 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 { @@ -2008,7 +2131,8 @@ 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 { @@ -2032,7 +2156,8 @@ 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 { @@ -2056,7 +2181,8 @@ 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 { @@ -2080,22 +2206,27 @@ 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; } @@ -2104,7 +2235,8 @@ button.btn.btn-small, 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: ""; } @@ -2145,7 +2277,8 @@ button.btn.btn-small, 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; @@ -2162,7 +2295,8 @@ button.btn.btn-small, 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; @@ -2176,7 +2310,8 @@ button.btn.btn-small, 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 { @@ -2208,7 +2343,8 @@ button.btn.btn-small, 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); } @@ -2250,7 +2386,8 @@ button.btn.btn-small, 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; @@ -2264,7 +2401,8 @@ button.btn.btn-small, 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 { @@ -2300,7 +2438,8 @@ button.btn.btn-small, 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); @@ -2308,7 +2447,8 @@ button.btn.btn-small, 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; @@ -2325,7 +2465,8 @@ button.btn.btn-small, 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, @@ -2335,13 +2476,16 @@ button.btn.btn-small, 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; @@ -2365,7 +2509,8 @@ button.btn.btn-small, 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; @@ -2381,7 +2526,8 @@ button.btn.btn-small, 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; } @@ -2420,7 +2566,8 @@ button.btn.btn-small, 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; } @@ -2429,16 +2576,19 @@ button.btn.btn-small, 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; } @@ -2446,12 +2596,16 @@ button.btn.btn-small, 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; @@ -2463,7 +2617,8 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { .tabbable { *zoom: 1; } -.tabbable:before, .tabbable:after { +.tabbable:before, +.tabbable:after { display: table; content: ""; } @@ -2474,13 +2629,17 @@ button.btn.btn-small, 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 { @@ -2499,13 +2658,16 @@ button.btn.btn-small, 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; @@ -2524,7 +2686,8 @@ button.btn.btn-small, 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; } @@ -2542,7 +2705,8 @@ button.btn.btn-small, 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; } @@ -2601,7 +2765,8 @@ button.btn.btn-small, 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 { @@ -2642,7 +2807,8 @@ button.btn.btn-small, 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 { @@ -2652,7 +2818,8 @@ button.btn.btn-small, 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: ""; } @@ -2665,18 +2832,23 @@ button.btn.btn-small, 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 { @@ -2716,7 +2888,8 @@ button.btn.btn-small, 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; @@ -2727,14 +2900,16 @@ button.btn.btn-small, 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; @@ -2774,7 +2949,8 @@ button.btn.btn-small, 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; @@ -2831,7 +3007,8 @@ button.btn.btn-small, 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; } @@ -2839,21 +3016,26 @@ button.btn.btn-small, 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; } @@ -2918,14 +3100,17 @@ button.btn.btn-small, 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; @@ -2954,7 +3139,8 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { text-align: center; *zoom: 1; } -.pager:before, .pager:after { +.pager:before, +.pager:after { display: table; content: ""; } @@ -3007,7 +3193,8 @@ button.btn.btn-small, 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); } @@ -3075,7 +3262,8 @@ button.btn.btn-small, 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: ""; } @@ -3249,7 +3437,9 @@ button.btn.btn-small, 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 { @@ -3257,7 +3447,8 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { list-style: none; *zoom: 1; } -.thumbnails:before, .thumbnails:after { +.thumbnails:before, +.thumbnails:after { display: table; content: ""; } @@ -3581,13 +3772,16 @@ 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%; @@ -3598,7 +3792,8 @@ a.thumbnail:hover { .carousel .prev { left: -100%; } -.carousel .next.left, .carousel .prev.right { +.carousel .next.left, +.carousel .prev.right { left: 0; } .carousel .active.left { @@ -3646,7 +3841,8 @@ 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/less/mixins.less b/less/mixins.less index 6b85be96fbb3506a7747f144c3bb7878f5fa68ef..ef5804d398ec6f4cc68bfe27fc67b3feddd56c2c 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -482,16 +482,126 @@ #grid { - .core (@gridColumnWidth, @gridGutterWidth) { + // we have to define these bogus mixins otherwise + // less throws an exception when we call for them + // below and a guard hasn't overridden them + // (@fat will work with @cloudhead on coming up with something better hopefully) + .span1 (@gridColumns) {} + .span2 (@gridColumns) {} + .span3 (@gridColumns) {} + .span4 (@gridColumns) {} + .span5 (@gridColumns) {} + .span6 (@gridColumns) {} + .span7 (@gridColumns) {} + .span8 (@gridColumns) {} + .span9 (@gridColumns) {} + .span10 (@gridColumns) {} + .span11 (@gridColumns) {} + .span12 (@gridColumns) {} + .span13 (@gridColumns) {} + .span14 (@gridColumns) {} + .span15 (@gridColumns) {} + .span16 (@gridColumns) {} + .span17 (@gridColumns) {} + .span18 (@gridColumns) {} + .span19 (@gridColumns) {} + .span20 (@gridColumns) {} + .span21 (@gridColumns) {} + .span22 (@gridColumns) {} + .span23 (@gridColumns) {} + .span24 (@gridColumns) {} + + + // override mixins with guards + .span1 (@gridColumns) when (@gridColumns > 0) { .span1 { .span(1); } } + .span2 (@gridColumns) when (@gridColumns > 1) { .span2 { .span(2); } } + .span3 (@gridColumns) when (@gridColumns > 2) { .span3 { .span(3); } } + .span4 (@gridColumns) when (@gridColumns > 3) { .span4 { .span(4); } } + .span5 (@gridColumns) when (@gridColumns > 4) { .span5 { .span(5); } } + .span6 (@gridColumns) when (@gridColumns > 5) { .span6 { .span(6); } } + .span7 (@gridColumns) when (@gridColumns > 6) { .span7 { .span(7); } } + .span8 (@gridColumns) when (@gridColumns > 7) { .span8 { .span(8); } } + .span9 (@gridColumns) when (@gridColumns > 8) { .span9 { .span(9); } } + .span10 (@gridColumns) when (@gridColumns > 9) { .span10 { .span(10); } } + .span11 (@gridColumns) when (@gridColumns > 10) { .span11 { .span(11); } } + .span12 (@gridColumns) when (@gridColumns > 11) { .span12 { .span(12); } } + .span13 (@gridColumns) when (@gridColumns > 12) { .span13 { .span(13); } } + .span14 (@gridColumns) when (@gridColumns > 13) { .span14 { .span(14); } } + .span15 (@gridColumns) when (@gridColumns > 14) { .span15 { .span(15); } } + .span16 (@gridColumns) when (@gridColumns > 15) { .span16 { .span(16); } } + .span17 (@gridColumns) when (@gridColumns > 16) { .span17 { .span(17); } } + .span18 (@gridColumns) when (@gridColumns > 17) { .span18 { .span(18); } } + .span19 (@gridColumns) when (@gridColumns > 18) { .span19 { .span(19); } } + .span20 (@gridColumns) when (@gridColumns > 19) { .span20 { .span(20); } } + .span21 (@gridColumns) when (@gridColumns > 20) { .span21 { .span(21); } } + .span22 (@gridColumns) when (@gridColumns > 21) { .span22 { .span(22); } } + .span23 (@gridColumns) when (@gridColumns > 22) { .span23 { .span(23); } } + .span24 (@gridColumns) when (@gridColumns > 23) { .span24 { .span(24); } } + + + // do the same with offset as we did with spans ;_; + .offset1 (@gridColumns) {} + .offset2 (@gridColumns) {} + .offset3 (@gridColumns) {} + .offset4 (@gridColumns) {} + .offset5 (@gridColumns) {} + .offset6 (@gridColumns) {} + .offset7 (@gridColumns) {} + .offset8 (@gridColumns) {} + .offset9 (@gridColumns) {} + .offset10 (@gridColumns) {} + .offset11 (@gridColumns) {} + .offset12 (@gridColumns) {} + .offset13 (@gridColumns) {} + .offset14 (@gridColumns) {} + .offset15 (@gridColumns) {} + .offset16 (@gridColumns) {} + .offset17 (@gridColumns) {} + .offset18 (@gridColumns) {} + .offset19 (@gridColumns) {} + .offset20 (@gridColumns) {} + .offset21 (@gridColumns) {} + .offset22 (@gridColumns) {} + .offset23 (@gridColumns) {} + .offset24 (@gridColumns) {} + + + // override with guards + .offset1 (@gridColumns) when (@gridColumns > 0) { .offset1 { .offset(1); } } + .offset2 (@gridColumns) when (@gridColumns > 1) { .offset2 { .offset(2); } } + .offset3 (@gridColumns) when (@gridColumns > 2) { .offset3 { .offset(3); } } + .offset4 (@gridColumns) when (@gridColumns > 3) { .offset4 { .offset(4); } } + .offset5 (@gridColumns) when (@gridColumns > 4) { .offset5 { .offset(5); } } + .offset6 (@gridColumns) when (@gridColumns > 5) { .offset6 { .offset(6); } } + .offset7 (@gridColumns) when (@gridColumns > 6) { .offset7 { .offset(7); } } + .offset8 (@gridColumns) when (@gridColumns > 7) { .offset8 { .offset(8); } } + .offset9 (@gridColumns) when (@gridColumns > 8) { .offset9 { .offset(9); } } + .offset10 (@gridColumns) when (@gridColumns > 9) { .offset10 { .offset(10); } } + .offset11 (@gridColumns) when (@gridColumns > 10) { .offset11 { .offset(11); } } + .offset12 (@gridColumns) when (@gridColumns > 11) { .offset12 { .offset(12); } } + .offset13 (@gridColumns) when (@gridColumns > 12) { .offset13 { .offset(13); } } + .offset14 (@gridColumns) when (@gridColumns > 13) { .offset14 { .offset(14); } } + .offset15 (@gridColumns) when (@gridColumns > 14) { .offset15 { .offset(15); } } + .offset16 (@gridColumns) when (@gridColumns > 15) { .offset16 { .offset(16); } } + .offset17 (@gridColumns) when (@gridColumns > 16) { .offset17 { .offset(17); } } + .offset18 (@gridColumns) when (@gridColumns > 17) { .offset18 { .offset(18); } } + .offset19 (@gridColumns) when (@gridColumns > 18) { .offset19 { .offset(19); } } + .offset20 (@gridColumns) when (@gridColumns > 19) { .offset20 { .offset(20); } } + .offset21 (@gridColumns) when (@gridColumns > 20) { .offset21 { .offset(21); } } + .offset22 (@gridColumns) when (@gridColumns > 21) { .offset22 { .offset(22); } } + .offset23 (@gridColumns) when (@gridColumns > 22) { .offset23 { .offset(23); } } + .offset24 (@gridColumns) when (@gridColumns > 23) { .offset24 { .offset(24); } } - .span (@columns) { - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } + .core (@gridColumnWidth, @gridGutterWidth) { .offset (@columns) { margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); } + .span (@columns) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); + } + .row { margin-left: @gridGutterWidth * -1; .clearfix(); @@ -505,33 +615,59 @@ // Set the container width, and reset it for fixed navbars .container, .navbar-fixed-top .container, - .navbar-fixed-bottom .container { .span(12); } - - .span1 { .span(1); } - .span2 { .span(2); } - .span3 { .span(3); } - .span4 { .span(4); } - .span5 { .span(5); } - .span6 { .span(6); } - .span7 { .span(7); } - .span8 { .span(8); } - .span9 { .span(9); } - .span10 { .span(10); } - .span11 { .span(11); } - .span12 { .span(12); } - - .offset1 { .offset(1); } - .offset2 { .offset(2); } - .offset3 { .offset(3); } - .offset4 { .offset(4); } - .offset5 { .offset(5); } - .offset6 { .offset(6); } - .offset7 { .offset(7); } - .offset8 { .offset(8); } - .offset9 { .offset(9); } - .offset10 { .offset(10); } - .offset11 { .offset(11); } - .offset12 { .offset(12); } + .navbar-fixed-bottom .container { .span(@gridColumns); } + + // define up to max of 24 columns (default is 12) + #grid .span1(@gridColumns); + #grid .span2(@gridColumns); + #grid .span3(@gridColumns); + #grid .span4(@gridColumns); + #grid .span5(@gridColumns); + #grid .span6(@gridColumns); + #grid .span7(@gridColumns); + #grid .span8(@gridColumns); + #grid .span9(@gridColumns); + #grid .span10(@gridColumns); + #grid .span11(@gridColumns); + #grid .span12(@gridColumns); + #grid .span13(@gridColumns); + #grid .span14(@gridColumns); + #grid .span15(@gridColumns); + #grid .span16(@gridColumns); + #grid .span17(@gridColumns); + #grid .span18(@gridColumns); + #grid .span19(@gridColumns); + #grid .span20(@gridColumns); + #grid .span21(@gridColumns); + #grid .span22(@gridColumns); + #grid .span23(@gridColumns); + #grid .span24(@gridColumns); + + // define up to max of 24 offsets (default is 12) + #grid .offset1(@gridColumns); + #grid .offset2(@gridColumns); + #grid .offset3(@gridColumns); + #grid .offset4(@gridColumns); + #grid .offset5(@gridColumns); + #grid .offset6(@gridColumns); + #grid .offset7(@gridColumns); + #grid .offset8(@gridColumns); + #grid .offset9(@gridColumns); + #grid .offset10(@gridColumns); + #grid .offset11(@gridColumns); + #grid .offset12(@gridColumns); + #grid .offset13(@gridColumns); + #grid .offset14(@gridColumns); + #grid .offset15(@gridColumns); + #grid .offset16(@gridColumns); + #grid .offset17(@gridColumns); + #grid .offset18(@gridColumns); + #grid .offset19(@gridColumns); + #grid .offset20(@gridColumns); + #grid .offset21(@gridColumns); + #grid .offset22(@gridColumns); + #grid .offset23(@gridColumns); + #grid .offset24(@gridColumns); } @@ -551,18 +687,31 @@ > [class*="span"]:first-child { margin-left: 0; } - > .span1 { .span(1); } - > .span2 { .span(2); } - > .span3 { .span(3); } - > .span4 { .span(4); } - > .span5 { .span(5); } - > .span6 { .span(6); } - > .span7 { .span(7); } - > .span8 { .span(8); } - > .span9 { .span(9); } - > .span10 { .span(10); } - > .span11 { .span(11); } - > .span12 { .span(12); } + + #grid .span1(@gridColumns); + #grid .span2(@gridColumns); + #grid .span3(@gridColumns); + #grid .span4(@gridColumns); + #grid .span5(@gridColumns); + #grid .span6(@gridColumns); + #grid .span7(@gridColumns); + #grid .span8(@gridColumns); + #grid .span9(@gridColumns); + #grid .span10(@gridColumns); + #grid .span11(@gridColumns); + #grid .span12(@gridColumns); + #grid .span13(@gridColumns); + #grid .span14(@gridColumns); + #grid .span15(@gridColumns); + #grid .span16(@gridColumns); + #grid .span17(@gridColumns); + #grid .span18(@gridColumns); + #grid .span19(@gridColumns); + #grid .span20(@gridColumns); + #grid .span21(@gridColumns); + #grid .span22(@gridColumns); + #grid .span23(@gridColumns); + #grid .span24(@gridColumns); } } @@ -577,18 +726,31 @@ textarea, .uneditable-input { margin-left: 0; // override margin-left from core grid system - > .span1 { .span(1); } - > .span2 { .span(2); } - > .span3 { .span(3); } - > .span4 { .span(4); } - > .span5 { .span(5); } - > .span6 { .span(6); } - > .span7 { .span(7); } - > .span8 { .span(8); } - > .span9 { .span(9); } - > .span10 { .span(10); } - > .span11 { .span(11); } - > .span12 { .span(12); } + + #grid .span1(@gridColumns); + #grid .span2(@gridColumns); + #grid .span3(@gridColumns); + #grid .span4(@gridColumns); + #grid .span5(@gridColumns); + #grid .span6(@gridColumns); + #grid .span7(@gridColumns); + #grid .span8(@gridColumns); + #grid .span9(@gridColumns); + #grid .span10(@gridColumns); + #grid .span11(@gridColumns); + #grid .span12(@gridColumns); + #grid .span13(@gridColumns); + #grid .span14(@gridColumns); + #grid .span15(@gridColumns); + #grid .span16(@gridColumns); + #grid .span17(@gridColumns); + #grid .span18(@gridColumns); + #grid .span19(@gridColumns); + #grid .span20(@gridColumns); + #grid .span21(@gridColumns); + #grid .span22(@gridColumns); + #grid .span23(@gridColumns); + #grid .span24(@gridColumns); } }