From 413c8a6da533c59bb9a923901b5358ddb61564a5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Jan 2014 21:44:38 -0800 Subject: Fixes #12210: badges in xs buttons --- 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 4ffdb07cc..4cad26c16 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4341,6 +4341,10 @@ textarea.input-group-sm > .input-group-btn > .btn { position: relative; top: -1px; } +.btn-xs .badge { + top: 0; + padding: 1px 5px; +} a.badge:hover, a.badge:focus { color: #fff; -- cgit v1.2.3 From d07e8fece474afee9de7edaf6359e60920e8268f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Jan 2014 15:03:34 -0800 Subject: grunt --- dist/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4cad26c16..d6f4efc79 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5060,9 +5060,9 @@ button.close { -moz-transition: -moz-transform .3s ease-out; -o-transition: -o-transform .3s ease-out; transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - transform: translate(0, -25%); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -- cgit v1.2.3 From 380019ccb28ef1205e0a114e386ab2cc4281efb4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Jan 2014 20:00:28 -0800 Subject: Split box-sizing reset for faster rendering --- dist/css/bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d6f4efc79..26257d194 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -251,7 +251,11 @@ table { border: 1px solid #ddd !important; } } -*, +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} *:before, *:after { -webkit-box-sizing: border-box; -- cgit v1.2.3 From 6856c9f7f6ee3a939d41e7578cb09c39958177dd Mon Sep 17 00:00:00 2001 From: Daijiro Wachi Date: Sun, 19 Jan 2014 06:43:57 +0900 Subject: remove border radius when it's not both ends in panel --- dist/css/bootstrap.css | 78 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 18 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 26257d194..26fe5b2e3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4771,14 +4771,22 @@ a.list-group-item-danger.active:focus { } .panel > .list-group .list-group-item { border-width: 1px 0; + border-radius: 0; } .panel > .list-group .list-group-item:first-child { - border-top-left-radius: 0; - border-top-right-radius: 0; + border-top: 0; } .panel > .list-group .list-group-item:last-child { border-bottom: 0; } +.panel > .list-group:first-child .list-group-item:first-child { + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel > .list-group:last-child .list-group-item:last-child { + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } @@ -4786,24 +4794,44 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table { margin-bottom: 0; } -.panel > .table > tbody:last-child > tr:last-child td:first-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:first-child, -.panel > .table > tfoot:last-child > tr:last-child td:first-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:first-child, -.panel > .table > tbody:last-child > tr:last-child th:first-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:first-child, -.panel > .table > tfoot:last-child > tr:last-child th:first-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:first-child { +.panel > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { + border-top-left-radius: 3px; +} +.panel > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, +.panel > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, +.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, +.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { + border-top-right-radius: 3px; +} +.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { border-bottom-left-radius: 3px; } -.panel > .table > tbody:last-child > tr:last-child td:last-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:last-child, -.panel > .table > tfoot:last-child > tr:last-child td:last-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:last-child, -.panel > .table > tbody:last-child > tr:last-child th:last-child, -.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:last-child, -.panel > .table > tfoot:last-child > tr:last-child th:last-child, -.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:last-child { +.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, +.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, +.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, +.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { border-bottom-right-radius: 3px; } .panel > .panel-body + .table, @@ -4846,6 +4874,20 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0; } +.panel > .table-bordered > thead > tr:first-child > th, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, +.panel > .table-bordered > tbody > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th, +.panel > .table-bordered > tfoot > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th, +.panel > .table-bordered > thead > tr:first-child > td, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > td, +.panel > .table-bordered > tbody > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, +.panel > .table-bordered > tfoot > tr:first-child > td, +.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td { + border-top: 0; +} .panel > .table-bordered > thead > tr:last-child > th, .panel > .table-responsive > .table-bordered > thead > tr:last-child > th, .panel > .table-bordered > tbody > tr:last-child > th, -- cgit v1.2.3 From 2115ac525b076f32003c28272703f4e279ab2f46 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Jan 2014 14:40:48 -0800 Subject: Run grunt dist after adding 'a' requirement to the text emphasis classes --- dist/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 26fe5b2e3..4787aac6c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -492,31 +492,31 @@ cite { .text-primary { color: #428bca; } -.text-primary:hover { +a.text-primary:hover { color: #3071a9; } .text-success { color: #3c763d; } -.text-success:hover { +a.text-success:hover { color: #2b542c; } .text-info { color: #31708f; } -.text-info:hover { +a.text-info:hover { color: #245269; } .text-warning { color: #8a6d3b; } -.text-warning:hover { +a.text-warning:hover { color: #66512c; } .text-danger { color: #a94442; } -.text-danger:hover { +a.text-danger:hover { color: #843534; } .bg-primary { -- cgit v1.2.3 From 1942f36455a892dc4eebed284dbb48fdddd01581 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 15 Jan 2014 19:17:32 -0800 Subject: remove default left-right print margins per upstream h5bp change Refs: https://github.com/h5bp/html5-boilerplate/commit/57be193031b95b003b96efe9eba7a4db7f58f4e1 https://github.com/h5bp/html5-boilerplate/issues/1477 --- dist/css/bootstrap.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4787aac6c..a86aae0d1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -213,9 +213,6 @@ table { img { max-width: 100% !important; } - @page { - margin: 2cm .5cm; - } p, h2, h3 { @@ -232,6 +229,10 @@ table { .navbar { display: none; } + @page { + margin-top: 2cm; + margin-bottom: 2cm; + } .table td, .table th { background-color: #fff !important; -- cgit v1.2.3 From 08e83a62b7a3b12d459b2e025661e60024b10ca7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Jan 2014 21:43:08 -0600 Subject: Fix #11655: Fix broken disabled states for iOS form controls and buttons --- dist/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a86aae0d1..a6acf273c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1728,6 +1728,7 @@ output { fieldset[disabled] .form-control { cursor: not-allowed; background-color: #eee; + opacity: 1; } textarea.form-control { height: auto; @@ -2029,6 +2030,7 @@ fieldset[disabled] .btn { -webkit-box-shadow: none; box-shadow: none; opacity: .65; + opacity: 1; } .btn-default { color: #333; -- cgit v1.2.3 From f748390cf5bb436f732da9c43df269886c586a2a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 22 Jan 2014 21:51:23 -0600 Subject: Follow-up to #12250: remove remaining page margins for print --- dist/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a6acf273c..d6189c287 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -229,10 +229,6 @@ table { .navbar { display: none; } - @page { - margin-top: 2cm; - margin-bottom: 2cm; - } .table td, .table th { background-color: #fff !important; -- cgit v1.2.3 From 44fc629d446d67035f27dc0c9b012f8339de0f13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 23 Jan 2014 22:52:26 -0600 Subject: Fix #12353: Scope table border reset in panels to first-child rows --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d6189c287..b7dc6cda7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4837,8 +4837,8 @@ a.list-group-item-danger.active:focus { .panel > .panel-body + .table-responsive { border-top: 1px solid #ddd; } -.panel > .table > tbody:first-child th, -.panel > .table > tbody:first-child td { +.panel > .table > tbody:first-child > tr:first-child th, +.panel > .table > tbody:first-child > tr:first-child td { border-top: 0; } .panel > .table-bordered, -- cgit v1.2.3 From 64e81324261548a8de8cda5fde4b87d0f7a8f8fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 24 Jan 2014 11:55:59 -0600 Subject: Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements --- dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b7dc6cda7..676b410a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1617,6 +1617,7 @@ table th[class*="col-"] { } } fieldset { + min-width: 0; padding: 0; margin: 0; border: 0; -- cgit v1.2.3 From e38fd138ce04d73e03100a3ea42496fc914120e9 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Sat, 25 Jan 2014 21:40:56 -0800 Subject: fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height --- dist/css/bootstrap.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 676b410a9..419a7ddaf 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3739,16 +3739,12 @@ textarea.input-group-sm > .input-group-btn > .btn { padding: 15px 15px; font-size: 18px; line-height: 20px; + height: 20px; } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none; } -.navbar-brand > .glyphicon { - float: left; - margin-top: -2px; - margin-right: 5px; -} @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { -- cgit v1.2.3 From 6a0a139cdabe9ad24f2dcee3044bb62f8738df15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Jan 2014 12:08:55 -0800 Subject: Upgrade to Normalize v3-rc1 in prep for v3 final --- dist/css/bootstrap.css | 108 ++++++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 50 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 676b410a9..cc14e73fc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4,7 +4,15 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */ +html { + font-family: sans-serif; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +body { + margin: 0; +} article, aside, details, @@ -21,8 +29,10 @@ summary { } audio, canvas, +progress, video { display: inline-block; + vertical-align: baseline; } audio:not([controls]) { display: none; @@ -32,29 +42,13 @@ audio:not([controls]) { template { display: none; } -html { - font-family: sans-serif; - - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; -} -body { - margin: 0; -} a { background: transparent; } -a:focus { - outline: thin dotted; -} a:active, a:hover { outline: 0; } -h1 { - margin: .67em 0; - font-size: 2em; -} abbr[title] { border-bottom: 1px dotted; } @@ -65,28 +59,14 @@ strong { dfn { font-style: italic; } -hr { - height: 0; - -moz-box-sizing: content-box; - box-sizing: content-box; +h1 { + margin: .67em 0; + font-size: 2em; } mark { color: #000; background: #ff0; } -code, -kbd, -pre, -samp { - font-family: monospace, serif; - font-size: 1em; -} -pre { - white-space: pre-wrap; -} -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} small { font-size: 80%; } @@ -110,28 +90,34 @@ svg:not(:root) { overflow: hidden; } figure { - margin: 0; + margin: 1em 40px; } -fieldset { - padding: .35em .625em .75em; - margin: 0 2px; - border: 1px solid #c0c0c0; +hr { + height: 0; + -moz-box-sizing: content-box; + box-sizing: content-box; } -legend { - padding: 0; - border: 0; +pre { + overflow: auto; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } button, input, +optgroup, select, textarea { margin: 0; - font-family: inherit; - font-size: 100%; + font: inherit; + color: inherit; } -button, -input { - line-height: normal; +button { + overflow: visible; } button, select { @@ -148,11 +134,23 @@ button[disabled], html input[disabled] { cursor: default; } +button::-moz-focus-inner, +input::-moz-focus-inner { + padding: 0; + border: 0; +} +input { + line-height: normal; +} input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; } +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} input[type="search"] { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; @@ -163,19 +161,29 @@ input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -button::-moz-focus-inner, -input::-moz-focus-inner { +fieldset { + padding: .35em .625em .75em; + margin: 0 2px; + border: 1px solid #c0c0c0; +} +legend { padding: 0; border: 0; } textarea { overflow: auto; - vertical-align: top; +} +optgroup { + font-weight: bold; } table { border-spacing: 0; border-collapse: collapse; } +td, +th { + padding: 0; +} @media print { * { color: #000 !important; -- cgit v1.2.3 From 400720d00b2ebab99c2d54ad036b0100af499620 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Jan 2014 12:24:35 -0800 Subject: Remove optgroup resets from #7611 since Normalize fixes those upstream --- dist/css/bootstrap.css | 5 ----- 1 file changed, 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index cc14e73fc..09f6701e0 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1669,11 +1669,6 @@ select[multiple], select[size] { height: auto; } -select optgroup { - font-family: inherit; - font-size: inherit; - font-style: inherit; -} input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { -- cgit v1.2.3 From b7ac009a527869dc381b9e4c2272c822d85d2b1c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Jan 2014 12:25:39 -0800 Subject: Remove #8350's reset for number inputs since Normalize fixes those upstream --- dist/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 09f6701e0..7482a7c5e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1676,10 +1676,6 @@ input[type="checkbox"]:focus { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -input[type="number"]::-webkit-outer-spin-button, -input[type="number"]::-webkit-inner-spin-button { - height: auto; -} output { display: block; padding-top: 7px; -- cgit v1.2.3 From a9a4d81730dcebeceb5823804c289a5963731496 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 28 Jan 2014 10:08:40 -0800 Subject: grunt --- 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 7482a7c5e..8e4538a11 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4,7 +4,7 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -/*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ html { font-family: sans-serif; -webkit-text-size-adjust: 100%; -- cgit v1.2.3 From 545c957f1741e1a6d6916dcbf08d15f6318d5575 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 29 Jan 2014 21:23:23 -0800 Subject: Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over --- dist/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8e4538a11..ebcf0dcf0 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -301,6 +301,9 @@ a:focus { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } +figure { + margin: 0; +} img { vertical-align: middle; } -- cgit v1.2.3 From d631e0b92d6ff7c6737bcedb38acc58446b3e7cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 29 Jan 2014 21:34:10 -0800 Subject: Fix #12422: Reset height on multiple select in input size mixin --- dist/css/bootstrap.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index ebcf0dcf0..22bc4c4b4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1802,7 +1802,8 @@ select.input-sm { height: 30px; line-height: 30px; } -textarea.input-sm { +textarea.input-sm, +select[multiple].input-sm { height: auto; } .input-lg { @@ -1816,7 +1817,8 @@ select.input-lg { height: 46px; line-height: 46px; } -textarea.input-lg { +textarea.input-lg, +select[multiple].input-lg { height: auto; } .has-feedback { @@ -3333,7 +3335,10 @@ select.input-group-lg > .input-group-btn > .btn { } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, -textarea.input-group-lg > .input-group-btn > .btn { +textarea.input-group-lg > .input-group-btn > .btn, +select[multiple].input-group-lg > .form-control, +select[multiple].input-group-lg > .input-group-addon, +select[multiple].input-group-lg > .input-group-btn > .btn { height: auto; } .input-group-sm > .form-control, @@ -3353,7 +3358,10 @@ select.input-group-sm > .input-group-btn > .btn { } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, -textarea.input-group-sm > .input-group-btn > .btn { +textarea.input-group-sm > .input-group-btn > .btn, +select[multiple].input-group-sm > .form-control, +select[multiple].input-group-sm > .input-group-addon, +select[multiple].input-group-sm > .input-group-btn > .btn { height: auto; } .input-group-addon, -- cgit v1.2.3 From 9195d8e8eb51208e4272e4c7e0851e2695da1a0d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 29 Jan 2014 21:57:44 -0800 Subject: Follow up to #11655: don't reset opacity on disabled buttons --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 22bc4c4b4..882d5ca44 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2031,7 +2031,6 @@ fieldset[disabled] .btn { -webkit-box-shadow: none; box-shadow: none; opacity: .65; - opacity: 1; } .btn-default { color: #333; -- cgit v1.2.3 From 1409cde7e800ca83fd761f87e5ad8f0d259e38d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 30 Jan 2014 08:30:37 -0800 Subject: Bump versions, run grunt --- 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 d7d4e9fcb..14cc1f48e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.0.3 (http://getbootstrap.com) + * Bootstrap v3.1.0 (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From 58bf3f9432e81a450b241134f2e0c319de41146d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 31 Jan 2014 13:40:32 -0800 Subject: grunt after last commits --- 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 14cc1f48e..a4a3ce3c9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3745,7 +3745,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-brand { float: left; - height: 20px; + height: 50px; padding: 15px 15px; font-size: 18px; line-height: 20px; -- cgit v1.2.3 From ec6c9d28240aa4ef32b13be51943f98c00f3437e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Feb 2014 00:18:34 -0800 Subject: Don't offset customizer alert, grunt dist --- dist/css/bootstrap.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a4a3ce3c9..a041563b7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5342,8 +5342,8 @@ button.close { .popover-content { padding: 9px 14px; } -.popover .arrow, -.popover .arrow:after { +.popover > .arrow, +.popover > .arrow:after { position: absolute; display: block; width: 0; @@ -5351,14 +5351,14 @@ button.close { border-color: transparent; border-style: solid; } -.popover .arrow { +.popover > .arrow { border-width: 11px; } -.popover .arrow:after { +.popover > .arrow:after { content: ""; border-width: 10px; } -.popover.top .arrow { +.popover.top > .arrow { bottom: -11px; left: 50%; margin-left: -11px; @@ -5366,14 +5366,14 @@ button.close { border-top-color: rgba(0, 0, 0, .25); border-bottom-width: 0; } -.popover.top .arrow:after { +.popover.top > .arrow:after { bottom: 1px; margin-left: -10px; content: " "; border-top-color: #fff; border-bottom-width: 0; } -.popover.right .arrow { +.popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; @@ -5381,14 +5381,14 @@ button.close { border-right-color: rgba(0, 0, 0, .25); border-left-width: 0; } -.popover.right .arrow:after { +.popover.right > .arrow:after { bottom: -10px; left: 1px; content: " "; border-right-color: #fff; border-left-width: 0; } -.popover.bottom .arrow { +.popover.bottom > .arrow { top: -11px; left: 50%; margin-left: -11px; @@ -5396,14 +5396,14 @@ button.close { border-bottom-color: #999; border-bottom-color: rgba(0, 0, 0, .25); } -.popover.bottom .arrow:after { +.popover.bottom > .arrow:after { top: 1px; margin-left: -10px; content: " "; border-top-width: 0; border-bottom-color: #fff; } -.popover.left .arrow { +.popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; @@ -5411,7 +5411,7 @@ button.close { border-left-color: #999; border-left-color: rgba(0, 0, 0, .25); } -.popover.left .arrow:after { +.popover.left > .arrow:after { right: 1px; bottom: -10px; content: " "; -- cgit v1.2.3 From 07098d1bb7e02cc2b7f8bcbc94931fdedd30830b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Feb 2014 02:01:31 -0800 Subject: Fixes #12470: Scope large modal styles to minimum viewport width --- dist/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a041563b7..64d1b1eb3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5197,6 +5197,8 @@ button.close { .modal-sm { width: 300px; } +} +@media (min-width: 992px) { .modal-lg { width: 900px; } -- cgit v1.2.3 From 00cb50a41aa10789fcf36309a76343112f53e6d7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Feb 2014 19:27:25 -0800 Subject: grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies --- dist/css/bootstrap.css | 344 ++++++++++++++++++++++--------------------------- 1 file changed, 154 insertions(+), 190 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 64d1b1eb3..e64956029 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -275,7 +275,7 @@ html { body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; - line-height: 1.428571429; + line-height: 1.42857143; color: #333; background-color: #fff; } @@ -320,7 +320,7 @@ img { max-width: 100%; height: auto; padding: 4px; - line-height: 1.428571429; + line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; @@ -596,7 +596,7 @@ dl { } dt, dd { - line-height: 1.428571429; + line-height: 1.42857143; } dt { font-weight: bold; @@ -643,7 +643,7 @@ blockquote small, blockquote .small { display: block; font-size: 80%; - line-height: 1.428571429; + line-height: 1.42857143; color: #999; } blockquote footer:before, @@ -682,7 +682,7 @@ blockquote:after { address { margin-bottom: 20px; font-style: normal; - line-height: 1.428571429; + line-height: 1.42857143; } code, kbd, @@ -711,7 +711,7 @@ pre { padding: 9.5px; margin: 0 0 10px; font-size: 13px; - line-height: 1.428571429; + line-height: 1.42857143; color: #333; word-break: break-all; word-wrap: break-word; @@ -775,73 +775,73 @@ pre code { width: 100%; } .col-xs-11 { - width: 91.66666666666666%; + width: 91.66666667%; } .col-xs-10 { - width: 83.33333333333334%; + width: 83.33333333%; } .col-xs-9 { width: 75%; } .col-xs-8 { - width: 66.66666666666666%; + width: 66.66666667%; } .col-xs-7 { - width: 58.333333333333336%; + width: 58.33333333%; } .col-xs-6 { width: 50%; } .col-xs-5 { - width: 41.66666666666667%; + width: 41.66666667%; } .col-xs-4 { - width: 33.33333333333333%; + width: 33.33333333%; } .col-xs-3 { width: 25%; } .col-xs-2 { - width: 16.666666666666664%; + width: 16.66666667%; } .col-xs-1 { - width: 8.333333333333332%; + width: 8.33333333%; } .col-xs-pull-12 { right: 100%; } .col-xs-pull-11 { - right: 91.66666666666666%; + right: 91.66666667%; } .col-xs-pull-10 { - right: 83.33333333333334%; + right: 83.33333333%; } .col-xs-pull-9 { right: 75%; } .col-xs-pull-8 { - right: 66.66666666666666%; + right: 66.66666667%; } .col-xs-pull-7 { - right: 58.333333333333336%; + right: 58.33333333%; } .col-xs-pull-6 { right: 50%; } .col-xs-pull-5 { - right: 41.66666666666667%; + right: 41.66666667%; } .col-xs-pull-4 { - right: 33.33333333333333%; + right: 33.33333333%; } .col-xs-pull-3 { right: 25%; } .col-xs-pull-2 { - right: 16.666666666666664%; + right: 16.66666667%; } .col-xs-pull-1 { - right: 8.333333333333332%; + right: 8.33333333%; } .col-xs-pull-0 { right: 0; @@ -850,37 +850,37 @@ pre code { left: 100%; } .col-xs-push-11 { - left: 91.66666666666666%; + left: 91.66666667%; } .col-xs-push-10 { - left: 83.33333333333334%; + left: 83.33333333%; } .col-xs-push-9 { left: 75%; } .col-xs-push-8 { - left: 66.66666666666666%; + left: 66.66666667%; } .col-xs-push-7 { - left: 58.333333333333336%; + left: 58.33333333%; } .col-xs-push-6 { left: 50%; } .col-xs-push-5 { - left: 41.66666666666667%; + left: 41.66666667%; } .col-xs-push-4 { - left: 33.33333333333333%; + left: 33.33333333%; } .col-xs-push-3 { left: 25%; } .col-xs-push-2 { - left: 16.666666666666664%; + left: 16.66666667%; } .col-xs-push-1 { - left: 8.333333333333332%; + left: 8.33333333%; } .col-xs-push-0 { left: 0; @@ -889,37 +889,37 @@ pre code { margin-left: 100%; } .col-xs-offset-11 { - margin-left: 91.66666666666666%; + margin-left: 91.66666667%; } .col-xs-offset-10 { - margin-left: 83.33333333333334%; + margin-left: 83.33333333%; } .col-xs-offset-9 { margin-left: 75%; } .col-xs-offset-8 { - margin-left: 66.66666666666666%; + margin-left: 66.66666667%; } .col-xs-offset-7 { - margin-left: 58.333333333333336%; + margin-left: 58.33333333%; } .col-xs-offset-6 { margin-left: 50%; } .col-xs-offset-5 { - margin-left: 41.66666666666667%; + margin-left: 41.66666667%; } .col-xs-offset-4 { - margin-left: 33.33333333333333%; + margin-left: 33.33333333%; } .col-xs-offset-3 { margin-left: 25%; } .col-xs-offset-2 { - margin-left: 16.666666666666664%; + margin-left: 16.66666667%; } .col-xs-offset-1 { - margin-left: 8.333333333333332%; + margin-left: 8.33333333%; } .col-xs-offset-0 { margin-left: 0; @@ -932,73 +932,73 @@ pre code { width: 100%; } .col-sm-11 { - width: 91.66666666666666%; + width: 91.66666667%; } .col-sm-10 { - width: 83.33333333333334%; + width: 83.33333333%; } .col-sm-9 { width: 75%; } .col-sm-8 { - width: 66.66666666666666%; + width: 66.66666667%; } .col-sm-7 { - width: 58.333333333333336%; + width: 58.33333333%; } .col-sm-6 { width: 50%; } .col-sm-5 { - width: 41.66666666666667%; + width: 41.66666667%; } .col-sm-4 { - width: 33.33333333333333%; + width: 33.33333333%; } .col-sm-3 { width: 25%; } .col-sm-2 { - width: 16.666666666666664%; + width: 16.66666667%; } .col-sm-1 { - width: 8.333333333333332%; + width: 8.33333333%; } .col-sm-pull-12 { right: 100%; } .col-sm-pull-11 { - right: 91.66666666666666%; + right: 91.66666667%; } .col-sm-pull-10 { - right: 83.33333333333334%; + right: 83.33333333%; } .col-sm-pull-9 { right: 75%; } .col-sm-pull-8 { - right: 66.66666666666666%; + right: 66.66666667%; } .col-sm-pull-7 { - right: 58.333333333333336%; + right: 58.33333333%; } .col-sm-pull-6 { right: 50%; } .col-sm-pull-5 { - right: 41.66666666666667%; + right: 41.66666667%; } .col-sm-pull-4 { - right: 33.33333333333333%; + right: 33.33333333%; } .col-sm-pull-3 { right: 25%; } .col-sm-pull-2 { - right: 16.666666666666664%; + right: 16.66666667%; } .col-sm-pull-1 { - right: 8.333333333333332%; + right: 8.33333333%; } .col-sm-pull-0 { right: 0; @@ -1007,37 +1007,37 @@ pre code { left: 100%; } .col-sm-push-11 { - left: 91.66666666666666%; + left: 91.66666667%; } .col-sm-push-10 { - left: 83.33333333333334%; + left: 83.33333333%; } .col-sm-push-9 { left: 75%; } .col-sm-push-8 { - left: 66.66666666666666%; + left: 66.66666667%; } .col-sm-push-7 { - left: 58.333333333333336%; + left: 58.33333333%; } .col-sm-push-6 { left: 50%; } .col-sm-push-5 { - left: 41.66666666666667%; + left: 41.66666667%; } .col-sm-push-4 { - left: 33.33333333333333%; + left: 33.33333333%; } .col-sm-push-3 { left: 25%; } .col-sm-push-2 { - left: 16.666666666666664%; + left: 16.66666667%; } .col-sm-push-1 { - left: 8.333333333333332%; + left: 8.33333333%; } .col-sm-push-0 { left: 0; @@ -1046,37 +1046,37 @@ pre code { margin-left: 100%; } .col-sm-offset-11 { - margin-left: 91.66666666666666%; + margin-left: 91.66666667%; } .col-sm-offset-10 { - margin-left: 83.33333333333334%; + margin-left: 83.33333333%; } .col-sm-offset-9 { margin-left: 75%; } .col-sm-offset-8 { - margin-left: 66.66666666666666%; + margin-left: 66.66666667%; } .col-sm-offset-7 { - margin-left: 58.333333333333336%; + margin-left: 58.33333333%; } .col-sm-offset-6 { margin-left: 50%; } .col-sm-offset-5 { - margin-left: 41.66666666666667%; + margin-left: 41.66666667%; } .col-sm-offset-4 { - margin-left: 33.33333333333333%; + margin-left: 33.33333333%; } .col-sm-offset-3 { margin-left: 25%; } .col-sm-offset-2 { - margin-left: 16.666666666666664%; + margin-left: 16.66666667%; } .col-sm-offset-1 { - margin-left: 8.333333333333332%; + margin-left: 8.33333333%; } .col-sm-offset-0 { margin-left: 0; @@ -1090,73 +1090,73 @@ pre code { width: 100%; } .col-md-11 { - width: 91.66666666666666%; + width: 91.66666667%; } .col-md-10 { - width: 83.33333333333334%; + width: 83.33333333%; } .col-md-9 { width: 75%; } .col-md-8 { - width: 66.66666666666666%; + width: 66.66666667%; } .col-md-7 { - width: 58.333333333333336%; + width: 58.33333333%; } .col-md-6 { width: 50%; } .col-md-5 { - width: 41.66666666666667%; + width: 41.66666667%; } .col-md-4 { - width: 33.33333333333333%; + width: 33.33333333%; } .col-md-3 { width: 25%; } .col-md-2 { - width: 16.666666666666664%; + width: 16.66666667%; } .col-md-1 { - width: 8.333333333333332%; + width: 8.33333333%; } .col-md-pull-12 { right: 100%; } .col-md-pull-11 { - right: 91.66666666666666%; + right: 91.66666667%; } .col-md-pull-10 { - right: 83.33333333333334%; + right: 83.33333333%; } .col-md-pull-9 { right: 75%; } .col-md-pull-8 { - right: 66.66666666666666%; + right: 66.66666667%; } .col-md-pull-7 { - right: 58.333333333333336%; + right: 58.33333333%; } .col-md-pull-6 { right: 50%; } .col-md-pull-5 { - right: 41.66666666666667%; + right: 41.66666667%; } .col-md-pull-4 { - right: 33.33333333333333%; + right: 33.33333333%; } .col-md-pull-3 { right: 25%; } .col-md-pull-2 { - right: 16.666666666666664%; + right: 16.66666667%; } .col-md-pull-1 { - right: 8.333333333333332%; + right: 8.33333333%; } .col-md-pull-0 { right: 0; @@ -1165,37 +1165,37 @@ pre code { left: 100%; } .col-md-push-11 { - left: 91.66666666666666%; + left: 91.66666667%; } .col-md-push-10 { - left: 83.33333333333334%; + left: 83.33333333%; } .col-md-push-9 { left: 75%; } .col-md-push-8 { - left: 66.66666666666666%; + left: 66.66666667%; } .col-md-push-7 { - left: 58.333333333333336%; + left: 58.33333333%; } .col-md-push-6 { left: 50%; } .col-md-push-5 { - left: 41.66666666666667%; + left: 41.66666667%; } .col-md-push-4 { - left: 33.33333333333333%; + left: 33.33333333%; } .col-md-push-3 { left: 25%; } .col-md-push-2 { - left: 16.666666666666664%; + left: 16.66666667%; } .col-md-push-1 { - left: 8.333333333333332%; + left: 8.33333333%; } .col-md-push-0 { left: 0; @@ -1204,37 +1204,37 @@ pre code { margin-left: 100%; } .col-md-offset-11 { - margin-left: 91.66666666666666%; + margin-left: 91.66666667%; } .col-md-offset-10 { - margin-left: 83.33333333333334%; + margin-left: 83.33333333%; } .col-md-offset-9 { margin-left: 75%; } .col-md-offset-8 { - margin-left: 66.66666666666666%; + margin-left: 66.66666667%; } .col-md-offset-7 { - margin-left: 58.333333333333336%; + margin-left: 58.33333333%; } .col-md-offset-6 { margin-left: 50%; } .col-md-offset-5 { - margin-left: 41.66666666666667%; + margin-left: 41.66666667%; } .col-md-offset-4 { - margin-left: 33.33333333333333%; + margin-left: 33.33333333%; } .col-md-offset-3 { margin-left: 25%; } .col-md-offset-2 { - margin-left: 16.666666666666664%; + margin-left: 16.66666667%; } .col-md-offset-1 { - margin-left: 8.333333333333332%; + margin-left: 8.33333333%; } .col-md-offset-0 { margin-left: 0; @@ -1248,73 +1248,73 @@ pre code { width: 100%; } .col-lg-11 { - width: 91.66666666666666%; + width: 91.66666667%; } .col-lg-10 { - width: 83.33333333333334%; + width: 83.33333333%; } .col-lg-9 { width: 75%; } .col-lg-8 { - width: 66.66666666666666%; + width: 66.66666667%; } .col-lg-7 { - width: 58.333333333333336%; + width: 58.33333333%; } .col-lg-6 { width: 50%; } .col-lg-5 { - width: 41.66666666666667%; + width: 41.66666667%; } .col-lg-4 { - width: 33.33333333333333%; + width: 33.33333333%; } .col-lg-3 { width: 25%; } .col-lg-2 { - width: 16.666666666666664%; + width: 16.66666667%; } .col-lg-1 { - width: 8.333333333333332%; + width: 8.33333333%; } .col-lg-pull-12 { right: 100%; } .col-lg-pull-11 { - right: 91.66666666666666%; + right: 91.66666667%; } .col-lg-pull-10 { - right: 83.33333333333334%; + right: 83.33333333%; } .col-lg-pull-9 { right: 75%; } .col-lg-pull-8 { - right: 66.66666666666666%; + right: 66.66666667%; } .col-lg-pull-7 { - right: 58.333333333333336%; + right: 58.33333333%; } .col-lg-pull-6 { right: 50%; } .col-lg-pull-5 { - right: 41.66666666666667%; + right: 41.66666667%; } .col-lg-pull-4 { - right: 33.33333333333333%; + right: 33.33333333%; } .col-lg-pull-3 { right: 25%; } .col-lg-pull-2 { - right: 16.666666666666664%; + right: 16.66666667%; } .col-lg-pull-1 { - right: 8.333333333333332%; + right: 8.33333333%; } .col-lg-pull-0 { right: 0; @@ -1323,37 +1323,37 @@ pre code { left: 100%; } .col-lg-push-11 { - left: 91.66666666666666%; + left: 91.66666667%; } .col-lg-push-10 { - left: 83.33333333333334%; + left: 83.33333333%; } .col-lg-push-9 { left: 75%; } .col-lg-push-8 { - left: 66.66666666666666%; + left: 66.66666667%; } .col-lg-push-7 { - left: 58.333333333333336%; + left: 58.33333333%; } .col-lg-push-6 { left: 50%; } .col-lg-push-5 { - left: 41.66666666666667%; + left: 41.66666667%; } .col-lg-push-4 { - left: 33.33333333333333%; + left: 33.33333333%; } .col-lg-push-3 { left: 25%; } .col-lg-push-2 { - left: 16.666666666666664%; + left: 16.66666667%; } .col-lg-push-1 { - left: 8.333333333333332%; + left: 8.33333333%; } .col-lg-push-0 { left: 0; @@ -1362,37 +1362,37 @@ pre code { margin-left: 100%; } .col-lg-offset-11 { - margin-left: 91.66666666666666%; + margin-left: 91.66666667%; } .col-lg-offset-10 { - margin-left: 83.33333333333334%; + margin-left: 83.33333333%; } .col-lg-offset-9 { margin-left: 75%; } .col-lg-offset-8 { - margin-left: 66.66666666666666%; + margin-left: 66.66666667%; } .col-lg-offset-7 { - margin-left: 58.333333333333336%; + margin-left: 58.33333333%; } .col-lg-offset-6 { margin-left: 50%; } .col-lg-offset-5 { - margin-left: 41.66666666666667%; + margin-left: 41.66666667%; } .col-lg-offset-4 { - margin-left: 33.33333333333333%; + margin-left: 33.33333333%; } .col-lg-offset-3 { margin-left: 25%; } .col-lg-offset-2 { - margin-left: 16.666666666666664%; + margin-left: 16.66666667%; } .col-lg-offset-1 { - margin-left: 8.333333333333332%; + margin-left: 8.33333333%; } .col-lg-offset-0 { margin-left: 0; @@ -1416,7 +1416,7 @@ th { .table > tbody > tr > td, .table > tfoot > tr > td { padding: 8px; - line-height: 1.428571429; + line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd; } @@ -1683,7 +1683,7 @@ output { display: block; padding-top: 7px; font-size: 14px; - line-height: 1.428571429; + line-height: 1.42857143; color: #555; } .form-control { @@ -1692,7 +1692,7 @@ output { height: 34px; padding: 6px 12px; font-size: 14px; - line-height: 1.428571429; + line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; @@ -1991,7 +1991,7 @@ select[multiple].input-lg { margin-bottom: 0; font-size: 14px; font-weight: normal; - line-height: 1.428571429; + line-height: 1.42857143; text-align: center; white-space: nowrap; vertical-align: middle; @@ -3033,7 +3033,7 @@ input[type="button"].btn-block { padding: 3px 20px; clear: both; font-weight: normal; - line-height: 1.428571429; + line-height: 1.42857143; color: #333; white-space: nowrap; } @@ -3082,7 +3082,7 @@ input[type="button"].btn-block { display: block; padding: 3px 20px; font-size: 12px; - line-height: 1.428571429; + line-height: 1.42857143; color: #999; } .dropdown-backdrop { @@ -3507,7 +3507,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs > li > a { margin-right: 2px; - line-height: 1.428571429; + line-height: 1.42857143; border: 1px solid transparent; border-radius: 4px 4px 0 0; } @@ -4146,7 +4146,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: left; padding: 6px 12px; margin-left: -1px; - line-height: 1.428571429; + line-height: 1.42857143; color: #428bca; text-decoration: none; background-color: #fff; @@ -4407,7 +4407,7 @@ a.list-group-item.active > .badge, display: block; padding: 4px; margin-bottom: 20px; - line-height: 1.428571429; + line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; @@ -5154,7 +5154,7 @@ button.close { opacity: .5; } .modal-header { - min-height: 16.428571429px; + min-height: 16.42857143px; padding: 15px; border-bottom: 1px solid #e5e5e5; } @@ -5163,7 +5163,7 @@ button.close { } .modal-title { margin: 0; - line-height: 1.428571429; + line-height: 1.42857143; } .modal-body { position: relative; @@ -5686,9 +5686,9 @@ button.close { width: device-width; } .visible-xs, -tr.visible-xs, -th.visible-xs, -td.visible-xs { +.visible-sm, +.visible-md, +.visible-lg { display: none !important; } @media (max-width: 767px) { @@ -5706,12 +5706,6 @@ td.visible-xs { display: table-cell !important; } } -.visible-sm, -tr.visible-sm, -th.visible-sm, -td.visible-sm { - display: none !important; -} @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important; @@ -5727,12 +5721,6 @@ td.visible-sm { display: table-cell !important; } } -.visible-md, -tr.visible-md, -th.visible-md, -td.visible-md { - display: none !important; -} @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important; @@ -5748,12 +5736,6 @@ td.visible-md { display: table-cell !important; } } -.visible-lg, -tr.visible-lg, -th.visible-lg, -td.visible-lg { - display: none !important; -} @media (min-width: 1200px) { .visible-lg { display: block !important; @@ -5770,41 +5752,26 @@ td.visible-lg { } } @media (max-width: 767px) { - .hidden-xs, - tr.hidden-xs, - th.hidden-xs, - td.hidden-xs { + .hidden-xs { display: none !important; } } @media (min-width: 768px) and (max-width: 991px) { - .hidden-sm, - tr.hidden-sm, - th.hidden-sm, - td.hidden-sm { + .hidden-sm { display: none !important; } } @media (min-width: 992px) and (max-width: 1199px) { - .hidden-md, - tr.hidden-md, - th.hidden-md, - td.hidden-md { + .hidden-md { display: none !important; } } @media (min-width: 1200px) { - .hidden-lg, - tr.hidden-lg, - th.hidden-lg, - td.hidden-lg { + .hidden-lg { display: none !important; } } -.visible-print, -tr.visible-print, -th.visible-print, -td.visible-print { +.visible-print { display: none !important; } @media print { @@ -5823,10 +5790,7 @@ td.visible-print { } } @media print { - .hidden-print, - tr.hidden-print, - th.hidden-print, - td.hidden-print { + .hidden-print { display: none !important; } } -- cgit v1.2.3 From 08ff305ed7ba689238d4524b0285d37d15aaf8fa Mon Sep 17 00:00:00 2001 From: Supergibbs Date: Thu, 30 Jan 2014 21:49:37 -0800 Subject: Added border radiuses to table when in a panel. Fixes #12461 --- dist/css/bootstrap.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e64956029..2f18aade1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4799,6 +4799,11 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table { margin-bottom: 0; } +.panel > .table:first-child, +.panel > .table-responsive:first-child > .table:first-child { + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, @@ -4819,6 +4824,11 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { border-top-right-radius: 3px; } +.panel > .table:last-child, +.panel > .table-responsive:last-child > .table:last-child { + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, -- cgit v1.2.3 From 37c21a3ac7f86f5cac904a12af897b3051170d02 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Feb 2014 10:51:49 -0800 Subject: use Less' extend feature in btn-group-lg etc. --- dist/css/bootstrap.css | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e64956029..329b4fa2e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2311,19 +2311,22 @@ fieldset[disabled] .btn-link:focus { color: #999; text-decoration: none; } -.btn-lg { +.btn-lg, +.btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.33; border-radius: 6px; } -.btn-sm { +.btn-sm, +.btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.btn-xs { +.btn-xs, +.btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; @@ -3196,24 +3199,6 @@ input[type="button"].btn-block { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group-xs > .btn { - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-sm > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-lg > .btn { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} .btn-group > .btn + .dropdown-toggle { padding-right: 8px; padding-left: 8px; -- cgit v1.2.3 From fda8d91c86a29cceab93285d920db56f7f26aaf8 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Feb 2014 15:39:15 -0800 Subject: use :extend in thumbnail Less --- dist/css/bootstrap.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 329b4fa2e..64762c0b3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -307,7 +307,9 @@ figure { img { vertical-align: middle; } -.img-responsive { +.img-responsive, +.thumbnail > img, +.thumbnail a > img { display: block; max-width: 100%; height: auto; @@ -4401,9 +4403,6 @@ a.list-group-item.active > .badge, } .thumbnail > img, .thumbnail a > img { - display: block; - max-width: 100%; - height: auto; margin-right: auto; margin-left: auto; } -- cgit v1.2.3 From 7c1511502ed96549c1674d1cda102551afe6dd30 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Feb 2014 15:52:26 -0800 Subject: use :extend(.img-responsive) in Carousel's Less --- dist/css/bootstrap.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 329b4fa2e..ab259fa6a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -307,7 +307,9 @@ figure { img { vertical-align: middle; } -.img-responsive { +.img-responsive, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto; @@ -5421,9 +5423,6 @@ button.close { } .carousel-inner > .item > img, .carousel-inner > .item > a > img { - display: block; - max-width: 100%; - height: auto; line-height: 1; } .carousel-inner > .active, -- cgit v1.2.3 From 228d4e59fcdb0e05811821a9aff899e7b4e5f4d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 01:21:58 -0800 Subject: Fixes #12555: Rearrange variables to place grids and containers closer --- dist/css/bootstrap.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 23202f62b..5b4e49bd1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1713,9 +1713,6 @@ output { -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); } -.form-control:-moz-placeholder { - color: #999; -} .form-control::-moz-placeholder { color: #999; opacity: 1; -- cgit v1.2.3 From 3ccc16cad078cfcc76f3b9362f0039b0566d8914 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:24:37 -0800 Subject: grunt for days --- dist/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 5b4e49bd1..66db05317 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1733,6 +1733,9 @@ fieldset[disabled] .form-control { textarea.form-control { height: auto; } +input[type="search"] { + -webkit-appearance: none; +} input[type="date"] { line-height: 34px; } -- cgit v1.2.3 From d91d9b0ade9165c20d781ced128a751d0ae1fbda Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:38:01 -0800 Subject: Fixes #12447: Properly reset borders on table cells in panels --- dist/css/bootstrap.css | 78 ++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 66db05317..a583f11dc 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4757,6 +4757,31 @@ a.list-group-item-danger.active:focus { .panel-body { padding: 15px; } +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} +.panel-heading > .dropdown .dropdown-toggle { + color: inherit; +} +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: 16px; + color: inherit; +} +.panel-title > a { + color: inherit; +} +.panel-footer { + padding: 10px 15px; + background-color: #f5f5f5; + border-top: 1px solid #ddd; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} .panel > .list-group { margin-bottom: 0; } @@ -4865,63 +4890,30 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0; } -.panel > .table-bordered > thead > tr:first-child > th, -.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, -.panel > .table-bordered > tbody > tr:first-child > th, -.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th, -.panel > .table-bordered > tfoot > tr:first-child > th, -.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th, .panel > .table-bordered > thead > tr:first-child > td, .panel > .table-responsive > .table-bordered > thead > tr:first-child > td, .panel > .table-bordered > tbody > tr:first-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, -.panel > .table-bordered > tfoot > tr:first-child > td, -.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td { - border-top: 0; +.panel > .table-bordered > thead > tr:first-child > th, +.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, +.panel > .table-bordered > tbody > tr:first-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { + border-bottom: 0; } -.panel > .table-bordered > thead > tr:last-child > th, -.panel > .table-responsive > .table-bordered > thead > tr:last-child > th, -.panel > .table-bordered > tbody > tr:last-child > th, -.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, -.panel > .table-bordered > tfoot > tr:last-child > th, -.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th, -.panel > .table-bordered > thead > tr:last-child > td, -.panel > .table-responsive > .table-bordered > thead > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tfoot > tr:last-child > td, -.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td { +.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, +.panel > .table-bordered > tbody > tr:last-child > th, +.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, +.panel > .table-bordered > tfoot > tr:last-child > th, +.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { border-bottom: 0; } .panel > .table-responsive { margin-bottom: 0; border: 0; } -.panel-heading { - padding: 10px 15px; - border-bottom: 1px solid transparent; - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} -.panel-heading > .dropdown .dropdown-toggle { - color: inherit; -} -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: 16px; - color: inherit; -} -.panel-title > a { - color: inherit; -} -.panel-footer { - padding: 10px 15px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; -} .panel-group { margin-bottom: 20px; } -- cgit v1.2.3 From 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:58:10 -0800 Subject: Fixes #12486: Restore full width inputs for input groups in inline forms and navbars --- dist/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 66db05317..958f830d7 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1723,6 +1723,7 @@ output { .form-control::-webkit-input-placeholder { color: #999; } +.form-control:disabled, .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { @@ -1939,6 +1940,9 @@ select[multiple].input-lg { width: auto; vertical-align: middle; } + .form-inline .input-group > .form-control { + width: 100%; + } .form-inline .control-label { margin-bottom: 0; vertical-align: middle; @@ -3854,6 +3858,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { width: auto; vertical-align: middle; } + .navbar-form .input-group > .form-control { + width: 100%; + } .navbar-form .control-label { margin-bottom: 0; vertical-align: middle; -- cgit v1.2.3 From a0052b5a3745737777c88409ae08585ce75b285b Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Fri, 7 Feb 2014 14:14:32 +0100 Subject: Drop -o-user-select --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 958f830d7..3179cb643 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2007,7 +2007,6 @@ select[multiple].input-lg { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; - -o-user-select: none; user-select: none; background-image: none; border: 1px solid transparent; -- cgit v1.2.3 From a2f08158d032c1025ca0c6bf411b8282b606fb7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 15:44:50 -0800 Subject: Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4 --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 958f830d7..aef1e7890 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1723,7 +1723,6 @@ output { .form-control::-webkit-input-placeholder { color: #999; } -.form-control:disabled, .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { -- cgit v1.2.3 From 26e2d7cdc948dfdd3b0646ed29c6d5c37d8df710 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Feb 2014 16:13:30 -0800 Subject: grunt --- dist/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 83e6f2605..bf4ebac12 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5572,8 +5572,8 @@ button.close { text-shadow: none; } @media screen and (min-width: 768px) { - .carousel-control .glyphicons-chevron-left, - .carousel-control .glyphicons-chevron-right, + .carousel-control .glyphicon-chevron-left, + .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; -- cgit v1.2.3