diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a90e31930bc0e699aa892c684fb418c3868c37f7..717d1b597508ddc3e54dad3a9966c09cd3a3c1fd 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; @@ -66,11 +70,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; } @@ -87,7 +93,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 { @@ -114,7 +121,8 @@ a:hover { margin-left: -20px; *zoom: 1; } -.row:before, .row:after { +.row:before, +.row:after { display: table; content: ""; } @@ -158,7 +166,8 @@ a:hover { .span11 { width: 860px; } -.span12, .container { +.span12, +.container { width: 940px; } .offset1 { @@ -198,7 +207,8 @@ a:hover { width: 100%; *zoom: 1; } -.row-fluid:before, .row-fluid:after { +.row-fluid:before, +.row-fluid:after { display: table; content: ""; } @@ -254,7 +264,8 @@ a:hover { margin-right: auto; *zoom: 1; } -.container:before, .container:after { +.container:before, +.container:after { display: table; content: ""; } @@ -266,7 +277,8 @@ a:hover { padding-right: 20px; *zoom: 1; } -.container-fluid:before, .container-fluid:after { +.container-fluid:before, +.container-fluid:after { display: table; content: ""; } @@ -330,7 +342,9 @@ h3 { h3 small { font-size: 14px; } -h4, h5, h6 { +h4, +h5, +h6 { line-height: 18px; } h4 { @@ -355,7 +369,8 @@ h6 { .page-header h1 { line-height: 1; } -ul, ol { +ul, +ol { padding: 0; margin: 0 0 9px 25px; } @@ -381,7 +396,8 @@ ul.unstyled { dl { margin-bottom: 18px; } -dt, dd { +dt, +dd { line-height: 18px; } dt { @@ -437,7 +453,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, @@ -458,7 +475,8 @@ small { cite { font-style: normal; } -code, pre { +code, +pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; @@ -551,10 +569,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; @@ -579,11 +601,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 */ @@ -596,7 +621,8 @@ select { width: 220px; background-color: #ffffff; } -select[multiple], select[size] { +select[multiple], +select[size] { height: auto; } input[type="image"] { @@ -610,28 +636,35 @@ 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; 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; } -.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { +.controls > .radio.inline:first-child, +.controls > .checkbox.inline:first-child { padding-top: 0; } -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); @@ -641,7 +674,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); @@ -651,7 +685,9 @@ input:focus, textarea:focus { /* IE6-8 */ } -input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { +input[type="file"]:focus, +input[type="checkbox"]:focus, +select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; @@ -684,40 +720,64 @@ textarea[class*="span"], float: none; 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], @@ -730,65 +790,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; @@ -831,7 +916,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; } @@ -842,7 +928,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, @@ -860,10 +947,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; @@ -882,7 +971,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; } @@ -891,7 +981,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec /* IE6-7 */ } -.input-append input, .input-append .uneditable-input { +.input-append input, +.input-append .uneditable-input { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; @@ -964,7 +1055,8 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec 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: ""; } @@ -992,7 +1084,8 @@ table { width: 100%; margin-bottom: 18px; } -.table th, .table td { +.table th, +.table td { padding: 8px; line-height: 18px; text-align: left; @@ -1005,13 +1098,15 @@ table { .table td { vertical-align: top; } -.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 { @@ -1028,30 +1123,37 @@ table { .table-bordered td + th { 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; } -.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 .span1 { @@ -1496,7 +1598,8 @@ table .span12 { .dropdown-toggle { *margin-bottom: -3px; } -.dropdown-toggle:active, .open .dropdown-toggle { +.dropdown-toggle:active, +.open .dropdown-toggle { outline: 0; } .caret { @@ -1517,7 +1620,8 @@ table .span12 { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, .open.dropdown .caret { +.dropdown:hover .caret, +.open.dropdown .caret { opacity: 1; filter: alpha(opacity=100); } @@ -1574,7 +1678,9 @@ table .span12 { 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; @@ -1702,7 +1808,8 @@ table .span12 { 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); @@ -1712,7 +1819,8 @@ table .span12 { color: rgba(0, 0, 0, 0.5); outline: 0; } -.btn.disabled, .btn[disabled] { +.btn.disabled, +.btn[disabled] { cursor: default; background-image: none; background-color: #e6e6e6; @@ -1782,7 +1890,8 @@ table .span12 { .btn-primary[disabled] { background-color: #0044cc; } -.btn-primary:active, .btn-primary.active { +.btn-primary:active, +.btn-primary.active { background-color: #003399 \9; } .btn-warning { @@ -1806,7 +1915,8 @@ table .span12 { .btn-warning[disabled] { background-color: #f89406; } -.btn-warning:active, .btn-warning.active { +.btn-warning:active, +.btn-warning.active { background-color: #c67605 \9; } .btn-danger { @@ -1830,7 +1940,8 @@ table .span12 { .btn-danger[disabled] { background-color: #bd362f; } -.btn-danger:active, .btn-danger.active { +.btn-danger:active, +.btn-danger.active { background-color: #942a25 \9; } .btn-success { @@ -1854,7 +1965,8 @@ table .span12 { .btn-success[disabled] { background-color: #51a351; } -.btn-success:active, .btn-success.active { +.btn-success:active, +.btn-success.active { background-color: #408140 \9; } .btn-info { @@ -1878,22 +1990,27 @@ table .span12 { .btn-info[disabled] { background-color: #2f96b4; } -.btn-info:active, .btn-info.active { +.btn-info:active, +.btn-info.active { background-color: #24748c \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.large, input[type="submit"].btn.large { +button.btn.large, +input[type="submit"].btn.large { *padding-top: 7px; *padding-bottom: 7px; } -button.btn.small, input[type="submit"].btn.small { +button.btn.small, +input[type="submit"].btn.small { *padding-top: 3px; *padding-bottom: 3px; } @@ -1902,7 +2019,8 @@ button.btn.small, input[type="submit"].btn.small { *zoom: 1; *margin-left: .3em; } -.btn-group:before, .btn-group:after { +.btn-group:before, +.btn-group:after { display: table; content: ""; } @@ -1943,7 +2061,8 @@ button.btn.small, input[type="submit"].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; @@ -1960,7 +2079,8 @@ button.btn.small, input[type="submit"].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; @@ -1974,7 +2094,8 @@ button.btn.small, input[type="submit"].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 { @@ -2006,7 +2127,8 @@ button.btn.small, input[type="submit"].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); } @@ -2031,7 +2153,8 @@ button.btn.small, input[type="submit"].btn.small { -moz-border-radius: 4px; border-radius: 4px; } -.alert, .alert-heading { +.alert, +.alert-heading { color: #c09853; } .alert .close { @@ -2044,10 +2167,12 @@ button.btn.small, input[type="submit"].btn.small { background-color: #dff0d8; border-color: #d6e9c6; } -.alert-success, .alert-success .alert-heading { +.alert-success, +.alert-success .alert-heading { color: #468847; } -.alert-danger, .alert-error { +.alert-danger, +.alert-error { background-color: #f2dede; border-color: #eed3d7; } @@ -2061,14 +2186,16 @@ button.btn.small, input[type="submit"].btn.small { background-color: #d9edf7; border-color: #bce8f1; } -.alert-info, .alert-info .alert-heading { +.alert-info, +.alert-info .alert-heading { color: #3a87ad; } .alert-block { 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 { @@ -2091,7 +2218,8 @@ button.btn.small, input[type="submit"].btn.small { padding-right: 14px; margin-bottom: 0; } -.nav-list > li > a, .nav-list .nav-header { +.nav-list > li > a, +.nav-list .nav-header { display: block; padding: 3px 15px; margin-left: -15px; @@ -2108,7 +2236,8 @@ button.btn.small, input[type="submit"].btn.small { .nav-list > li + .nav-header { margin-top: 9px; } -.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; @@ -2116,7 +2245,8 @@ button.btn.small, input[type="submit"].btn.small { .nav-list [class^="icon-"] { margin-right: 2px; } -.nav-tabs, .nav-pills { +.nav-tabs, +.nav-pills { *zoom: 1; } .nav-tabs:before, @@ -2126,13 +2256,16 @@ button.btn.small, input[type="submit"].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; @@ -2155,7 +2288,8 @@ button.btn.small, input[type="submit"].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; @@ -2171,7 +2305,8 @@ button.btn.small, input[type="submit"].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; } @@ -2210,7 +2345,8 @@ button.btn.small, input[type="submit"].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; } @@ -2219,26 +2355,33 @@ button.btn.small, input[type="submit"].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; 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; } -.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; } .nav > .dropdown.active > a:hover { 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; opacity: 1; filter: alpha(opacity=100); @@ -2249,20 +2392,25 @@ button.btn.small, input[type="submit"].btn.small { .tabbable { *zoom: 1; } -.tabbable:before, .tabbable:after { +.tabbable:before, +.tabbable:after { display: table; content: ""; } .tabbable:after { clear: both; } -.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 { @@ -2281,13 +2429,16 @@ button.btn.small, input[type="submit"].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; @@ -2306,7 +2457,8 @@ button.btn.small, input[type="submit"].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; } @@ -2324,7 +2476,8 @@ button.btn.small, input[type="submit"].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; } @@ -2380,7 +2533,8 @@ button.btn.small, input[type="submit"].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 { @@ -2423,7 +2577,8 @@ button.btn.small, input[type="submit"].btn.small { color: #ffffff; background-color: transparent; } -.navbar .btn, .navbar .btn-group { +.navbar .btn, +.navbar .btn-group { margin-top: 5px; } .navbar .btn-group .btn { @@ -2433,22 +2588,27 @@ button.btn.small, input[type="submit"].btn.small { margin-bottom: 0; *zoom: 1; } -.navbar-form:before, .navbar-form:after { +.navbar-form:before, +.navbar-form:after { display: table; content: ""; } .navbar-form:after { clear: both; } -.navbar-form input, .navbar-form select { +.navbar-form input, +.navbar-form select { display: inline-block; margin-top: 5px; margin-bottom: 0; } -.navbar-form .radio, .navbar-form .checkbox { +.navbar-form .radio, +.navbar-form .checkbox { margin-top: 5px; } -.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-search { @@ -2488,7 +2648,8 @@ button.btn.small, input[type="submit"].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; @@ -2540,7 +2701,8 @@ button.btn.small, input[type="submit"].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; @@ -2585,14 +2747,17 @@ button.btn.small, input[type="submit"].btn.small { top: -6px; left: 10px; } -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { +.navbar .nav .dropdown-toggle .caret, +.navbar .nav .open.dropdown .caret { border-top-color: #ffffff; } .navbar .nav .active .caret { 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 { @@ -2671,14 +2836,16 @@ button.btn.small, input[type="submit"].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 a, .pagination .disabled a:hover { +.pagination .disabled a, +.pagination .disabled a:hover { color: #999999; background-color: transparent; cursor: default; @@ -2707,7 +2874,8 @@ button.btn.small, input[type="submit"].btn.small { text-align: center; *zoom: 1; } -.pager:before, .pager:after { +.pager:before, +.pager:after { display: table; content: ""; } @@ -2760,7 +2928,8 @@ button.btn.small, input[type="submit"].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); } @@ -2823,7 +2992,8 @@ button.btn.small, input[type="submit"].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: ""; } @@ -2998,7 +3168,9 @@ button.btn.small, input[type="submit"].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 { @@ -3006,7 +3178,8 @@ button.btn.small, input[type="submit"].btn.small { list-style: none; *zoom: 1; } -.thumbnails:before, .thumbnails:after { +.thumbnails:before, +.thumbnails:after { display: table; content: ""; } @@ -3261,13 +3434,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%; @@ -3278,7 +3454,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 { @@ -3326,9 +3503,53 @@ 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; } +.carousel-paginator { + *zoom: 1; + position: absolute; + top: 0; + right: 0; +} +.carousel-paginator:before, +.carousel-paginator:after { + display: table; + content: ""; +} +.carousel-paginator:after { + clear: both; +} +.carousel-paginator .item { + position: static; + display: block; + float: left; + margin: 4px; + opacity: 0.5; + filter: alpha(opacity=50); +} +.carousel-paginator .item a { + display: block; + padding: 4px 10px 4px; + border: 2px solid #ffffff; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + border-radius: 50%; + background: rgba(0, 0, 0, 0.75); + color: #ffffff; +} +.carousel-paginator .item a:hover { + text-decoration: none; +} +.carousel-paginator .prev, +.carousel-paginator .next { + width: auto; +} +.carousel-paginator .active { + opacity: 1; + filter: alpha(opacity=100); +} .hero-unit { padding: 60px; margin-bottom: 30px; diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 2f47edb8dc82ef1b1245867aecdd675fcf596aca..1777f1239329a5426121912799f6c8209bcc696f 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -40,11 +40,12 @@ , to: function (pos) { var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) + , $children = $active.parent().children() + , activePos = $children.index($active) + , $child = $children.filter(':nth-child(' + pos + ')') , that = this - if (pos > (children.length - 1) || pos < 0) return + if ( $child.length == 0 ) return if (this.sliding) { return this.$element.one('slid', function () { @@ -56,7 +57,7 @@ return this.pause().cycle() } - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + return this.slide(pos > activePos ? 'next' : 'prev', $child) } , pause: function () { @@ -86,7 +87,7 @@ isCycling && this.pause() - $next = $next.length ? $next : this.$element.find('.item')[fallback]() + $next = $next.length ? $next : this.$element.find('.item').parent().children(':' + fallback + '-child'); if (!$.support.transition && this.$element.hasClass('slide')) { this.$element.trigger('slide') @@ -126,7 +127,9 @@ , options = typeof option == 'object' && option if (!data) $this.data('carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() + else if (typeof option == 'string' || (option = options.slide)) + if (typeof option == 'number') data.to(option) + else data[option]() else data.cycle() }) } diff --git a/docs/javascript.html b/docs/javascript.html index 7960a29e39f8fadbf0f2dd67b8147c203c8a5c3f..78082076c590e3146ce71927cbf72b6b16f68773 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1270,6 +1270,11 @@ $('#myCollapsible').on('hidden', function () { </div> <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> + <ul class="carousel-paginator"> + <li class="item active"><a href="#myCarousel" data-slide="1">1</a></li> + <li class="item"><a href="#myCarousel" data-slide="2">2</a></li> + <li class="item"><a href="#myCarousel" data-slide="3">3</a></li> + </ul> </div> <div class="alert alert-info"> <strong>Heads up!</strong> diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 2f47edb8dc82ef1b1245867aecdd675fcf596aca..013968acab39f7ee7ba490d8abc8068cf7f7b007 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -40,11 +40,12 @@ , to: function (pos) { var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) + , $children = $active.parent().children() + , activePos = $children.index($active) + , $child = $children.filter(':nth-child(' + pos + ')') , that = this - if (pos > (children.length - 1) || pos < 0) return + if ( $child.length == 0 ) return if (this.sliding) { return this.$element.one('slid', function () { @@ -56,7 +57,7 @@ return this.pause().cycle() } - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + return this.slide(pos > activePos ? 'next' : 'prev', $child) } , pause: function () { @@ -86,7 +87,7 @@ isCycling && this.pause() - $next = $next.length ? $next : this.$element.find('.item')[fallback]() + $next = $next.length ? $next : this.$element.find('.item').parent().children(':' + fallback + '-child'); if (!$.support.transition && this.$element.hasClass('slide')) { this.$element.trigger('slide') @@ -126,7 +127,9 @@ , options = typeof option == 'object' && option if (!data) $this.data('carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() + else if (typeof option == 'string' || (option = options.slide)) + if (typeof option == 'number') data.to(option) + else data[option]() else data.cycle() }) } diff --git a/less/carousel.less b/less/carousel.less index 8fbd303154ad7da24caf8c1f0ba30417f6ca702a..b9ec27e8c78883e964288140934e6d1f971ad053 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -119,3 +119,37 @@ .carousel-caption p { color: @white; } + +// Paginator for carousel corner right top +// ----------------------------- + +.carousel-paginator { + .clearfix(); + position: absolute; + top: 0; + right: 0; + .item { + position:static; + display:block; + float:left; + margin:4px; + a { + display:block; + padding: 4px 10px 4px; + border:2px solid @white; + .border-radius(50%); + background: rgba(0,0,0,.75); + color:@white; + } + a:hover { + text-decoration:none; + } + .opacity(50); + } + .prev, .next { + width:auto; + } + .active { + .opacity(100); + } +}