From 918a17a30bbaed3f7d8c80a30b7766b95e636dff Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Mon, 30 Jan 2012 00:50:47 +0200 Subject: Adding dropup support to split buttons and navbar * Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups) * Extends the .bottom-up class to carets and all relevant caret styles * Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups * Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs --- docs/assets/css/bootstrap.css | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 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 c96818a56..e2b419af7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1517,6 +1517,11 @@ table .span12 { filter: alpha(opacity=30); content: "\2193"; } +.caret.bottom-up { + border-top: 0; + border-bottom: 4px solid #000000; + content: "\2191"; +} .dropdown .caret { margin-top: 8px; margin-left: 2px; @@ -1558,7 +1563,11 @@ table .span12 { .dropdown-menu.bottom-up { top: auto; bottom: 100%; - margin-bottom: 2px; + margin-bottom: 1px; +} +.dropdown-menu.pull-right { + right: 0; + left: auto; } .dropdown-menu .divider { height: 1px; @@ -1992,6 +2001,7 @@ button.btn.small, input[type="submit"].btn.small { .info .caret, .success .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; opacity: 0.75; filter: alpha(opacity=75); } @@ -2217,6 +2227,7 @@ button.btn.small, input[type="submit"].btn.small { } .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } @@ -2554,8 +2565,22 @@ button.btn.small, input[type="submit"].btn.small { top: -6px; left: 10px; } +.navbar .dropdown-menu.bottom-up:before { + border-top: 7px solid #ccc; + border-top-color: rgba(0, 0, 0, 0.2); + border-bottom: 0; + bottom: -7px; + top: auto; +} +.navbar .dropdown-menu.bottom-up:after { + border-top: 6px solid #ffffff; + border-bottom: 0; + bottom: -6px; + top: auto; +} .navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { border-top-color: #ffffff; + border-bottom-color: #ffffff; } .navbar .nav .active .caret { opacity: 1; @@ -2567,15 +2592,15 @@ button.btn.small, input[type="submit"].btn.small { .navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu { +.navbar .nav.pull-right .dropdown-menu, .navbar .nav .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .nav.pull-right .dropdown-menu:before { +.navbar .nav.pull-right .dropdown-menu:before, .navbar .nav .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .nav.pull-right .dropdown-menu:after { +.navbar .nav.pull-right .dropdown-menu:after, .navbar .nav .dropdown-menu.pull-right:after { left: auto; right: 13px; } -- cgit v1.2.3 From 97b3057824272080166e592016131db53e55c427 Mon Sep 17 00:00:00 2001 From: Burak Tuyan Date: Mon, 30 Jan 2012 01:13:21 +0200 Subject: Extending the dropup support to tabs and pills This was needed to match the color of the carets that are used for tabs and pills --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e2b419af7..9cd0ec5f1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2208,13 +2208,16 @@ button.btn.small, input[type="submit"].btn.small { } .tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { border-top-color: #0088cc; + border-bottom-color: #0088cc; margin-top: 6px; } .tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; + border-bottom-color: #005580; } .tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { border-top-color: #333333; + border-bottom-color: #333333; } .nav > .dropdown.active > a:hover { color: #000000; -- cgit v1.2.3 From 60826077e7384e548c44c26531e7ae94e12fbcf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Mon, 13 Feb 2012 09:41:28 +0100 Subject: Clean up inverse button using variables, adding button group examples. Also adding inverse inline label --- docs/assets/css/bootstrap.css | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e52d2f0cf..25c04944a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1806,7 +1806,7 @@ table .span12 { .btn-danger.active, .btn-success.active, .btn-info.active, -.btn-dark.active { +.btn-inverse.active { color: rgba(255, 255, 255, 0.75); } .btn-primary { @@ -1930,16 +1930,16 @@ table .span12 { background-color: #24748c \9; } .btn-inverse { - background-color: #393939; - background-image: -moz-linear-gradient(top, #454545, #262626); - background-image: -ms-linear-gradient(top, #454545, #262626); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626)); - background-image: -webkit-linear-gradient(top, #454545, #262626); - background-image: -o-linear-gradient(top, #454545, #262626); - background-image: linear-gradient(top, #454545, #262626); + background-color: #414141; + background-image: -moz-linear-gradient(top, #555555, #222222); + background-image: -ms-linear-gradient(top, #555555, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); + background-image: -webkit-linear-gradient(top, #555555, #222222); + background-image: -o-linear-gradient(top, #555555, #222222); + background-image: linear-gradient(top, #555555, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0); - border-color: #262626 #262626 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + 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(enabled = false); } @@ -1948,10 +1948,10 @@ table .span12 { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { - background-color: #262626; + background-color: #222222; } .btn-inverse:active, .btn-inverse.active { - background-color: #0c0c0c \9; + background-color: #080808 \9; } button.btn, input[type="submit"].btn { *padding-top: 2px; @@ -3172,6 +3172,12 @@ a.thumbnail:hover { .label-info:hover { background-color: #2d6987; } +.label-inverse { + background-color: #333333; +} +.label-inverse:hover { + background-color: #1a1a1a; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 0 0; -- cgit v1.2.3 From e7d45184f1331bf4e82f7391d9607c4078b94278 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Feb 2012 20:25:49 -0800 Subject: swap last .btn-dark reference --- 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 c3e0c0053..105dfa401 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1832,7 +1832,7 @@ table .span12 { .btn-danger.active, .btn-success.active, .btn-info.active, -.btn-dark.active { +.btn-inverse.active { color: rgba(255, 255, 255, 0.75); } .btn-primary { -- cgit v1.2.3 From b559f2b8d05f4f5425e5ba6ec32e00fa99dd3b25 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Feb 2012 20:40:56 -0800 Subject: fix duplicate input prepend/append css selectors per #2026 --- 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 105dfa401..9de79ddb7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -989,14 +989,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; } .form-search .input-append .add-on, -.form-inline .input-prepend .add-on, -.form-search .input-append .add-on, +.form-search .input-prepend .add-on, +.form-inline .input-append .add-on, .form-inline .input-prepend .add-on { vertical-align: middle; } .form-search .radio, -.form-inline .radio, .form-search .checkbox, +.form-inline .radio, .form-inline .checkbox { margin-bottom: 0; vertical-align: middle; -- cgit v1.2.3 From 1455bc9f8f288c112da4241d4dbb7549bcd81cd5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 17 Feb 2012 20:47:02 -0800 Subject: removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024 --- 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 9de79ddb7..33ab32b09 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1737,7 +1737,6 @@ table .span12 { -moz-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); cursor: pointer; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); *margin-left: .3em; } .btn:hover, -- cgit v1.2.3 From bbb2fb33957da815e88efa0797df5817268ce812 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Feb 2012 20:06:38 -0800 Subject: fix right aligned dropdowns --- 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 33ab32b09..71ab7a9d4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1641,6 +1641,10 @@ table .span12 { .dropdown.open .dropdown-menu { display: block; } +.pull-right .dropdown-menu { + left: auto; + right: 0; +} .typeahead { margin-top: 2px; -webkit-border-radius: 4px; @@ -2709,10 +2713,6 @@ button.btn.small, input[type="submit"].btn.small { .navbar .nav .active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; -} .navbar .nav.pull-right .dropdown-menu:before { left: auto; right: 12px; -- cgit v1.2.3 From df757fb040e5736e55b3f7060260a79b6b79b781 Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:21:44 +0100 Subject: All abbreviations are not upper case initialisms Read more: * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element * http://en.wikipedia.org/wiki/Abbreviation * http://en.wikipedia.org/wiki/Initialism --- docs/assets/css/bootstrap.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 71ab7a9d4..b6d3f5b26 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -416,8 +416,6 @@ em { color: #999999; } abbr { - font-size: 90%; - text-transform: uppercase; border-bottom: 1px dotted #ddd; cursor: help; } -- cgit v1.2.3 From f08b40766749209709ec49c01f8aa122996657b3 Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:22:37 +0100 Subject: Only show help cursor/border for abbr with title --- 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 b6d3f5b26..98ab116dd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -415,7 +415,7 @@ em { .muted { color: #999999; } -abbr { +abbr[title] { border-bottom: 1px dotted #ddd; cursor: help; } -- cgit v1.2.3 From c1775da18714170847e1fb7768f375803b63c489 Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:24:06 +0100 Subject: Add class for upper case abbreviations, aka initialisms Read more: * http://en.wikipedia.org/wiki/Abbreviation * http://en.wikipedia.org/wiki/Initialism --- 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 98ab116dd..a0f9b0837 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -419,6 +419,10 @@ abbr[title] { border-bottom: 1px dotted #ddd; cursor: help; } +abbr.initialism { + font-size: 90%; + text-transform: uppercase; +} blockquote { padding: 0 0 0 15px; margin: 0 0 18px; -- cgit v1.2.3 From 51ec513b5c50123761350d2bcd27dafb07192a7e Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:29:32 +0100 Subject: Use inherit on alert-heading color Heading then inherits from the parent alert. Avoids a lot of extra unneccessary CSS. --- docs/assets/css/bootstrap.css | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 71ab7a9d4..4e80a1836 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2132,10 +2132,11 @@ button.btn.small, input[type="submit"].btn.small { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -} -.alert, .alert-heading { color: #c09853; } +.alert-heading { + color: inherit; +} .alert .close { position: relative; top: -2px; @@ -2145,25 +2146,16 @@ button.btn.small, input[type="submit"].btn.small { .alert-success { background-color: #dff0d8; border-color: #d6e9c6; -} -.alert-success, .alert-success .alert-heading { color: #468847; } .alert-danger, .alert-error { background-color: #f2dede; border-color: #eed3d7; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { color: #b94a48; } .alert-info { background-color: #d9edf7; border-color: #bce8f1; -} -.alert-info, .alert-info .alert-heading { color: #3a87ad; } .alert-block { -- cgit v1.2.3 From 82457603b65b177e70793eebbcf5a9c23873a770 Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:49:17 +0100 Subject: Separate span12 and container classes If you have less than 12 columns, container is too wide. Instead generate container width using the @gridColumns variable. Also remove duplicate container width property. --- docs/assets/css/bootstrap.css | 6 ++++-- 1 file changed, 4 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 71ab7a9d4..ba403461b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -168,7 +168,10 @@ a:hover { .span11 { width: 860px; } -.span12, .container { +.span12 { + width: 940px; +} +.container { width: 940px; } .offset1 { @@ -259,7 +262,6 @@ a:hover { width: 99.99999998999999%; } .container { - width: 940px; margin-left: auto; margin-right: auto; *zoom: 1; -- cgit v1.2.3 From e145619f6dcc4387f11dd46b56262dacbeff94ed Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:54:38 +0100 Subject: Remove underscore hack for IE6 IE6 does not seem to be supported by Bootstrap, and reducing the number of unused and invalid properties is always nice. --- 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 71ab7a9d4..832ea64b5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1581,7 +1581,6 @@ table .span12 { float: left; display: none; min-width: 160px; - _width: 160px; padding: 4px 0; margin: 0; list-style: none; -- cgit v1.2.3 From 16d12396d0f1f352280ae195ac60a15e7e95d666 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Feb 2012 14:53:07 -0800 Subject: simplify text color in navbar by placing the color on global .navbar component --- docs/assets/css/bootstrap.css | 8 +++----- 1 file changed, 3 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 71ab7a9d4..535f20a51 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2510,6 +2510,9 @@ button.btn.small, input[type="submit"].btn.small { .nav-collapse.collapse { height: auto; } +.navbar { + color: #999999; +} .navbar .brand:hover { text-decoration: none; } @@ -2526,11 +2529,6 @@ button.btn.small, input[type="submit"].btn.small { .navbar .navbar-text { margin-bottom: 0; line-height: 40px; - color: #999999; -} -.navbar .navbar-text a:hover { - color: #ffffff; - background-color: transparent; } .navbar .btn, .navbar .btn-group { margin-top: 5px; -- cgit v1.2.3 From 8247cb3362094fea315ec46acb0ff1ac42c8e47d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Feb 2012 16:28:46 -0800 Subject: add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles --- 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 25a9f2fef..baf4fde00 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -482,7 +482,7 @@ code, pre { border-radius: 3px; } code { - padding: 3px 4px; + padding: 2px 4px; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; -- cgit v1.2.3 From 9b09d1de861b236ce27cbda8579d4ec1f6e4dd17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Feb 2012 21:55:09 -0800 Subject: move overflow and max-height on modal to modal-body instead --- 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 baf4fde00..9fa129e10 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -860,7 +860,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: block; margin-top: 5px; margin-bottom: 0; - color: #999999; } .help-inline { display: inline-block; @@ -2873,7 +2872,6 @@ button.btn.small, input[type="submit"].btn.small { top: 50%; left: 50%; z-index: 1050; - max-height: 500px; overflow: auto; width: 560px; margin: -250px 0 0 -280px; @@ -2912,6 +2910,8 @@ button.btn.small, input[type="submit"].btn.small { margin-top: 2px; } .modal-body { + overflow-y: auto; + max-height: 400px; padding: 15px; } .modal-body .modal-form { -- cgit v1.2.3 From 6df925bc756ab6f9e7a26d4b9c5afc858b34b2d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Feb 2012 23:51:59 -0800 Subject: enable use of span in place of a for .disabled in pagination, per #1406 --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 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 9fa129e10..155f5dad1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -860,6 +860,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: block; margin-top: 5px; margin-bottom: 0; + color: #999999; } .help-inline { display: inline-block; @@ -2781,7 +2782,7 @@ button.btn.small, input[type="submit"].btn.small { color: #999999; cursor: default; } -.pagination .disabled a, .pagination .disabled a:hover { +.pagination .disabled span, .pagination .disabled a, .pagination .disabled a:hover { color: #999999; background-color: transparent; cursor: default; -- cgit v1.2.3 From 7ef7547a1421825cb73382ad6317aba8affe3dc8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 12:38:49 -0800 Subject: add horizontal divider support to nav list, including documentation for it, per #2106 --- docs/assets/css/bootstrap.css | 11 ++++++++++- 1 file changed, 10 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 155f5dad1..472a3fa31 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1612,7 +1612,7 @@ table .span12 { } .dropdown-menu .divider { height: 1px; - margin: 5px 1px; + margin: 8px 1px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; @@ -2217,6 +2217,15 @@ button.btn.small, input[type="submit"].btn.small { .nav-list [class^="icon-"] { margin-right: 2px; } +.nav-list .divider { + height: 1px; + margin: 8px 1px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; + *width: 100%; + *margin: -5px 0 5px; +} .nav-tabs, .nav-pills { *zoom: 1; } -- cgit v1.2.3 From 91fe8bc0f49bf2da396bd6904c8f954487247f57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 13:37:24 -0800 Subject: remake after merging buttons update --- 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 472a3fa31..4c054ce38 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1993,11 +1993,11 @@ 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.btn-large, input[type="submit"].btn.btn-large { *padding-top: 7px; *padding-bottom: 7px; } -button.btn.small, input[type="submit"].btn.small { +button.btn.btn-small, input[type="submit"].btn.btn-small { *padding-top: 3px; *padding-bottom: 3px; } -- cgit v1.2.3 From 9c74f21966d134e8576cfcfae0bb5301fcd2facd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 16:06:42 -0800 Subject: fix overflow issue on tabbed content per #2079 --- 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 4c054ce38..8d40d543d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2367,7 +2367,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { clear: both; } .tab-content { - overflow: hidden; + display: table; } .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { border-bottom: 0; -- cgit v1.2.3 From 331c85724afa7dbf41799967718b16e75f7ca816 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 16:18:13 -0800 Subject: remove max-width on img from reset and put in docs only, per #1552 --- 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 8d40d543d..a74f461c2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -53,7 +53,6 @@ sub { bottom: -0.25em; } img { - max-width: 100%; height: auto; border: 0; -ms-interpolation-mode: bicubic; -- cgit v1.2.3 From 143b3db2c9c97b281b0c4ede937d136e9f904651 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 18:56:05 -0800 Subject: update inline forms to resolve checkbox label with space in it and overlapping content, per #1969 --- docs/assets/css/bootstrap.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a74f461c2..1d12c816f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1001,9 +1001,18 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-search .checkbox, .form-inline .radio, .form-inline .checkbox { + padding-left: 0; margin-bottom: 0; vertical-align: middle; } +.form-search .radio input[type="radio"], +.form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: left; + margin-left: 0; + margin-right: 3px; +} .control-group { margin-bottom: 9px; } -- cgit v1.2.3 From d2630ff84eba322bec79ee25e33e075493744931 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 19:14:26 -0800 Subject: introduce new mixin to do navbar vertical centering --- docs/assets/css/bootstrap.css | 10 ++++++---- 1 file changed, 6 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 1d12c816f..86914d83d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2559,14 +2559,16 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { .navbar-form:after { clear: both; } +.navbar-form input, +.navbar-form select, +.navbar-form .radio, +.navbar-form .checkbox { + margin-top: 5px; +} .navbar-form input, .navbar-form select { display: inline-block; - margin-top: 5px; margin-bottom: 0; } -.navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; -} .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { margin-top: 3px; } -- cgit v1.2.3 From 06d4756114f55406b99d20a83eec95039d9af4bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 20 Feb 2012 21:20:06 -0800 Subject: adding basic badges support --- docs/assets/css/bootstrap.css | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 86914d83d..76a58dfb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3216,6 +3216,51 @@ a.thumbnail:hover { .label-inverse:hover { background-color: #1a1a1a; } +.badge { + padding: 2px 10px 3px; + font-size: 12.025px; + font-weight: bold; + color: #ffffff; + background-color: #999999; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; +} +.badge:hover { + color: #ffffff; + text-decoration: none; + cursor: pointer; +} +.badge-error { + background-color: #b94a48; +} +.badge-error:hover { + background-color: #953b39; +} +.badge-warning { + background-color: #f89406; +} +.badge-warning:hover { + background-color: #c67605; +} +.badge-success { + background-color: #468847; +} +.badge-success:hover { + background-color: #356635; +} +.badge-info { + background-color: #3a87ad; +} +.badge-info:hover { + background-color: #2d6987; +} +.badge-inverse { + background-color: #333333; +} +.badge-inverse:hover { + background-color: #1a1a1a; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 0 0; -- cgit v1.2.3 From dfd03261863b2ccd98cc8ea746e9d5e515ac0b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Tue, 21 Feb 2012 08:02:57 +0100 Subject: Bring back nowrap to labels and badges --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 76a58dfb1..3220216b9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3175,6 +3175,7 @@ a.thumbnail:hover { padding: 2px 4px 3px; font-size: 11.049999999999999px; font-weight: bold; + white-space: nowrap; color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; @@ -3220,6 +3221,7 @@ a.thumbnail:hover { padding: 2px 10px 3px; font-size: 12.025px; font-weight: bold; + white-space: nowrap; color: #ffffff; background-color: #999999; -webkit-border-radius: 10px; -- cgit v1.2.3 From 664a5c443849880972cf62aa85306be269d09270 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 13:43:13 -0800 Subject: update forms help-block --- docs/assets/css/bootstrap.css | 12 ++++++++---- 1 file changed, 8 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 dc20a861d..d3026a294 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -855,11 +855,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ::-webkit-input-placeholder { color: #999999; } +.help-block, .help-inline { + color: #555555; +} .help-block { display: block; - margin-top: 5px; - margin-bottom: 0; - color: #999999; + margin-bottom: 9px; } .help-inline { display: inline-block; @@ -867,7 +868,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec /* IE7 inline-block hack */ *zoom: 1; - margin-bottom: 9px; vertical-align: middle; padding-left: 5px; } @@ -1044,6 +1044,10 @@ legend + .control-group { .form-horizontal .controls { margin-left: 160px; } +.form-horizontal .help-block { + margin-top: 9px; + margin-bottom: 0; +} .form-horizontal .form-actions { padding-left: 160px; } -- cgit v1.2.3 From 8665fa8c50bf93844f692e954fd9669ba4b8bd3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 15:18:05 -0800 Subject: move table columns mixin to mixins.less --- docs/assets/css/bootstrap.css | 204 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3026a294..53f93a482 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -170,6 +170,42 @@ a:hover { .span12 { width: 940px; } +.span13 { + width: 1020px; +} +.span14 { + width: 1100px; +} +.span15 { + width: 1180px; +} +.span16 { + width: 1260px; +} +.span17 { + width: 1340px; +} +.span18 { + width: 1420px; +} +.span19 { + width: 1500px; +} +.span20 { + width: 1580px; +} +.span21 { + width: 1660px; +} +.span22 { + width: 1740px; +} +.span23 { + width: 1820px; +} +.span24 { + width: 1900px; +} .container { width: 940px; } @@ -206,6 +242,42 @@ a:hover { .offset11 { margin-left: 900px; } +.offset12 { + margin-left: 980px; +} +.offset13 { + margin-left: 1060px; +} +.offset14 { + margin-left: 1140px; +} +.offset15 { + margin-left: 1220px; +} +.offset16 { + margin-left: 1300px; +} +.offset17 { + margin-left: 1380px; +} +.offset18 { + margin-left: 1460px; +} +.offset19 { + margin-left: 1540px; +} +.offset20 { + margin-left: 1620px; +} +.offset21 { + margin-left: 1700px; +} +.offset22 { + margin-left: 1780px; +} +.offset23 { + margin-left: 1860px; +} .row-fluid { width: 100%; *zoom: 1; @@ -260,6 +332,42 @@ a:hover { .row-fluid > .span12 { width: 99.99999998999999%; } +.row-fluid > .span13 { + width: 108.510638287%; +} +.row-fluid > .span14 { + width: 117.02127658399999%; +} +.row-fluid > .span15 { + width: 125.531914881%; +} +.row-fluid > .span16 { + width: 134.042553178%; +} +.row-fluid > .span17 { + width: 142.553191475%; +} +.row-fluid > .span18 { + width: 151.063829772%; +} +.row-fluid > .span19 { + width: 159.57446806899998%; +} +.row-fluid > .span20 { + width: 168.085106366%; +} +.row-fluid > .span21 { + width: 176.595744663%; +} +.row-fluid > .span22 { + width: 185.10638296000002%; +} +.row-fluid > .span23 { + width: 193.617021257%; +} +.row-fluid > .span24 { + width: 202.127659554%; +} .container { margin-left: auto; margin-right: auto; @@ -759,6 +867,42 @@ input.span11, textarea.span11, .uneditable-input.span11 { input.span12, textarea.span12, .uneditable-input.span12 { width: 930px; } +input.span13, textarea.span13, .uneditable-input.span13 { + width: 1010px; +} +input.span14, textarea.span14, .uneditable-input.span14 { + width: 1090px; +} +input.span15, textarea.span15, .uneditable-input.span15 { + width: 1170px; +} +input.span16, textarea.span16, .uneditable-input.span16 { + width: 1250px; +} +input.span17, textarea.span17, .uneditable-input.span17 { + width: 1330px; +} +input.span18, textarea.span18, .uneditable-input.span18 { + width: 1410px; +} +input.span19, textarea.span19, .uneditable-input.span19 { + width: 1490px; +} +input.span20, textarea.span20, .uneditable-input.span20 { + width: 1570px; +} +input.span21, textarea.span21, .uneditable-input.span21 { + width: 1650px; +} +input.span22, textarea.span22, .uneditable-input.span22 { + width: 1730px; +} +input.span23, textarea.span23, .uneditable-input.span23 { + width: 1810px; +} +input.span24, textarea.span24, .uneditable-input.span24 { + width: 1890px; +} input[disabled], select[disabled], textarea[disabled], @@ -1185,6 +1329,66 @@ table .span12 { width: 924px; margin-left: 0; } +table .span13 { + float: none; + width: 1004px; + margin-left: 0; +} +table .span14 { + float: none; + width: 1084px; + margin-left: 0; +} +table .span15 { + float: none; + width: 1164px; + margin-left: 0; +} +table .span16 { + float: none; + width: 1244px; + margin-left: 0; +} +table .span17 { + float: none; + width: 1324px; + margin-left: 0; +} +table .span18 { + float: none; + width: 1404px; + margin-left: 0; +} +table .span19 { + float: none; + width: 1484px; + margin-left: 0; +} +table .span20 { + float: none; + width: 1564px; + margin-left: 0; +} +table .span21 { + float: none; + width: 1644px; + margin-left: 0; +} +table .span22 { + float: none; + width: 1724px; + margin-left: 0; +} +table .span23 { + float: none; + width: 1804px; + margin-left: 0; +} +table .span24 { + float: none; + width: 1884px; + margin-left: 0; +} [class^="icon-"], [class*=" icon-"] { display: inline-block; width: 14px; -- cgit v1.2.3 From e3ae517555fb9500493fde8efeef4a9788cd3264 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 15:21:18 -0800 Subject: move container up in default grid mixin --- 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 53f93a482..e9fb04f2d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -134,6 +134,9 @@ a:hover { float: left; margin-left: 20px; } +.container { + width: 940px; +} .span1 { width: 60px; } @@ -206,9 +209,6 @@ a:hover { .span24 { width: 1900px; } -.container { - width: 940px; -} .offset1 { margin-left: 100px; } -- cgit v1.2.3 From b4cc6c74f59442879ba2b1ed3e86d26e62390835 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 21:12:16 -0800 Subject: add support and docs for .navbar-fixed-bottom --- docs/assets/css/bootstrap.css | 12 +++++++++--- 1 file changed, 9 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 e9fb04f2d..b90cb7635 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2840,20 +2840,26 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } -.navbar-fixed-top { +.navbar-fixed-top, .navbar-fixed-bottom { position: fixed; - top: 0; right: 0; left: 0; z-index: 1030; + margin-bottom: 0; } -.navbar-fixed-top .navbar-inner { +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.navbar-fixed-top { + top: 0; +} +.navbar-fixed-bottom { + bottom: 0; +} .navbar .nav { position: relative; left: 0; -- cgit v1.2.3 From 8bd67bb124ccc87ecfe7959f3e75bb497d7991e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 22:09:51 -0800 Subject: clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups --- 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 c9c2ee891..912be887a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1867,12 +1867,12 @@ table .span24 { left: auto; right: 0; } -.dropup .caret { +.dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; content: "\2191"; } -.dropup .dropdown-menu { +.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 1px; @@ -2945,14 +2945,14 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { top: -6px; left: 10px; } -.navbar .dropdown-menu.bottom-up:before { +.navbar-fixed-bottom .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar .dropdown-menu.bottom-up:after { +.navbar-fixed-bottom .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; -- cgit v1.2.3 From 9b524a16e9cb5d8c9e0a6c4c7b83a3a881e415ee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 23:00:02 -0800 Subject: clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 --- docs/assets/css/bootstrap.css | 7 +++---- 1 file changed, 3 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 912be887a..45ae99964 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1228,20 +1228,19 @@ table { } .table-bordered { border: 1px solid #ddd; + border-left: 0; border-collapse: separate; *border-collapse: collapsed; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -.table-bordered th + th, -.table-bordered td + td, -.table-bordered th + td, -.table-bordered td + th { +.table-bordered th, .table-bordered td { border-left: 1px solid #ddd; } .table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { border-top: 0; + border-bottom: 1px solid #ddd; } .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { -webkit-border-radius: 4px 0 0 0; -- cgit v1.2.3 From a139167489e249345933b1e58cc7c53542abab97 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 23:15:43 -0800 Subject: set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) --- docs/assets/css/bootstrap.css | 5 ++++- 1 file changed, 4 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 45ae99964..7a91fa5bd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -134,7 +134,7 @@ a:hover { float: left; margin-left: 20px; } -.container { +.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; } .span1 { @@ -2698,6 +2698,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } +.navbar .container { + width: auto; +} .btn-navbar { display: none; float: right; -- cgit v1.2.3 From 5ad5dde1e24f668cf9b720dd59fc2a7d4808c0b3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 21 Feb 2012 23:16:06 -0800 Subject: rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. --- docs/assets/css/bootstrap.css | 141 ------------------------------------------ 1 file changed, 141 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e9fb04f2d..41eeea9fa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -173,42 +173,6 @@ a:hover { .span12 { width: 940px; } -.span13 { - width: 1020px; -} -.span14 { - width: 1100px; -} -.span15 { - width: 1180px; -} -.span16 { - width: 1260px; -} -.span17 { - width: 1340px; -} -.span18 { - width: 1420px; -} -.span19 { - width: 1500px; -} -.span20 { - width: 1580px; -} -.span21 { - width: 1660px; -} -.span22 { - width: 1740px; -} -.span23 { - width: 1820px; -} -.span24 { - width: 1900px; -} .offset1 { margin-left: 100px; } @@ -245,39 +209,6 @@ a:hover { .offset12 { margin-left: 980px; } -.offset13 { - margin-left: 1060px; -} -.offset14 { - margin-left: 1140px; -} -.offset15 { - margin-left: 1220px; -} -.offset16 { - margin-left: 1300px; -} -.offset17 { - margin-left: 1380px; -} -.offset18 { - margin-left: 1460px; -} -.offset19 { - margin-left: 1540px; -} -.offset20 { - margin-left: 1620px; -} -.offset21 { - margin-left: 1700px; -} -.offset22 { - margin-left: 1780px; -} -.offset23 { - margin-left: 1860px; -} .row-fluid { width: 100%; *zoom: 1; @@ -332,42 +263,6 @@ a:hover { .row-fluid > .span12 { width: 99.99999998999999%; } -.row-fluid > .span13 { - width: 108.510638287%; -} -.row-fluid > .span14 { - width: 117.02127658399999%; -} -.row-fluid > .span15 { - width: 125.531914881%; -} -.row-fluid > .span16 { - width: 134.042553178%; -} -.row-fluid > .span17 { - width: 142.553191475%; -} -.row-fluid > .span18 { - width: 151.063829772%; -} -.row-fluid > .span19 { - width: 159.57446806899998%; -} -.row-fluid > .span20 { - width: 168.085106366%; -} -.row-fluid > .span21 { - width: 176.595744663%; -} -.row-fluid > .span22 { - width: 185.10638296000002%; -} -.row-fluid > .span23 { - width: 193.617021257%; -} -.row-fluid > .span24 { - width: 202.127659554%; -} .container { margin-left: auto; margin-right: auto; @@ -867,42 +762,6 @@ input.span11, textarea.span11, .uneditable-input.span11 { input.span12, textarea.span12, .uneditable-input.span12 { width: 930px; } -input.span13, textarea.span13, .uneditable-input.span13 { - width: 1010px; -} -input.span14, textarea.span14, .uneditable-input.span14 { - width: 1090px; -} -input.span15, textarea.span15, .uneditable-input.span15 { - width: 1170px; -} -input.span16, textarea.span16, .uneditable-input.span16 { - width: 1250px; -} -input.span17, textarea.span17, .uneditable-input.span17 { - width: 1330px; -} -input.span18, textarea.span18, .uneditable-input.span18 { - width: 1410px; -} -input.span19, textarea.span19, .uneditable-input.span19 { - width: 1490px; -} -input.span20, textarea.span20, .uneditable-input.span20 { - width: 1570px; -} -input.span21, textarea.span21, .uneditable-input.span21 { - width: 1650px; -} -input.span22, textarea.span22, .uneditable-input.span22 { - width: 1730px; -} -input.span23, textarea.span23, .uneditable-input.span23 { - width: 1810px; -} -input.span24, textarea.span24, .uneditable-input.span24 { - width: 1890px; -} input[disabled], select[disabled], textarea[disabled], -- cgit v1.2.3 From 92a54a7b723065ad6c64520b2a75b410682fc755 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Feb 2012 08:12:25 -0800 Subject: tighten padding on labels and badges given default line-height --- docs/assets/css/bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7a91fa5bd..3573a9377 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3425,8 +3425,8 @@ a.thumbnail:hover { padding: 9px; } .label { - padding: 2px 4px 3px; - font-size: 11.049999999999999px; + padding: 1px 4px 2px; + font-size: 10.998px; font-weight: bold; white-space: nowrap; color: #ffffff; @@ -3471,15 +3471,15 @@ a.thumbnail:hover { background-color: #1a1a1a; } .badge { - padding: 2px 10px 3px; + padding: 1px 9px 2px; font-size: 12.025px; font-weight: bold; white-space: nowrap; color: #ffffff; background-color: #999999; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; } .badge:hover { color: #ffffff; -- cgit v1.2.3 From b86969f762c7c1c94e75eebd9905ef568713d647 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Feb 2012 08:21:29 -0800 Subject: restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080 --- docs/assets/css/bootstrap.css | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d07c7a182..36f3fde55 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -134,7 +134,7 @@ a:hover { float: left; margin-left: 20px; } -.container { +.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; } .span1 { @@ -726,40 +726,43 @@ textarea[class*="span"], float: none; margin-left: 0; } -input.span1, textarea.span1, .uneditable-input.span1 { +input, textarea, .uneditable-input { + margin-left: 0; +} +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], -- cgit v1.2.3 From a0ec4224440d7f11ae971b1d5d2f3a5e343c6e4f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Feb 2012 08:36:07 -0800 Subject: fix #1954: icons in tabs add jank border --- 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 36f3fde55..d1b95590c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2346,8 +2346,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { margin-bottom: -1px; } .nav-tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; + padding-top: 8px; + padding-bottom: 8px; + line-height: 18px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; -- cgit v1.2.3 From 8609a77bd2f2b18a88efea5b31d6b6f90036e702 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Feb 2012 11:16:32 -0800 Subject: add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173 --- docs/assets/css/bootstrap.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d1b95590c..eb459012e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -845,6 +845,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec margin-bottom: 18px; background-color: #f5f5f5; border-top: 1px solid #ddd; + *zoom: 1; +} +.form-actions:before, .form-actions:after { + display: table; + content: ""; +} +.form-actions:after { + clear: both; } .uneditable-input { display: block; -- cgit v1.2.3 From 0e8427e7b1c955a70a24817f6c06abd6dfa0c572 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Feb 2012 22:38:54 -0800 Subject: update modal footers to use text-align instead of float on buttons for alignment --- 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 eb459012e..e47dbb25f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3064,6 +3064,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { .modal-footer { padding: 14px 15px 15px; margin-bottom: 0; + text-align: right; background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; @@ -3081,8 +3082,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { .modal-footer:after { clear: both; } -.modal-footer .btn { - float: right; +.modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0; } -- cgit v1.2.3 From af8261af93c061f9bcc54bd948bd4652bd887c66 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Feb 2012 19:09:44 -0800 Subject: simplify selector for .modal-form per #2218 --- 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 e47dbb25f..37f0aac4f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3058,7 +3058,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { max-height: 400px; padding: 15px; } -.modal-body .modal-form { +.modal-form { margin-bottom: 0; } .modal-footer { -- cgit v1.2.3 From 7525aac8306b0c69f56e479c9ecf4fa8ff55c712 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Feb 2012 19:44:16 -0800 Subject: make .input-prepend/append .add-on text color the same as labels, #333, to close out #2276 --- 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 37f0aac4f..82b96d55d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -931,7 +931,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec padding: 4px 5px; font-weight: normal; line-height: 18px; - color: #999999; text-align: center; text-shadow: 0 1px 0 #ffffff; background-color: #f5f5f5; -- cgit v1.2.3 From a7b96b3e59e6f2c5eca7d92a26780c5cfe20a815 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Feb 2012 21:32:48 -0800 Subject: set list-style to none for breadcrumbs to resolve cross browser issues per #2224 --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 82b96d55d..e9ca59ab2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2859,6 +2859,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { .breadcrumb { padding: 7px 14px; margin: 0 0 18px; + list-style: none; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); -- cgit v1.2.3 From 9ee77f2c1106513adfaa3b81588d67e99093e707 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Feb 2012 21:50:54 -0800 Subject: set line-height for labels to prevent change in height when floated per #2222 --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 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 e9ca59ab2..5e3175306 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3299,8 +3299,9 @@ a.thumbnail:hover { padding: 1px 4px 2px; font-size: 10.998px; font-weight: bold; - white-space: nowrap; + line-height: 13px; color: #ffffff; + white-space: nowrap; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; -webkit-border-radius: 3px; -- cgit v1.2.3 From fbebb046f7134eaed90492bfc67720337c4b625e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Feb 2012 22:34:25 -0800 Subject: fix navbar container for default 940px grid per #2194 --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5e3175306..2881d6a84 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2740,6 +2740,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { -moz-border-radius: 0; border-radius: 0; } +.navbar-fixed-top .container, .navbar-fixed-bottom .container { + width: 940px; +} .navbar-fixed-top { top: 0; } -- cgit v1.2.3