From 4c82dd3645ec60277b07a161c779f57dda10037c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Dec 2012 21:46:14 -0800 Subject: Refactor input groups * Deprecate .input-append and .input-prepend * Use new, single base class for component, .input-group * Deprecate .addon for .input-group-addon * For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns * Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first --- docs/assets/css/bootstrap.css | 343 +++++++++--------------------------------- 1 file changed, 72 insertions(+), 271 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d4495a270..d7fc04bfe 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1340,63 +1340,38 @@ select:focus:invalid:focus { vertical-align: middle; } -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu { - font-size: 14px; +.input-group { + display: table; } -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; +.input-group[class*="span"] { float: none; - margin: 0; - font-size: 14px; - vertical-align: top; - border-radius: 0 4px 4px 0; + padding: 0; } -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; +.input-group input, +.input-group select, +.input-group .uneditable-input { + width: 100%; } -.input-append input[class*="span"], -.input-prepend input[class*="span"], -.input-append select[class*="span"], -.input-prepend select[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend .uneditable-input[class*="span"] { +.input-group-addon, +.input-group-btn, +.input-group input, +.input-group .uneditable-input { + display: table-cell; margin: 0; + border-radius: 0; } -.input-append .add-on, -.input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 6px; +.input-group-addon, +.input-group-btn { + width: 1%; + vertical-align: middle; +} + +.input-group-addon { + padding: 6px 8px; font-size: 14px; font-weight: normal; line-height: 20px; @@ -1404,244 +1379,69 @@ select:focus:invalid:focus { text-shadow: 0 1px 0 #fff; background-color: #eeeeee; border: 1px solid #ccc; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #dff0d8; - border-color: #468847; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn, -.input-append select + .btn-group .btn, -.input-append .uneditable-input + .btn-group .btn, -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE8 doesn't have border radius, so don't indent the padding */ - - margin-bottom: 0; - border-radius: 20px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - border-radius: 0; -} - -.form-search .input-append .search-query { - border-radius: 20px 0 0 20px; -} - -.form-search .input-append .btn { - border-radius: 0 20px 20px 0; -} - -.form-search .input-prepend .search-query { - border-radius: 0 20px 20px 0; -} - -.form-search .input-prepend .btn { - border-radius: 20px 0 0 20px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; +.input-group input:first-child, +.input-group .uneditable-input:first-child, +.input-group-addon:first-child { + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; } -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; +.input-group-addon:first-child { + border-right: 0; } -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; +.input-group input:last-child, +.input-group .uneditable-input:last-child, +.input-group-addon:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - display: inline-block; - padding-left: 0; +.input-group-addon:last-child { + border-left: 0; } -.form-search .radio label, -.form-search .checkbox label, -.form-inline .radio label, -.form-inline .checkbox label { - margin-bottom: 0; - vertical-align: middle; +.input-group-btn, +.input-group-btn .btn { + white-space: nowrap; } -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { +.input-group-btn > .btn { float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; + border-radius: 0; } -.form-horizontal .control-group:after { - clear: both; +.input-group-btn > .btn + .btn { + border-left: 0; } -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; +.input-group-btn.btn-group { + display: table-cell; } -.form-horizontal .controls { - margin-left: 180px; +.input-group-btn:first-child > .btn:last-child, +.input-group-btn.btn-group:first-child > .btn { + border-right: 0; } -.form-horizontal .help-block { - margin-bottom: 0; +.input-group-btn:first-child > .btn:first-child, +.input-group-btn.btn-group:first-child > .btn { + border-radius: 4px 0 0 4px; } -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; +.input-group-btn:last-child > .btn:first-child, +.input-group-btn.btn-group:last-child > .btn:first-child { + border-left: 0; } -.form-horizontal .form-actions { - padding-left: 180px; +.input-group-btn:last-child > .btn:last-child, +.input-group-btn.btn-group:last-child > .btn { + border-radius: 0 4px 4px 0; } table { @@ -2753,21 +2553,22 @@ button.close { color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + white-space: nowrap; vertical-align: middle; cursor: pointer; - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-color: #f0f0f0; + background-image: -moz-linear-gradient(top, #fafafa, #e1e1e1); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, #e1e1e1); + background-image: -o-linear-gradient(top, #fafafa, #e1e1e1); + background-image: linear-gradient(to bottom, #fafafa, #e1e1e1); background-repeat: repeat-x; border: 1px solid #bbbbbb; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: #e1e1e1 #e1e1e1 #bababa; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-bottom-color: #a2a2a2; border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2779,12 +2580,12 @@ button.close { .btn.disabled, .btn[disabled] { color: #333333; - background-color: #e6e6e6; + background-color: #e1e1e1; } .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #c7c7c7 \9; } .btn:hover { @@ -3205,7 +3006,7 @@ input[type="button"].btn-block { } .btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; + background-color: #e1e1e1; } .btn-group.open .btn-primary.dropdown-toggle { -- cgit v1.2.3 From c10590678019b9b78e0af7893361d005d839c8b5 Mon Sep 17 00:00:00 2001 From: Blake Embrey Date: Mon, 10 Dec 2012 16:42:41 +1000 Subject: Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 --- docs/assets/css/bootstrap.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8ab3cefcf..a4c94eea7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2909,7 +2909,7 @@ table th[class*="span"], border-bottom: 1px solid #ffffff; } -.dropdown-menu li > a { +.dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; @@ -2919,8 +2919,8 @@ table th[class*="span"], white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, .dropdown-submenu:hover > a { color: #ffffff; text-decoration: none; @@ -2934,8 +2934,8 @@ table th[class*="span"], filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover { color: #ffffff; text-decoration: none; background-color: #0081c2; @@ -2949,12 +2949,12 @@ table th[class*="span"], filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover { color: #999999; } -.dropdown-menu .disabled > a:hover { +.dropdown-menu > .disabled > a:hover { text-decoration: none; cursor: default; background-color: transparent; -- cgit v1.2.3 From 3b5d4f52a3c2a11ec732fd9ca3b58e83290cd03c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 9 Dec 2012 23:42:05 -0800 Subject: fixes #5605: style as disabled all form controls & btns under a disabled fieldset this is a resubmission of #5875, but now against branch 3.0.0-wip does not exclude elements under a fieldset's legend issue #6058 is a duplicate of #5605 --- docs/assets/css/bootstrap.css | 45 +++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d4495a270..06384d364 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1130,7 +1130,10 @@ select[disabled], textarea[disabled], input[readonly], select[readonly], -textarea[readonly] { +textarea[readonly], +fieldset[disabled] input, +fieldset[disabled] select, +fieldset[disabled] textarea { cursor: not-allowed; background-color: #eeeeee; } @@ -1138,7 +1141,9 @@ textarea[readonly] { input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"][readonly], -input[type="checkbox"][readonly] { +input[type="checkbox"][readonly], +fieldset[disabled] input[type="radio"], +fieldset[disabled] input[type="checkbox"] { background-color: transparent; } @@ -2777,7 +2782,8 @@ button.close { .btn:active, .btn.active, .btn.disabled, -.btn[disabled] { +.btn[disabled], +fieldset[disabled] .btn { color: #333333; background-color: #e6e6e6; } @@ -2812,7 +2818,8 @@ button.close { } .btn.disabled, -.btn[disabled] { +.btn[disabled], +fieldset[disabled] .btn { cursor: default; background-image: none; opacity: 0.65; @@ -2907,7 +2914,8 @@ input[type="button"].btn-block { .btn-primary:active, .btn-primary.active, .btn-primary.disabled, -.btn-primary[disabled] { +.btn-primary[disabled], +fieldset[disabled] .btn-primary { color: #ffffff; background-color: #0044cc; } @@ -2937,7 +2945,8 @@ input[type="button"].btn-block { .btn-warning:active, .btn-warning.active, .btn-warning.disabled, -.btn-warning[disabled] { +.btn-warning[disabled], +fieldset[disabled] .btn-warning { color: #ffffff; background-color: #f89406; } @@ -2967,7 +2976,8 @@ input[type="button"].btn-block { .btn-danger:active, .btn-danger.active, .btn-danger.disabled, -.btn-danger[disabled] { +.btn-danger[disabled], +fieldset[disabled] .btn-danger { color: #ffffff; background-color: #bd362f; } @@ -2997,7 +3007,8 @@ input[type="button"].btn-block { .btn-success:active, .btn-success.active, .btn-success.disabled, -.btn-success[disabled] { +.btn-success[disabled], +fieldset[disabled] .btn-success { color: #ffffff; background-color: #51a351; } @@ -3027,7 +3038,8 @@ input[type="button"].btn-block { .btn-info:active, .btn-info.active, .btn-info.disabled, -.btn-info[disabled] { +.btn-info[disabled], +fieldset[disabled] .btn-info { color: #ffffff; background-color: #2f96b4; } @@ -3057,7 +3069,8 @@ input[type="button"].btn-block { .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, -.btn-inverse[disabled] { +.btn-inverse[disabled], +fieldset[disabled] .btn-inverse { color: #ffffff; background-color: #222222; } @@ -3069,7 +3082,8 @@ input[type="button"].btn-block { .btn-link, .btn-link:active, -.btn-link[disabled] { +.btn-link[disabled], +fieldset[disabled] .btn-link { background-color: transparent; background-image: none; -webkit-box-shadow: none; @@ -3089,7 +3103,8 @@ input[type="button"].btn-block { background-color: transparent; } -.btn-link[disabled]:hover { +.btn-link[disabled]:hover, +fieldset[disabled] .btn-link:hover { color: #333333; text-decoration: none; } @@ -3883,7 +3898,8 @@ input[type="button"].btn-block { .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { +.navbar .btn-navbar[disabled], +fieldset[disabled] .navbar .btn-navbar { color: #ffffff; background-color: #e5e5e5; } @@ -4133,7 +4149,8 @@ input[type="button"].btn-block { .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active, .navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { +.navbar-inverse .btn-navbar[disabled], +fieldset[disabled] .navbar-inverse .btn-navbar { color: #ffffff; background-color: #040404; } -- cgit v1.2.3 From ab5d7f863c2b2e7c6fc9ae48ddaea405aa153629 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 09:57:23 -0800 Subject: move reset after vars and mixins --- docs/assets/css/bootstrap.css | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8ab3cefcf..53f3a8cb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -8,6 +8,38 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ +.clearfix { + *zoom: 1; +} + +.clearfix:before, +.clearfix:after { + display: table; + line-height: 0; + content: ""; +} + +.clearfix:after { + clear: both; +} + +.hide-text { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + +.input-block-level { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + article, aside, details, @@ -189,38 +221,6 @@ textarea { } } -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -- cgit v1.2.3 From 83a6a55d2c3448771925f467be1f2ced321e63df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 10:25:18 -0800 Subject: Move IE10 responsive fix to responsive utilities so Customizer gets it --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53f3a8cb1..0e9f0cdf6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6014,6 +6014,10 @@ a.badge:hover { line-height: 30px; } +@-ms-viewport { + width: device-width; +} + .pull-right { float: right; } -- cgit v1.2.3 From 847b632577ee46f2acf0b0778c5a3014428cb528 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 10:29:16 -0800 Subject: IE10 fix in responsive utilities, not regular utilities --- docs/assets/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0e9f0cdf6..53f3a8cb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6014,10 +6014,6 @@ a.badge:hover { line-height: 30px; } -@-ms-viewport { - width: device-width; -} - .pull-right { float: right; } -- cgit v1.2.3 From cddca18f122887b183aa3a8e601c5cd1aa80c206 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 10:59:57 -0800 Subject: Fixes #6174: Caret alignment in small and mini buttons --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53f3a8cb1..842eb4c30 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3744,8 +3744,6 @@ input[type="submit"].btn.btn-mini { margin-left: 0; } -.btn-mini .caret, -.btn-small .caret, .btn-large .caret { margin-top: 6px; } @@ -3756,6 +3754,11 @@ input[type="submit"].btn.btn-mini { border-left-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} + .dropup .btn-large .caret { border-bottom-width: 5px; } -- cgit v1.2.3 From 529ecc5a77c9e653dd7219bd4457cb994e338075 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 18:31:04 -0800 Subject: Version bump --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 842eb4c30..1940302cd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.2.2 + * Bootstrap v2.2.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3 From dc6142751feced6761f67503323c0c6e62844d4e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 18:46:55 -0800 Subject: Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1940302cd..6ef11ed9b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5519,11 +5519,11 @@ a.thumbnail:hover { margin: 0 0 5px; } -.media .pull-left { +.media > .pull-left { margin-right: 10px; } -.media .pull-right { +.media > .pull-right { margin-left: 10px; } -- cgit v1.2.3 From 19a94d08d659d39e718efca95812cac2db178b15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 19:33:14 -0800 Subject: Remove support for multiple buttons in input groups because fuck that shit. --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d7fc04bfe..ce707c9f2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1424,22 +1424,22 @@ select:focus:invalid:focus { display: table-cell; } -.input-group-btn:first-child > .btn:last-child, +.input-group-btn:first-child > .btn, .input-group-btn.btn-group:first-child > .btn { border-right: 0; } -.input-group-btn:first-child > .btn:first-child, +.input-group-btn:first-child > .btn, .input-group-btn.btn-group:first-child > .btn { border-radius: 4px 0 0 4px; } -.input-group-btn:last-child > .btn:first-child, +.input-group-btn:last-child > .btn, .input-group-btn.btn-group:last-child > .btn:first-child { border-left: 0; } -.input-group-btn:last-child > .btn:last-child, +.input-group-btn:last-child > .btn, .input-group-btn.btn-group:last-child > .btn { border-radius: 0 4px 4px 0; } -- cgit v1.2.3 From 26b999b76ac564b89f21e6f80cc3052f57b60aa2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 19:46:44 -0800 Subject: no need for margin-top on .typeahead, it's set on .dropdown-menu --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ce707c9f2..0d90fab61 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2462,7 +2462,6 @@ table th[class*="span"] { .typeahead { z-index: 1051; - margin-top: 2px; } .well { -- cgit v1.2.3 From c6cc1b1a1d401e30e2cb7df853461dfc78134f7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 21:18:32 -0800 Subject: Drop .label component. Instead, just use .badge because fuck dupe code and stuff. --- docs/assets/css/bootstrap.css | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 829c27039..299049115 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4521,7 +4521,6 @@ a.thumbnail:hover { list-style: none; } -.label, .badge { display: inline-block; padding: 2px 4px; @@ -4533,87 +4532,64 @@ a.thumbnail:hover { white-space: nowrap; vertical-align: baseline; background-color: #999999; -} - -.label { border-radius: 3px; } -.badge { - padding-right: 9px; - padding-left: 9px; - border-radius: 9px; -} - -.label:empty, .badge:empty { display: none; } -a.label:hover, a.badge:hover { color: #fff; text-decoration: none; cursor: pointer; } -.label-danger, .badge-danger { background-color: #b94a48; } -.label-danger[href], .badge-danger[href] { background-color: #953b39; } -.label-warning, .badge-warning { background-color: #f89406; } -.label-warning[href], .badge-warning[href] { background-color: #c67605; } -.label-success, .badge-success { background-color: #468847; } -.label-success[href], .badge-success[href] { background-color: #356635; } -.label-info, .badge-info { background-color: #3a87ad; } -.label-info[href], .badge-info[href] { background-color: #2d6987; } -.label-inverse, .badge-inverse { background-color: #333333; } -.label-inverse[href], .badge-inverse[href] { background-color: #1a1a1a; } -.btn .label, .btn .badge { position: relative; top: -1px; } -.btn-mini .label, .btn-mini .badge { top: 0; } -- cgit v1.2.3 From b6945a21682042948543fd6809976d06ad234384 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 21:37:16 -0800 Subject: Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 299049115..0968ee621 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4974,7 +4974,7 @@ a.badge:hover { margin-bottom: 0; } -.hero-unit { +.jumbotron { padding: 60px; margin-bottom: 30px; font-size: 18px; @@ -4985,7 +4985,7 @@ a.badge:hover { border-radius: 6px; } -.hero-unit h1 { +.jumbotron h1 { margin-bottom: 0; font-size: 60px; line-height: 1; @@ -4993,7 +4993,7 @@ a.badge:hover { color: inherit; } -.hero-unit li { +.jumbotron li { line-height: 30px; } -- cgit v1.2.3 From 7449e2e5a18d3f5d3c0ef76b0960f70b77fb47e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 22:02:57 -0800 Subject: Remove @black and just use #000 --- docs/assets/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0968ee621..5051c7ef9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2277,7 +2277,7 @@ table th[class*="span"] { width: 0; height: 0; vertical-align: top; - border-top: 4px solid #000000; + border-top: 4px solid #000; border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; @@ -2388,7 +2388,7 @@ table th[class*="span"] { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid #000000; + border-bottom: 4px solid #000; content: ""; } @@ -2517,14 +2517,14 @@ table th[class*="span"] { font-size: 20px; font-weight: bold; line-height: 20px; - color: #000000; + color: #000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } .close:hover { - color: #000000; + color: #000; text-decoration: none; cursor: pointer; opacity: 0.4; @@ -4133,7 +4133,7 @@ input[type="button"].btn-block { bottom: 0; left: 0; z-index: 1040; - background-color: #000000; + background-color: #000; } .modal-backdrop.fade { -- cgit v1.2.3 From c38b7206eb049f57c7b1db570817739bdda0be6f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 22:25:56 -0800 Subject: overhaul buttons --- docs/assets/css/bootstrap.css | 351 ++++++++++++------------------------------ 1 file changed, 95 insertions(+), 256 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5051c7ef9..87b2942a1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2541,56 +2541,16 @@ button.close { .btn { display: inline-block; - padding: 6px 12px; + padding: 7px 13px; margin-bottom: 0; font-size: 14px; + font-weight: bold; line-height: 20px; - color: #333333; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - white-space: nowrap; vertical-align: middle; cursor: pointer; - background-color: #f0f0f0; - background-image: -moz-linear-gradient(top, #fafafa, #e1e1e1); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #fafafa, #e1e1e1); - background-image: -o-linear-gradient(top, #fafafa, #e1e1e1); - background-image: linear-gradient(to bottom, #fafafa, #e1e1e1); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - border-color: #e1e1e1 #e1e1e1 #bababa; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; + border: 0; border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e1e1e1; -} - -.btn:active, -.btn.active { - background-color: #c7c7c7 \9; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; } .btn:focus { @@ -2599,9 +2559,12 @@ button.close { outline-offset: -2px; } -.btn.active, -.btn:active { - background-image: none; +.btn:hover { + text-decoration: none; +} + +.btn:active, +.btn.active { outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2610,13 +2573,79 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-image: none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; } +.btn-default { + padding: 6px 12px; + color: #5a5a5a; + background-color: #fff; + border: 1px solid #ccc; +} + +.btn-default:hover { + color: #fff; + background-color: #999; + border-color: #999; +} + +/* +// Core +.btn { + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; // For input.btn + font-size: @font-size-base; + line-height: @line-height-base; + text-align: center; + vertical-align: middle; + cursor: pointer; + white-space: nowrap; + .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); + border: 1px solid @btn-border; + border-bottom-color: darken(@btn-border, 10%); + border-radius: @border-radius-base; + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); + + // Hover state + &:hover { + color: @grayDark; + text-decoration: none; + background-position: 0 -15px; + + // transition is only when going to hover, otherwise the background + // behind the gradient (there for IE<=9 fallback) gets mismatched + .transition(background-position .1s linear); + } + + // Focus state for keyboard and accessibility + &:focus { + .tab-focus(); + } + + // Active state + &.active, + &:active { + background-image: none; + outline: 0; + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); + } + + // Disabled state + &.disabled, + &[disabled] { + cursor: default; + background-image: none; + .opacity(65); + .box-shadow(none); + } + +} +*/ + .btn-large { padding: 11px 19px; font-size: 17.5px; @@ -2669,198 +2698,52 @@ input[type="button"].btn-block { width: 100%; } -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - .btn-primary { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + background-color: #0088cc; } .btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; -} - .btn-primary:active, .btn-primary.active { - background-color: #003399 \9; + color: #ffffff; + background-color: #006699; } .btn-warning { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + background-color: #fbb450; } .btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; -} - .btn-warning:active, .btn-warning.active { - background-color: #c67605 \9; + color: #ffffff; + background-color: #fa9f1e; } .btn-danger { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + background-color: #ee5f5b; } .btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; -} - .btn-danger:active, .btn-danger.active { - background-color: #942a25 \9; + color: #ffffff; + background-color: #e9322d; } .btn-success { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + background-color: #62c462; } .btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; -} - .btn-success:active, .btn-success.active { - background-color: #408140 \9; -} - -.btn-info { color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; + background-color: #42b142; } .btn-link, @@ -3020,14 +2903,6 @@ input[type="button"].btn-block { background-color: #51a351; } -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - .btn .caret { margin-top: 8px; margin-left: 0; @@ -3654,35 +3529,17 @@ input[type="button"].btn-block { padding: 7px 10px; margin-right: 5px; margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #e5e5e5; + background-color: #f2f2f2; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); } .navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; -} - .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #cccccc \9; + color: #e5e5e5; + background-color: #d9d9d9; } .navbar .btn-navbar .icon-bar { @@ -3906,33 +3763,15 @@ input[type="button"].btn-block { } .navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + color: #040404; + background-color: #151515; } .navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; -} - .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active { - background-color: #000000 \9; + color: #040404; + background-color: #000000; } .breadcrumb { -- cgit v1.2.3 From afef81c0d79fc0c8bc313f7f46f4f92f7e3a9988 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 22:30:08 -0800 Subject: remove commented out buttons css, update docs --- docs/assets/css/bootstrap.css | 78 +++++-------------------------------------- 1 file changed, 9 insertions(+), 69 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87b2942a1..e3214cbc5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2546,11 +2546,17 @@ button.close { font-size: 14px; font-weight: bold; line-height: 20px; + color: #555555; text-align: center; vertical-align: middle; cursor: pointer; + background-color: #eee; border: 0; border-radius: 4px; + -webkit-transition: all 0.075s ease-in-out; + -moz-transition: all 0.075s ease-in-out; + -o-transition: all 0.075s ease-in-out; + transition: all 0.075s ease-in-out; } .btn:focus { @@ -2561,13 +2567,14 @@ button.close { .btn:hover { text-decoration: none; + background-color: #ddd; } .btn:active, .btn.active { outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); } .btn.disabled, @@ -2579,73 +2586,6 @@ button.close { box-shadow: none; } -.btn-default { - padding: 6px 12px; - color: #5a5a5a; - background-color: #fff; - border: 1px solid #ccc; -} - -.btn-default:hover { - color: #fff; - background-color: #999; - border-color: #999; -} - -/* -// Core -.btn { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; // For input.btn - font-size: @font-size-base; - line-height: @line-height-base; - text-align: center; - vertical-align: middle; - cursor: pointer; - white-space: nowrap; - .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); - border: 1px solid @btn-border; - border-bottom-color: darken(@btn-border, 10%); - border-radius: @border-radius-base; - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); - - // Hover state - &:hover { - color: @grayDark; - text-decoration: none; - background-position: 0 -15px; - - // transition is only when going to hover, otherwise the background - // behind the gradient (there for IE<=9 fallback) gets mismatched - .transition(background-position .1s linear); - } - - // Focus state for keyboard and accessibility - &:focus { - .tab-focus(); - } - - // Active state - &.active, - &:active { - background-image: none; - outline: 0; - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); - } - - // Disabled state - &.disabled, - &[disabled] { - cursor: default; - background-image: none; - .opacity(65); - .box-shadow(none); - } - -} -*/ - .btn-large { padding: 11px 19px; font-size: 17.5px; -- cgit v1.2.3 From 9b4e5746a4340855e86ed16e15331e10ac23a687 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 22:54:04 -0800 Subject: More button tweaks --- docs/assets/css/bootstrap.css | 170 +++++++++++++++++++++++++++++++++++------- 1 file changed, 143 insertions(+), 27 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e3214cbc5..0def4f909 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -180,6 +180,27 @@ textarea { } } +/*.buttonBackground(@startColor, @endColor, @text-color: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { + color: @text-color; + text-shadow: @textShadow; + #gradient > .vertical(@startColor, @endColor); + border-color: @endColor @endColor darken(@endColor, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); + .reset-filter(); + + // in these cases the gradient won't cover the background, so we override + &:hover, &:active, &.active, &.disabled, &[disabled] { + color: @text-color; + background-color: @endColor; + } + + // IE8 can't handle box-shadow to show active, so we darken a bit ourselves + &:active, + &.active { + background-color: darken(@endColor, 10%) e("\9"); + } +}*/ + body { margin: 0; color: #333333; @@ -2541,22 +2562,27 @@ button.close { .btn { display: inline-block; - padding: 7px 13px; + padding: 6px 13px; margin-bottom: 0; font-size: 14px; - font-weight: bold; line-height: 20px; color: #555555; text-align: center; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; - background-color: #eee; - border: 0; + background-color: #f0f0f0; + background-image: -moz-linear-gradient(top, #fafafa, #e1e1e1); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#e1e1e1)); + background-image: -webkit-linear-gradient(top, #fafafa, #e1e1e1); + background-image: -o-linear-gradient(top, #fafafa, #e1e1e1); + background-image: linear-gradient(to bottom, #fafafa, #e1e1e1); + background-repeat: repeat-x; + border: 1px solid #c7c7c7; border-radius: 4px; - -webkit-transition: all 0.075s ease-in-out; - -moz-transition: all 0.075s ease-in-out; - -o-transition: all 0.075s ease-in-out; - transition: all 0.075s ease-in-out; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } .btn:focus { @@ -2567,14 +2593,14 @@ button.close { .btn:hover { text-decoration: none; - background-color: #ddd; } .btn:active, .btn.active { + background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); } .btn.disabled, @@ -2640,50 +2666,110 @@ input[type="button"].btn-block { .btn-primary { color: #ffffff; - background-color: #0088cc; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + border-color: #003bb3; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); } .btn-primary:hover, .btn-primary:active, .btn-primary.active { color: #ffffff; - background-color: #006699; + background-color: #0044cc; + background-position: 0 -15px; +} + +.btn-primary:active, +.btn-primary.active { + background-image: none; } .btn-warning { color: #ffffff; - background-color: #fbb450; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #faa732; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); + background-repeat: repeat-x; + border-color: #df8505; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } .btn-warning:hover, .btn-warning:active, .btn-warning.active { color: #ffffff; - background-color: #fa9f1e; + background-color: #f89406; + background-position: 0 -15px; +} + +.btn-warning:active, +.btn-warning.active { + background-image: none; } .btn-danger { color: #ffffff; - background-color: #ee5f5b; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #da4f49; + background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); + background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); + background-repeat: repeat-x; + border-color: #a9302a; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); } .btn-danger:hover, .btn-danger:active, .btn-danger.active { color: #ffffff; - background-color: #e9322d; + background-color: #bd362f; + background-position: 0 -15px; +} + +.btn-danger:active, +.btn-danger.active { + background-image: none; } .btn-success { color: #ffffff; - background-color: #62c462; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #5bb75b; + background-image: -moz-linear-gradient(top, #62c462, #51a351); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); + background-image: -webkit-linear-gradient(top, #62c462, #51a351); + background-image: -o-linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); + background-repeat: repeat-x; + border-color: #499249; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); } .btn-success:hover, .btn-success:active, .btn-success.active { color: #ffffff; - background-color: #42b142; + background-color: #51a351; + background-position: 0 -15px; +} + +.btn-success:active, +.btn-success.active { + background-image: none; } .btn-link, @@ -3469,8 +3555,17 @@ input[type="button"].btn-block { padding: 7px 10px; margin-right: 5px; margin-left: 5px; - color: #e5e5e5; - background-color: #f2f2f2; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); + background-repeat: repeat-x; + border-color: #d9d9d9; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); } @@ -3478,8 +3573,14 @@ input[type="button"].btn-block { .navbar .btn-navbar:hover, .navbar .btn-navbar:active, .navbar .btn-navbar.active { - color: #e5e5e5; - background-color: #d9d9d9; + color: #ffffff; + background-color: #e5e5e5; + background-position: 0 -15px; +} + +.navbar .btn-navbar:active, +.navbar .btn-navbar.active { + background-image: none; } .navbar .btn-navbar .icon-bar { @@ -3703,15 +3804,30 @@ input[type="button"].btn-block { } .navbar-inverse .btn-navbar { - color: #040404; - background-color: #151515; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + background-image: -moz-linear-gradient(top, #151515, #040404); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-repeat: repeat-x; + border-color: #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); } .navbar-inverse .btn-navbar:hover, .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active { - color: #040404; - background-color: #000000; + color: #ffffff; + background-color: #040404; + background-position: 0 -15px; +} + +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-image: none; } .breadcrumb { -- cgit v1.2.3 From a27952efd0f25e99030a9384f66bcd602d6a1b37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 23:12:38 -0800 Subject: Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code --- docs/assets/css/bootstrap.css | 69 +++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 45 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0def4f909..e8c2b1fc2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -180,27 +180,6 @@ textarea { } } -/*.buttonBackground(@startColor, @endColor, @text-color: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { - color: @text-color; - text-shadow: @textShadow; - #gradient > .vertical(@startColor, @endColor); - border-color: @endColor @endColor darken(@endColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); - .reset-filter(); - - // in these cases the gradient won't cover the background, so we override - &:hover, &:active, &.active, &.disabled, &[disabled] { - color: @text-color; - background-color: @endColor; - } - - // IE8 can't handle box-shadow to show active, so we darken a bit ourselves - &:active, - &.active { - background-color: darken(@endColor, 10%) e("\9"); - } -}*/ - body { margin: 0; color: #333333; @@ -2359,7 +2338,7 @@ table th[class*="span"] { .dropdown-submenu:hover > a { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: #0077b3; background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); @@ -2373,7 +2352,7 @@ table th[class*="span"] { .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: #0077b3; background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); @@ -2571,16 +2550,16 @@ button.close { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; - background-color: #f0f0f0; - background-image: -moz-linear-gradient(top, #fafafa, #e1e1e1); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#e1e1e1)); - background-image: -webkit-linear-gradient(top, #fafafa, #e1e1e1); - background-image: -o-linear-gradient(top, #fafafa, #e1e1e1); - background-image: linear-gradient(to bottom, #fafafa, #e1e1e1); + background-color: #dadada; + background-image: -moz-linear-gradient(top, #fafafa, #dadada); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#dadada)); + background-image: -webkit-linear-gradient(top, #fafafa, #dadada); + background-image: -o-linear-gradient(top, #fafafa, #dadada); + background-image: linear-gradient(to bottom, #fafafa, #dadada); background-repeat: repeat-x; border: 1px solid #c7c7c7; border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffdadada', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } @@ -2667,7 +2646,7 @@ input[type="button"].btn-block { .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; + background-color: #0044cc; background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); @@ -2694,7 +2673,7 @@ input[type="button"].btn-block { .btn-warning { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; + background-color: #f89406; background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); @@ -2721,7 +2700,7 @@ input[type="button"].btn-block { .btn-danger { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; + background-color: #bd362f; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); @@ -2748,7 +2727,7 @@ input[type="button"].btn-block { .btn-success { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; + background-color: #51a351; background-image: -moz-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); @@ -2910,7 +2889,7 @@ input[type="button"].btn-block { } .btn-group.open .btn.dropdown-toggle { - background-color: #e1e1e1; + background-color: #dadada; } .btn-group.open .btn-primary.dropdown-toggle { @@ -3316,7 +3295,7 @@ input[type="button"].btn-block { padding: 0 20px; margin-bottom: 20px; overflow: visible; - background-color: #fafafa; + background-color: #f2f2f2; background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); @@ -3557,7 +3536,7 @@ input[type="button"].btn-block { margin-left: 5px; color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; + background-color: #e5e5e5; background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); @@ -3687,7 +3666,7 @@ input[type="button"].btn-block { } .navbar-inverse { - background-color: #1b1b1b; + background-color: #111111; background-image: -moz-linear-gradient(top, #222222, #111111); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); background-image: -webkit-linear-gradient(top, #222222, #111111); @@ -3806,7 +3785,7 @@ input[type="button"].btn-block { .navbar-inverse .btn-navbar { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; + background-color: #040404; background-image: -moz-linear-gradient(top, #151515, #040404); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); background-image: -webkit-linear-gradient(top, #151515, #040404); @@ -4538,7 +4517,7 @@ a.badge:hover { height: 20px; margin-bottom: 20px; overflow: hidden; - background-color: #f7f7f7; + background-color: #f9f9f9; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); @@ -4559,7 +4538,7 @@ a.badge:hover { color: #fff; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; + background-color: #0480be; background-image: -moz-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); @@ -4606,7 +4585,7 @@ a.badge:hover { .progress-danger .bar, .progress .bar-danger { - background-color: #dd514c; + background-color: #c43c35; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); @@ -4628,7 +4607,7 @@ a.badge:hover { .progress-success .bar, .progress .bar-success { - background-color: #5eb95e; + background-color: #57a957; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); @@ -4650,7 +4629,7 @@ a.badge:hover { .progress-info .bar, .progress .bar-info { - background-color: #4bb1cf; + background-color: #339bb9; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); @@ -4672,7 +4651,7 @@ a.badge:hover { .progress-warning .bar, .progress .bar-warning { - background-color: #faa732; + background-color: #f89406; background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); -- cgit v1.2.3 From 14844db862a61c92be982921e14a526484f3b8a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 23:37:33 -0800 Subject: Holy shit, buttons, button states, and input states updated --- docs/assets/css/bootstrap.css | 106 ++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 34 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 83fec25ae..b88f21cd7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1100,7 +1100,7 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input[class*="span"] { - height: 30px; + height: 34px; } .controls-row:before, @@ -2550,21 +2550,11 @@ button.close { margin-bottom: 0; font-size: 14px; line-height: 20px; - color: #555555; text-align: center; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; - background-color: #dadada; - background-image: -moz-linear-gradient(top, #fafafa, #dadada); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#dadada)); - background-image: -webkit-linear-gradient(top, #fafafa, #dadada); - background-image: -o-linear-gradient(top, #fafafa, #dadada); - background-image: linear-gradient(to bottom, #fafafa, #dadada); - background-repeat: repeat-x; - border: 1px solid #c7c7c7; + border: 1px solid #ccc; border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffdadada', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } @@ -2583,8 +2573,8 @@ button.close { .btn.active { background-image: none; outline: 0; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 1px 0 rgba(255, 255, 255, 0.1); } .btn.disabled, @@ -2649,30 +2639,63 @@ input[type="button"].btn-block { width: 100%; } +.btn { + color: #555555; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.75); + background-color: #dadada; + background-image: -moz-linear-gradient(top, #fafafa, #dadada); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#dadada)); + background-image: -webkit-linear-gradient(top, #fafafa, #dadada); + background-image: -o-linear-gradient(top, #fafafa, #dadada); + background-image: linear-gradient(to bottom, #fafafa, #dadada); + background-repeat: repeat-x; + border-color: #c7c7c7; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffdadada', GradientType=0); +} + +.btn:hover, +.btn:active, +.btn.active { + color: #555555; + background-color: #dadada; + background-position: 0 -15px; +} + +.btn:active, +.btn.active, +.btn[disabled], +.btn.disabled, +fieldset[disabled] .btn { + background-image: none; +} + .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-color: #006699; + background-image: -moz-linear-gradient(top, #0088cc, #006699); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#006699)); + background-image: -webkit-linear-gradient(top, #0088cc, #006699); + background-image: -o-linear-gradient(top, #0088cc, #006699); + background-image: linear-gradient(to bottom, #0088cc, #006699); background-repeat: repeat-x; - border-color: #003bb3; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + border-color: #004c73; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff006699', GradientType=0); } .btn-primary:hover, .btn-primary:active, .btn-primary.active { color: #ffffff; - background-color: #0044cc; + background-color: #006699; background-position: 0 -15px; } .btn-primary:active, -.btn-primary.active { +.btn-primary.active, +.btn-primary[disabled], +.btn-primary.disabled, +fieldset[disabled] .btn-primary { background-image: none; } @@ -2686,7 +2709,7 @@ input[type="button"].btn-block { background-image: -o-linear-gradient(top, #fbb450, #f89406); background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - border-color: #df8505; + border-color: #d37e05; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } @@ -2699,7 +2722,10 @@ input[type="button"].btn-block { } .btn-warning:active, -.btn-warning.active { +.btn-warning.active, +.btn-warning[disabled], +.btn-warning.disabled, +fieldset[disabled] .btn-warning { background-image: none; } @@ -2713,7 +2739,7 @@ input[type="button"].btn-block { background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - border-color: #a9302a; + border-color: #9e2d27; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); } @@ -2726,7 +2752,10 @@ input[type="button"].btn-block { } .btn-danger:active, -.btn-danger.active { +.btn-danger.active, +.btn-danger[disabled], +.btn-danger.disabled, +fieldset[disabled] .btn-danger { background-image: none; } @@ -2740,7 +2769,7 @@ input[type="button"].btn-block { background-image: -o-linear-gradient(top, #62c462, #51a351); background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - border-color: #499249; + border-color: #448944; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); } @@ -2753,7 +2782,10 @@ input[type="button"].btn-block { } .btn-success:active, -.btn-success.active { +.btn-success.active, +.btn-success[disabled], +.btn-success.disabled, +fieldset[disabled] .btn-success { background-image: none; } @@ -2901,7 +2933,7 @@ fieldset[disabled] .btn-link:hover { } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; + background-color: #006699; } .btn-group.open .btn-warning.dropdown-toggle { @@ -3551,7 +3583,7 @@ fieldset[disabled] .btn-link:hover { background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); background-repeat: repeat-x; - border-color: #d9d9d9; + border-color: #d2d2d2; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -3566,7 +3598,10 @@ fieldset[disabled] .btn-link:hover { } .navbar .btn-navbar:active, -.navbar .btn-navbar.active { +.navbar .btn-navbar.active, +.navbar .btn-navbar[disabled], +.navbar .btn-navbar.disabled, +fieldset[disabled] .navbar .btn-navbar { background-image: none; } @@ -3813,7 +3848,10 @@ fieldset[disabled] .btn-link:hover { } .navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar[disabled], +.navbar-inverse .btn-navbar.disabled, +fieldset[disabled] .navbar-inverse .btn-navbar { background-image: none; } -- cgit v1.2.3 From 9726fded1c587c14b57a61a92b88ac74fe21d320 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 23:52:38 -0800 Subject: Get on that carousel indicator lifestyle with some new hawtness --- docs/assets/css/bootstrap.css | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6ef11ed9b..9b77c47b8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5968,6 +5968,31 @@ a.badge:hover { filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} + +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} + +.carousel-indicators .active { + background-color: #fff; +} + .carousel-caption { position: absolute; right: 0; -- cgit v1.2.3 From cc6974b74e34bd3b0a69fb8b6334fd8a328ca949 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 00:27:05 -0800 Subject: Remove dropdown submenu CSS --- docs/assets/css/bootstrap.css | 55 +------------------------------------------ 1 file changed, 1 insertion(+), 54 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1a8f313f8..49787f131 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2339,8 +2339,7 @@ table th[class*="span"] { } .dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { +.dropdown-menu li > a:focus { color: #ffffff; text-decoration: none; background-color: #0077b3; @@ -2404,58 +2403,6 @@ table th[class*="span"] { margin-bottom: 1px; } -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - border-radius: 0 4px 4px 4px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - border-radius: 4px 4px 4px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - border-radius: 4px 0 4px 4px; -} - .dropdown .dropdown-menu .nav-header { padding-right: 20px; padding-left: 20px; -- cgit v1.2.3 From c00f29e4d4e157376c2b24a64bee67bc67e7136a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 00:54:58 -0800 Subject: Fixes #6236: Fix popover font-size in input groups --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9b77c47b8..6a409dd20 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1658,7 +1658,9 @@ select:focus:invalid:focus { .input-append .uneditable-input, .input-prepend .uneditable-input, .input-append .dropdown-menu, -.input-prepend .dropdown-menu { +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { font-size: 14px; } -- cgit v1.2.3 From cdb25e11ef6f13f095eacbef731cf43902230203 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 01:21:09 -0800 Subject: lighter buttons closer to todays versions --- docs/assets/css/bootstrap.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 49787f131..de8369d70 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2589,22 +2589,22 @@ input[type="button"].btn-block { .btn { color: #555555; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.75); - background-color: #dadada; - background-image: -moz-linear-gradient(top, #fafafa, #dadada); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafa), to(#dadada)); - background-image: -webkit-linear-gradient(top, #fafafa, #dadada); - background-image: -o-linear-gradient(top, #fafafa, #dadada); - background-image: linear-gradient(to bottom, #fafafa, #dadada); + background-color: #eaeaea; + background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); + background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); + background-image: -o-linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - border-color: #c7c7c7; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffdadada', GradientType=0); + border-color: #d7d7d7; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); } .btn:hover, .btn:active, .btn.active { color: #555555; - background-color: #dadada; + background-color: #eaeaea; background-position: 0 -15px; } @@ -2876,7 +2876,7 @@ fieldset[disabled] .btn-link:hover { } .btn-group.open .btn.dropdown-toggle { - background-color: #dadada; + background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { -- cgit v1.2.3 From f706acb11cdfaab03ecc7249dee7ed48228a41fa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 01:30:32 -0800 Subject: Fixes #6339: Use important flag on .hide and .show utility classes --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6a409dd20..3c5d69f37 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6053,11 +6053,11 @@ a.badge:hover { } .hide { - display: none; + display: none !important; } .show { - display: block; + display: block !important; } .invisible { -- cgit v1.2.3 From 5e4f663e699d6c03cf6c778d39ecac6cb949e285 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 13:46:07 -0800 Subject: Undo important on hide/show utilties; punt to 3.0 --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5b9b4b34a..785d989c1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6053,11 +6053,11 @@ a.badge:hover { } .hide { - display: none !important; + display: none; } .show { - display: block !important; + display: block; } .invisible { -- cgit v1.2.3 From 6bd5dc7d9fefd6d936def8a224bf38c6beeac234 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 13:53:38 -0800 Subject: Add important flag to .show/.hide utility classes; remove .hide requirement from modals --- docs/assets/css/bootstrap.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 07f737734..362ed3db4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4021,6 +4021,7 @@ fieldset[disabled] .navbar-inverse .btn-navbar { top: 10%; left: 50%; z-index: 1050; + display: none; width: 560px; margin-left: -280px; background-color: #fff; @@ -4911,11 +4912,11 @@ a.badge:hover { } .hide { - display: none; + display: none !important; } .show { - display: block; + display: block !important; } .invisible { -- cgit v1.2.3 From 8eb1549842ef25e07cc062ba1d1c50c6b01381d7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 13:57:14 -0800 Subject: remove .hide specificity override from grid classes --- docs/assets/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 362ed3db4..00249ea19 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -360,10 +360,6 @@ a:hover { margin-left: 8.333333333333332%; } -[class*="span"].hide { - display: none; -} - [class*="span"].pull-right { float: right; } -- cgit v1.2.3