From 0c2055ef381d55388540496996788861fa04b7d8 Mon Sep 17 00:00:00 2001 From: Aaron Borden Date: Wed, 16 Oct 2013 19:02:04 -0700 Subject: Adding contextual styles to list-items --- dist/css/bootstrap.css | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index aa2951658..bf422cf29 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5511,6 +5511,36 @@ a.thumbnail.active { margin-right: 5px; } +.list-group > .list-group-item.success { + background-color: #dff0d8; + border-color: #d6e9c6; +} + +.list-group > .list-group-item.success:hover { + background-color: #d0e9c6; + border-color: #c9e2b3; +} + +.list-group > .list-group-item.danger { + background-color: #f2dede; + border-color: #ebccd1; +} + +.list-group > .list-group-item.danger:hover { + background-color: #ebcccc; + border-color: #e4b9c0; +} + +.list-group > .list-group-item.warning { + background-color: #fcf8e3; + border-color: #faebcc; +} + +.list-group > .list-group-item.warning:hover { + background-color: #faf2cc; + border-color: #f7e1b5; +} + a.list-group-item { color: #555555; } -- cgit v1.2.3 From 693915d1277d465844c6757fc107110342229d76 Mon Sep 17 00:00:00 2001 From: Max Edmands Date: Wed, 16 Oct 2013 22:55:40 -0700 Subject: Active state overrides contextual list-item styles --- dist/css/bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index bf422cf29..a6fa11dbb 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5511,32 +5511,32 @@ a.thumbnail.active { margin-right: 5px; } -.list-group > .list-group-item.success { +.list-group-item.success { background-color: #dff0d8; border-color: #d6e9c6; } -.list-group > .list-group-item.success:hover { +.list-group-item.success:hover { background-color: #d0e9c6; border-color: #c9e2b3; } -.list-group > .list-group-item.danger { +.list-group-item.danger { background-color: #f2dede; border-color: #ebccd1; } -.list-group > .list-group-item.danger:hover { +.list-group-item.danger:hover { background-color: #ebcccc; border-color: #e4b9c0; } -.list-group > .list-group-item.warning { +.list-group-item.warning { background-color: #fcf8e3; border-color: #faebcc; } -.list-group > .list-group-item.warning:hover { +.list-group-item.warning:hover { background-color: #faf2cc; border-color: #f7e1b5; } -- cgit v1.2.3 From 78b43d4c99c5b091980a977656a378f6c46c7c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 6 Dec 2013 22:34:29 +0100 Subject: Darken icon bar to meet WCAG --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 377dff300..a5e975ced 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4754,7 +4754,7 @@ textarea.input-group-sm > .input-group-btn > .btn { } .navbar-default .navbar-toggle .icon-bar { - background-color: #cccccc; + background-color: #888888; } .navbar-default .navbar-collapse, -- cgit v1.2.3 From 107b334d349be065421967553f57aa186736ffcf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:45:11 -0800 Subject: Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge --- dist/css/bootstrap.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a5e975ced..f9d3907ac 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2344,7 +2344,7 @@ fieldset[disabled] .btn-default.active { .btn-default .badge { color: #ffffff; - background-color: #fff; + background-color: #333333; } .btn-primary { @@ -2390,7 +2390,7 @@ fieldset[disabled] .btn-primary.active { .btn-primary .badge { color: #428bca; - background-color: #fff; + background-color: #ffffff; } .btn-warning { @@ -2436,7 +2436,7 @@ fieldset[disabled] .btn-warning.active { .btn-warning .badge { color: #f0ad4e; - background-color: #fff; + background-color: #ffffff; } .btn-danger { @@ -2482,7 +2482,7 @@ fieldset[disabled] .btn-danger.active { .btn-danger .badge { color: #d9534f; - background-color: #fff; + background-color: #ffffff; } .btn-success { @@ -2528,7 +2528,7 @@ fieldset[disabled] .btn-success.active { .btn-success .badge { color: #5cb85c; - background-color: #fff; + background-color: #ffffff; } .btn-info { @@ -2574,7 +2574,7 @@ fieldset[disabled] .btn-info.active { .btn-info .badge { color: #5bc0de; - background-color: #fff; + background-color: #ffffff; } .btn-link { -- cgit v1.2.3 From c07632e4e8398f55d796d00b520ca43df38dbf29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:47:37 -0800 Subject: Reorder button and table variants for consistent order --- dist/css/bootstrap.css | 128 ++++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index f9d3907ac..435c969d5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1767,24 +1767,6 @@ table th[class*="col-"] { background-color: #d0e9c6; } -.table > thead > tr > .danger, -.table > tbody > tr > .danger, -.table > tfoot > tr > .danger, -.table > thead > .danger > td, -.table > tbody > .danger > td, -.table > tfoot > .danger > td, -.table > thead > .danger > th, -.table > tbody > .danger > th, -.table > tfoot > .danger > th { - background-color: #f2dede; -} - -.table-hover > tbody > tr > .danger:hover, -.table-hover > tbody > .danger:hover > td, -.table-hover > tbody > .danger:hover > th { - background-color: #ebcccc; -} - .table > thead > tr > .warning, .table > tbody > tr > .warning, .table > tfoot > tr > .warning, @@ -1803,6 +1785,24 @@ table th[class*="col-"] { background-color: #faf2cc; } +.table > thead > tr > .danger, +.table > tbody > tr > .danger, +.table > tfoot > tr > .danger, +.table > thead > .danger > td, +.table > tbody > .danger > td, +.table > tfoot > .danger > td, +.table > thead > .danger > th, +.table > tbody > .danger > th, +.table > tfoot > .danger > th { + background-color: #f2dede; +} + +.table-hover > tbody > tr > .danger:hover, +.table-hover > tbody > .danger:hover > td, +.table-hover > tbody > .danger:hover > th { + background-color: #ebcccc; +} + @media (max-width: 767px) { .table-responsive { width: 100%; @@ -2393,6 +2393,52 @@ fieldset[disabled] .btn-primary.active { background-color: #ffffff; } +.btn-success { + color: #ffffff; + background-color: #5cb85c; + border-color: #4cae4c; +} + +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + color: #ffffff; + background-color: #47a447; + border-color: #398439; +} + +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + background-image: none; +} + +.btn-success.disabled, +.btn-success[disabled], +fieldset[disabled] .btn-success, +.btn-success.disabled:hover, +.btn-success[disabled]:hover, +fieldset[disabled] .btn-success:hover, +.btn-success.disabled:focus, +.btn-success[disabled]:focus, +fieldset[disabled] .btn-success:focus, +.btn-success.disabled:active, +.btn-success[disabled]:active, +fieldset[disabled] .btn-success:active, +.btn-success.disabled.active, +.btn-success[disabled].active, +fieldset[disabled] .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} + +.btn-success .badge { + color: #5cb85c; + background-color: #ffffff; +} + .btn-warning { color: #ffffff; background-color: #f0ad4e; @@ -2485,52 +2531,6 @@ fieldset[disabled] .btn-danger.active { background-color: #ffffff; } -.btn-success { - color: #ffffff; - background-color: #5cb85c; - border-color: #4cae4c; -} - -.btn-success:hover, -.btn-success:focus, -.btn-success:active, -.btn-success.active, -.open .dropdown-toggle.btn-success { - color: #ffffff; - background-color: #47a447; - border-color: #398439; -} - -.btn-success:active, -.btn-success.active, -.open .dropdown-toggle.btn-success { - background-image: none; -} - -.btn-success.disabled, -.btn-success[disabled], -fieldset[disabled] .btn-success, -.btn-success.disabled:hover, -.btn-success[disabled]:hover, -fieldset[disabled] .btn-success:hover, -.btn-success.disabled:focus, -.btn-success[disabled]:focus, -fieldset[disabled] .btn-success:focus, -.btn-success.disabled:active, -.btn-success[disabled]:active, -fieldset[disabled] .btn-success:active, -.btn-success.disabled.active, -.btn-success[disabled].active, -fieldset[disabled] .btn-success.active { - background-color: #5cb85c; - border-color: #4cae4c; -} - -.btn-success .badge { - color: #5cb85c; - background-color: #ffffff; -} - .btn-info { color: #ffffff; background-color: #5bc0de; -- cgit v1.2.3 From fe58357df182b52f5905f432a3b2629c717656f1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:56:35 -0800 Subject: Fixes #10884: Adds .info variant to contextual table classes --- dist/css/bootstrap.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 435c969d5..4d11858c7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1803,6 +1803,24 @@ table th[class*="col-"] { background-color: #ebcccc; } +.table > thead > tr > .info, +.table > tbody > tr > .info, +.table > tfoot > tr > .info, +.table > thead > .info > td, +.table > tbody > .info > td, +.table > tfoot > .info > td, +.table > thead > .info > th, +.table > tbody > .info > th, +.table > tfoot > .info > th { + background-color: #d9edf7; +} + +.table-hover > tbody > tr > .info:hover, +.table-hover > tbody > .info:hover > td, +.table-hover > tbody > .info:hover > th { + background-color: #c4e3f3; +} + @media (max-width: 767px) { .table-responsive { width: 100%; -- cgit v1.2.3 From b1215d1b2ecd6cd3898af19ce43cc647e2ec854a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 12:18:13 -0800 Subject: Fixes #11193: Add kbd element styles to indicate user input via keyboard --- dist/css/bootstrap.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4d11858c7..772706200 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -753,6 +753,15 @@ code { border-radius: 4px; } +kbd { + padding: 2px 4px; + font-size: 90%; + color: #ffffff; + background-color: #333333; + border-radius: 3px; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); +} + pre { display: block; padding: 9.5px; -- cgit v1.2.3 From a1f737b43632f4615d54ec993dc645f858e3ca8d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 12:19:17 -0800 Subject: grunt dist after adding .text-justify --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 772706200..0ff3dc0a8 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -576,6 +576,10 @@ cite { text-align: center; } +.text-justify { + text-align: justify; +} + .page-header { padding-bottom: 9px; margin: 40px 0 20px; -- cgit v1.2.3 From 07de53c644b315852c5f315ab91bfd6d65660d50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 14:09:03 -0800 Subject: Contextual list group cleanup * Adds nav link to sidebar for contextual classes * Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes * Adds default and linked variations to example in docs --- dist/css/bootstrap.css | 138 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 108 insertions(+), 30 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a6fa11dbb..b875515aa 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5511,36 +5511,6 @@ a.thumbnail.active { margin-right: 5px; } -.list-group-item.success { - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.list-group-item.success:hover { - background-color: #d0e9c6; - border-color: #c9e2b3; -} - -.list-group-item.danger { - background-color: #f2dede; - border-color: #ebccd1; -} - -.list-group-item.danger:hover { - background-color: #ebcccc; - border-color: #e4b9c0; -} - -.list-group-item.warning { - background-color: #fcf8e3; - border-color: #faebcc; -} - -.list-group-item.warning:hover { - background-color: #faf2cc; - border-color: #f7e1b5; -} - a.list-group-item { color: #555555; } @@ -5576,6 +5546,114 @@ a.list-group-item.active:focus .list-group-item-text { color: #e1edf7; } +.list-group-item-success { + color: #468847; + background-color: #dff0d8; +} + +a.list-group-item-success { + color: #468847; +} + +a.list-group-item-success .list-group-item-heading { + color: inherit; +} + +a.list-group-item-success:hover, +a.list-group-item-success:focus { + color: #468847; + background-color: #d0e9c6; +} + +a.list-group-item-success.active, +a.list-group-item-success.active:hover, +a.list-group-item-success.active:focus { + color: #fff; + background-color: #468847; + border-color: #468847; +} + +.list-group-item-warning { + color: #c09853; + background-color: #fcf8e3; +} + +a.list-group-item-warning { + color: #c09853; +} + +a.list-group-item-warning .list-group-item-heading { + color: inherit; +} + +a.list-group-item-warning:hover, +a.list-group-item-warning:focus { + color: #c09853; + background-color: #faf2cc; +} + +a.list-group-item-warning.active, +a.list-group-item-warning.active:hover, +a.list-group-item-warning.active:focus { + color: #fff; + background-color: #c09853; + border-color: #c09853; +} + +.list-group-item-danger { + color: #b94a48; + background-color: #f2dede; +} + +a.list-group-item-danger { + color: #b94a48; +} + +a.list-group-item-danger .list-group-item-heading { + color: inherit; +} + +a.list-group-item-danger:hover, +a.list-group-item-danger:focus { + color: #b94a48; + background-color: #ebcccc; +} + +a.list-group-item-danger.active, +a.list-group-item-danger.active:hover, +a.list-group-item-danger.active:focus { + color: #fff; + background-color: #b94a48; + border-color: #b94a48; +} + +.list-group-item-info { + color: #3a87ad; + background-color: #d9edf7; +} + +a.list-group-item-info { + color: #3a87ad; +} + +a.list-group-item-info .list-group-item-heading { + color: inherit; +} + +a.list-group-item-info:hover, +a.list-group-item-info:focus { + color: #3a87ad; + background-color: #c4e3f3; +} + +a.list-group-item-info.active, +a.list-group-item-info.active:hover, +a.list-group-item-info.active:focus { + color: #fff; + background-color: #3a87ad; + border-color: #3a87ad; +} + .list-group-item-heading { margin-top: 0; margin-bottom: 5px; -- cgit v1.2.3 From 6273604601c58284f49b38ae4e52533b9689437c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 20:52:51 -0800 Subject: Add .container-fluid variation for full-width containers and layouts /cc #10711 #9862 --- dist/css/bootstrap.css | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c421a26fd..8042b8da7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -839,6 +839,33 @@ pre code { } } +.container-fluid { + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} + +.container-fluid:before, +.container-fluid:after { + display: table; + content: " "; +} + +.container-fluid:after { + clear: both; +} + +.container-fluid:before, +.container-fluid:after { + display: table; + content: " "; +} + +.container-fluid:after { + clear: both; +} + .row { margin-right: -15px; margin-left: -15px; @@ -4467,14 +4494,18 @@ textarea.input-group-sm > .input-group-btn > .btn { } .container > .navbar-header, -.container > .navbar-collapse { +.container-fluid > .navbar-header, +.container > .navbar-collapse, +.container-fluid > .navbar-collapse { margin-right: -15px; margin-left: -15px; } @media (min-width: 768px) { .container > .navbar-header, - .container > .navbar-collapse { + .container-fluid > .navbar-header, + .container > .navbar-collapse, + .container-fluid > .navbar-collapse { margin-right: 0; margin-left: 0; } @@ -4530,7 +4561,8 @@ textarea.input-group-sm > .input-group-btn > .btn { } @media (min-width: 768px) { - .navbar > .container .navbar-brand { + .navbar > .container .navbar-brand, + .navbar > .container-fluid .navbar-brand { margin-left: -15px; } } -- cgit v1.2.3