From 602e5f8f115b6625011e2e6c2d36c1d28715c4b9 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 26 Jan 2014 17:31:11 -0800 Subject: mark .box-shadow() mixin as deprecated; fixes #12396 --- less/mixins.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 104590730..85a41ef50 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -115,6 +115,10 @@ } // Drop shadows +// +// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's +// supported browsers that have box shadow capabilities now support the +// standard `box-shadow` property. .box-shadow(@shadow) { -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1 box-shadow: @shadow; -- cgit v1.2.3 From 1a36e4fa1e9d9220a242d01062941a16ef07e660 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 26 Jan 2014 17:48:15 -0800 Subject: docs & comments: v3.1 => v3.1.0 --- less/dropdowns.less | 2 +- less/type.less | 4 ++-- less/variables.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index dde2038e3..f165165e7 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -47,7 +47,7 @@ // Aligns the dropdown menu to right // - // Deprecated as of 3.1 in favor of `.dropdown-menu-[dir]` + // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]` &.pull-right { right: 0; left: auto; diff --git a/less/type.less b/less/type.less index 315e7eade..a55730dfe 100644 --- a/less/type.less +++ b/less/type.less @@ -244,7 +244,7 @@ blockquote { } } - // Deprecating small and .small for v3.1 + // Note: Deprecated small and .small as of v3.1.0 // Context: https://github.com/twbs/bootstrap/issues/11660 footer, small, @@ -262,7 +262,7 @@ blockquote { // Opposite alignment of blockquote // -// Heads up: `blockquote.pull-right` has been deprecated as of v3.1. +// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0. .blockquote-reverse, blockquote.pull-right { padding-right: 15px; diff --git a/less/variables.less b/less/variables.less index bbf54b48c..ebc72c00e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -232,7 +232,7 @@ //** Text color for headers within dropdown menus. @dropdown-header-color: @gray-light; -// Note: Deprecated @dropdown-caret-color as of v3.1 +// Note: Deprecated @dropdown-caret-color as of v3.1.0 @dropdown-caret-color: #000; -- 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 --- less/.csscomb.json | 2 + less/normalize.less | 261 ++++++++++++++++++++++++++++------------------------ 2 files changed, 141 insertions(+), 122 deletions(-) (limited to 'less') diff --git a/less/.csscomb.json b/less/.csscomb.json index 53ea6eff3..c3d0c088b 100644 --- a/less/.csscomb.json +++ b/less/.csscomb.json @@ -91,6 +91,8 @@ "text-shadow", "text-transform", "text-wrap", + "-webkit-text-size-adjust", + "-ms-text-size-adjust", "letter-spacing", "-ms-word-break", "word-break", diff --git a/less/normalize.less b/less/normalize.less index 42a393fc0..c7aa71f78 100644 --- a/less/normalize.less +++ b/less/normalize.less @@ -1,6 +1,25 @@ -/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */ + +// +// 1. Set default font family to sans-serif. +// 2. Prevent iOS text size adjust after orientation change, without disabling +// user zoom. +// + +html { + font-family: sans-serif; // 1 + -ms-text-size-adjust: 100%; // 2 + -webkit-text-size-adjust: 100%; // 2 +} + +// +// Remove default margin. +// + +body { + margin: 0; +} -// ========================================================================== // HTML5 display definitions // ========================================================================== @@ -24,13 +43,16 @@ summary { } // -// Correct `inline-block` display not defined in IE 8/9. +// 1. Correct `inline-block` display not defined in IE 8/9. +// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. // audio, canvas, +progress, video { - display: inline-block; + display: inline-block; // 1 + vertical-align: baseline; // 2 } // @@ -53,31 +75,6 @@ template { display: none; } -// ========================================================================== -// Base -// ========================================================================== - -// -// 1. Set default font family to sans-serif. -// 2. Prevent iOS text size adjust after orientation change, without disabling -// user zoom. -// - -html { - font-family: sans-serif; // 1 - -ms-text-size-adjust: 100%; // 2 - -webkit-text-size-adjust: 100%; // 2 -} - -// -// Remove default margin. -// - -body { - margin: 0; -} - -// ========================================================================== // Links // ========================================================================== @@ -89,14 +86,6 @@ a { background: transparent; } -// -// Address `outline` inconsistency between Chrome and other browsers. -// - -a:focus { - outline: thin dotted; -} - // // Improve readability when focused and also mouse hovered in all browsers. // @@ -106,19 +95,8 @@ a:hover { outline: 0; } +// Text-level semantics // ========================================================================== -// Typography -// ========================================================================== - -// -// Address variable `h1` font-size and margin within `section` and `article` -// contexts in Firefox 4+, Safari 5, and Chrome. -// - -h1 { - font-size: 2em; - margin: 0.67em 0; -} // // Address styling not present in IE 8/9, Safari 5, and Chrome. @@ -146,13 +124,13 @@ dfn { } // -// Address differences between Firefox and other browsers. +// Address variable `h1` font-size and margin within `section` and `article` +// contexts in Firefox 4+, Safari 5, and Chrome. // -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; +h1 { + font-size: 2em; + margin: 0.67em 0; } // @@ -164,34 +142,6 @@ mark { color: #000; } -// -// Correct font family set oddly in Safari 5 and Chrome. -// - -code, -kbd, -pre, -samp { - font-family: monospace, serif; - font-size: 1em; -} - -// -// Improve readability of pre-formatted text in all browsers. -// - -pre { - white-space: pre-wrap; -} - -// -// Set consistent quote types. -// - -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} - // // Address inconsistent and variable font size in all browsers. // @@ -220,7 +170,6 @@ sub { bottom: -0.25em; } -// ========================================================================== // Embedded content // ========================================================================== @@ -240,8 +189,7 @@ svg:not(:root) { overflow: hidden; } -// ========================================================================== -// Figures +// Grouping content // ========================================================================== // @@ -249,63 +197,77 @@ svg:not(:root) { // figure { - margin: 0; + margin: 1em 40px; } -// ========================================================================== -// Forms -// ========================================================================== +// +// Address differences between Firefox and other browsers. +// + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} // -// Define consistent border, margin, and padding. +// Contain overflow in all browsers. // -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; +pre { + overflow: auto; } // -// 1. Correct `color` not being inherited in IE 8/9. -// 2. Remove padding so people aren't caught out if they zero out fieldsets. +// Address odd `em`-unit font size rendering in all browsers. // -legend { - border: 0; // 1 - padding: 0; // 2 +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } +// Forms +// ========================================================================== + +// +// Known limitation: by default, Chrome and Safari on OS X allow very limited +// styling of `select`, unless a `border` property is set. +// + // -// 1. Correct font family not being inherited in all browsers. -// 2. Correct font size not being inherited in all browsers. +// 1. Correct color not being inherited. +// Known issue: affects color of disabled elements. +// 2. Correct font properties not being inherited. // 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. // button, input, +optgroup, select, textarea { - font-family: inherit; // 1 - font-size: 100%; // 2 + color: inherit; // 1 + font: inherit; // 2 margin: 0; // 3 } // -// Address Firefox 4+ setting `line-height` on `input` using `!important` in -// the UA stylesheet. +// Address `overflow` set to `hidden` in IE 8/9/10. // -button, -input { - line-height: normal; +button { + overflow: visible; } // // Address inconsistent `text-transform` inheritance for `button` and `select`. // All other form control elements do not inherit `text-transform` values. -// Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. -// Correct `select` style inheritance in Firefox 4+ and Opera. +// Correct `button` style inheritance in Firefox, IE 8+, and Opera +// Correct `select` style inheritance in Firefox. // button, @@ -338,6 +300,28 @@ html input[disabled] { cursor: default; } +// +// Remove inner padding and border in Firefox 4+. +// + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +// +// Address Firefox 4+ setting `line-height` on `input` using `!important` in +// the UA stylesheet. +// + +input { + line-height: normal; +} + +// +// It's recommended that you don't attempt to style these elements. +// Firefox's implementation doesn't respect box-sizing, padding, or width. // // 1. Address box sizing set to `content-box` in IE 8/9/10. // 2. Remove excess padding in IE 8/9/10. @@ -349,6 +333,17 @@ input[type="radio"] { padding: 0; // 2 } +// +// Fix the cursor style for Chrome's increment/decrement buttons. For certain +// `font-size` values of the `input`, it causes the cursor style of the +// decrement button to change from `default` to `text`. +// + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + // // 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. // 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome @@ -363,8 +358,9 @@ input[type="search"] { } // -// Remove inner padding and search cancel button in Safari 5 and Chrome -// on OS X. +// Remove inner padding and search cancel button in Safari and Chrome on OS X. +// Safari (but not Chrome) clips the cancel button when the search input has +// padding (and `textfield` appearance). // input[type="search"]::-webkit-search-cancel-button, @@ -373,26 +369,42 @@ input[type="search"]::-webkit-search-decoration { } // -// Remove inner padding and border in Firefox 4+. +// Define consistent border, margin, and padding. // -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } // -// 1. Remove default vertical scrollbar in IE 8/9. -// 2. Improve readability and alignment in all browsers. +// 1. Correct `color` not being inherited in IE 8/9. +// 2. Remove padding so people aren't caught out if they zero out fieldsets. +// + +legend { + border: 0; // 1 + padding: 0; // 2 +} + +// +// Remove default vertical scrollbar in IE 8/9. // textarea { - overflow: auto; // 1 - vertical-align: top; // 2 + overflow: auto; +} + +// +// Don't inherit the `font-weight` (applied by a rule above). +// NOTE: the default cannot safely be changed in Chrome and Safari on OS X. +// + +optgroup { + font-weight: bold; } -// ========================================================================== // Tables // ========================================================================== @@ -404,3 +416,8 @@ table { border-collapse: collapse; border-spacing: 0; } + +td, +th { + padding: 0; +} \ No newline at end of file -- 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 --- less/forms.less | 7 ------- 1 file changed, 7 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 687d1f437..c3d4821db 100644 --- a/less/forms.less +++ b/less/forms.less @@ -72,13 +72,6 @@ select[size] { height: auto; } -// Fix optgroup Firefox bug per https://github.com/twbs/bootstrap/issues/7611 -select optgroup { - font-size: inherit; - font-style: inherit; - font-family: inherit; -} - // Focus for file, radio, and checkbox input[type="file"]:focus, input[type="radio"]: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 --- less/forms.less | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index c3d4821db..d0189d0cc 100644 --- a/less/forms.less +++ b/less/forms.less @@ -79,17 +79,6 @@ input[type="checkbox"]:focus { .tab-focus(); } -// Fix for Chrome number input -// -// Setting certain font-sizes causes the `I` bar to appear on hover of the -// decrement button. See https://github.com/twbs/bootstrap/issues/8350. -input[type="number"] { - &::-webkit-outer-spin-button, - &::-webkit-inner-spin-button { - height: auto; - } -} - // Adjust output element output { display: block; -- cgit v1.2.3 From 493d143cbdc30530eda0da803612e668d0992f80 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 28 Jan 2014 10:07:33 -0800 Subject: v3 instead of rc1 --- less/normalize.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/normalize.less b/less/normalize.less index c7aa71f78..024e257c1 100644 --- a/less/normalize.less +++ b/less/normalize.less @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ // // 1. Set default font family to sans-serif. -- 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 --- less/scaffolding.less | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'less') diff --git a/less/scaffolding.less b/less/scaffolding.less index 2fa0fdec7..fe29f2d62 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -61,6 +61,16 @@ a { } +// Figures +// +// We reset this here because previously Normalize had no `figure` margins. This +// ensures we don't break anyone's use of the element. + +figure { + margin: 0; +} + + // Images img { -- 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 --- less/mixins.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 85a41ef50..ae746d83a 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -919,7 +919,8 @@ line-height: @input-height; } - textarea& { + textarea&, + select[multiple]& { height: auto; } } -- 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 --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 3577f82da..4858a8aea 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -43,7 +43,6 @@ pointer-events: none; // Future-proof disabling of clicks .opacity(.65); .box-shadow(none); - opacity: 1; // iOS fix for unreadable disabled content } } -- cgit v1.2.3