From 1e09a9d1d7cbfe807d791bb806d1b56d2bd5830a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 1 Feb 2014 14:20:41 +0100 Subject: Remove redundant :-moz-placeholder styles No need for old Firefox versions support. --- less/mixins.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index ae746d83a..5b34ffb61 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -54,8 +54,7 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { - &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; // Firefox 19+ + &::-moz-placeholder { color: @color; // Firefox opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome -- 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. --- less/button-groups.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 58fd90675..27eb796b8 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -96,9 +96,9 @@ // // Remix the default button sizing classes into new ones for easier manipulation. -.btn-group-xs > .btn { .btn-xs(); } -.btn-group-sm > .btn { .btn-sm(); } -.btn-group-lg > .btn { .btn-lg(); } +.btn-group-xs > .btn { &:extend(.btn-xs); } +.btn-group-sm > .btn { &:extend(.btn-sm); } +.btn-group-lg > .btn { &:extend(.btn-lg); } // Split button dropdowns -- 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 --- less/thumbnails.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index 11aa283a0..c428920bc 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -16,7 +16,7 @@ > img, a > img { - .img-responsive(); + &:extend(.img-responsive); margin-left: auto; margin-right: 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 --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index e53365df4..2229d5553 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -21,7 +21,7 @@ // Account for jankitude on images > img, > a > img { - .img-responsive(); + &:extend(.img-responsive); line-height: 1; } } -- 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 --- less/variables.less | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index b06206dfb..4fb811d29 100644 --- a/less/variables.less +++ b/less/variables.less @@ -301,6 +301,26 @@ @grid-float-breakpoint-max: (@grid-float-breakpoint - 1); +//== Container sizes +// +//## Define the maximum width of `.container` for different screen sizes. + +// Small screen / tablet +@container-tablet: ((720px + @grid-gutter-width)); +//** For `@screen-sm-min` and up. +@container-sm: @container-tablet; + +// Medium screen / desktop +@container-desktop: ((940px + @grid-gutter-width)); +//** For `@screen-md-min` and up. +@container-md: @container-desktop; + +// Large screen / wide desktop +@container-large-desktop: ((1140px + @grid-gutter-width)); +//** For `@screen-lg-min` and up. +@container-lg: @container-large-desktop; + + //== Navbar // //## @@ -805,23 +825,3 @@ //** Horizontal offset for forms and lists. @component-offset-horizontal: 180px; - - -//== Container sizes -// -//## Define the maximum width of `.container` for different screen sizes. - -// Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); -//** For `@screen-sm-min` and up. -@container-sm: @container-tablet; - -// Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); -//** For `@screen-md-min` and up. -@container-md: @container-desktop; - -// Large screen / wide desktop -@container-large-desktop: ((1140px + @grid-gutter-width)); -//** For `@screen-lg-min` and up. -@container-lg: @container-large-desktop; -- cgit v1.2.3 From da43f97be170b9c14623d1615721755a9a5959cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:08:32 -0800 Subject: Override iOS search input's extra round corners --- less/forms.less | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index d0189d0cc..d97993318 100644 --- a/less/forms.less +++ b/less/forms.less @@ -150,10 +150,24 @@ output { } } + +// Search inputs in iOS +// +// This overrides the extra rounded corners on search inputs in iOS so that our +// `.form-control` class can properly style them. Note that this cannot simply +// be added to `.form-control` as it's not specific enough. For details, see +// https://github.com/twbs/bootstrap/issues/11586. + +input[type="search"] { + -webkit-appearance: none; +} + + // Special styles for iOS date input // // In Mobile Safari, date inputs require a pixel line-height that matches the // given height of the input. + input[type="date"] { line-height: @input-height-base; } -- 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 --- less/panels.less | 83 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 37 deletions(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index e677d2b29..d00d81241 100644 --- a/less/panels.less +++ b/less/panels.less @@ -18,6 +18,37 @@ &:extend(.clearfix all); } +// Optional heading +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + .border-top-radius((@panel-border-radius - 1)); + + > .dropdown .dropdown-toggle { + color: inherit; + } +} + +// Within heading, strip any `h*` tag of its default margins for spacing. +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: ceil((@font-size-base * 1.125)); + color: inherit; + + > a { + color: inherit; + } +} + +// Optional footer (stays gray in every modifier class) +.panel-footer { + padding: 10px 15px; + background-color: @panel-footer-bg; + border-top: 1px solid @panel-inner-border; + .border-bottom-radius((@panel-border-radius - 1)); +} + // List groups in panels // @@ -126,12 +157,22 @@ > td:last-child { border-right: 0; } - &:first-child > th, - &:first-child > td { - border-top: 0; + } + } + > thead, + > tbody { + > tr:first-child { + > td, + > th { + border-bottom: 0; } - &:last-child > th, - &:last-child > td { + } + } + > tbody, + > tfoot { + > tr:last-child { + > td, + > th { border-bottom: 0; } } @@ -144,38 +185,6 @@ } -// Optional heading -.panel-heading { - padding: 10px 15px; - border-bottom: 1px solid transparent; - .border-top-radius((@panel-border-radius - 1)); - - > .dropdown .dropdown-toggle { - color: inherit; - } -} - -// Within heading, strip any `h*` tag of its default margins for spacing. -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: ceil((@font-size-base * 1.125)); - color: inherit; - - > a { - color: inherit; - } -} - -// Optional footer (stays gray in every modifier class) -.panel-footer { - padding: 10px 15px; - background-color: @panel-footer-bg; - border-top: 1px solid @panel-inner-border; - .border-bottom-radius((@panel-border-radius - 1)); -} - - // Collapsable panels (aka, accordion) // // Wrap a series of panels in `.panel-group` to turn them into an accordion with -- 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 --- less/forms.less | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index d97993318..df83c9d8d 100644 --- a/less/forms.less +++ b/less/forms.less @@ -133,9 +133,14 @@ output { .placeholder(); // Disabled and read-only inputs - // Note: HTML5 says that controls under a fieldset > legend:first-child won't - // be disabled if the fieldset is disabled. Due to implementation difficulty, - // we don't honor that edge case; we style them as disabled anyway. + // + // HTML5 says that controls under a fieldset > legend:first-child won't be + // disabled if the fieldset is disabled. Due to implementation difficulty, we + // don't honor that edge case; we style them as disabled anyway. + // + // Also note that we include `[disabled]` for IE8. All other browsers take the + // `:disabled` selector. + &:disabled, &[disabled], &[readonly], fieldset[disabled] & { @@ -348,6 +353,10 @@ input[type="checkbox"], width: auto; // Prevent labels from stacking above inputs in `.form-group` vertical-align: middle; } + // Input groups need that 100% width though + .input-group > .form-control { + width: 100%; + } .control-label { margin-bottom: 0; -- 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 --- less/mixins.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 7c60f9d67..9643d92a3 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -252,7 +252,6 @@ -webkit-user-select: @select; -moz-user-select: @select; -ms-user-select: @select; // IE10+ - -o-user-select: @select; user-select: @select; } -- 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 --- less/forms.less | 4 ---- 1 file changed, 4 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index df83c9d8d..f607b8509 100644 --- a/less/forms.less +++ b/less/forms.less @@ -137,10 +137,6 @@ output { // HTML5 says that controls under a fieldset > legend:first-child won't be // disabled if the fieldset is disabled. Due to implementation difficulty, we // don't honor that edge case; we style them as disabled anyway. - // - // Also note that we include `[disabled]` for IE8. All other browsers take the - // `:disabled` selector. - &:disabled, &[disabled], &[readonly], fieldset[disabled] & { -- cgit v1.2.3 From 4c163600364243fd710b5e69ef3ba5365b16fc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 8 Feb 2014 22:11:49 +0100 Subject: Fix #12656: add @blockquote-font-size --- less/type.less | 2 +- less/variables.less | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index a55730dfe..ca574edc8 100644 --- a/less/type.less +++ b/less/type.less @@ -233,7 +233,7 @@ abbr[data-original-title] { blockquote { padding: (@line-height-computed / 2) @line-height-computed; margin: 0 0 @line-height-computed; - font-size: (@font-size-base * 1.25); + font-size: @blockquote-font-size; border-left: 5px solid @blockquote-border-color; p, diff --git a/less/variables.less b/less/variables.less index 4fb811d29..729da7cc9 100644 --- a/less/variables.less +++ b/less/variables.less @@ -810,6 +810,8 @@ @headings-small-color: @gray-light; //** Blockquote small color @blockquote-small-color: @gray-light; +//** Blockquote font size +@blockquote-font-size: (@font-size-base * 1.25); //** Blockquote border color @blockquote-border-color: @gray-lighter; //** Page header border color -- cgit v1.2.3