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