From 8d7700b2b63a8abeb96a6f309610e9e8b4b4792c Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sat, 16 Aug 2014 19:20:13 +0400 Subject: Use single .dropdown-menu --- less/dropdowns.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 3eb7fc05c..b25b6aacd 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -103,9 +103,8 @@ &:focus { color: @dropdown-link-disabled-color; } -} -// Nuke hover/focus effects -.dropdown-menu > .disabled > a { + + // Nuke hover/focus effects &:hover, &:focus { text-decoration: none; -- cgit v1.2.3 From f265137c0517266206055d306ed41e9456878652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 12:20:09 -0700 Subject: Fixes #14440: Remove unused nav variable --- less/variables.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 9670a902f..0d354d16a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -404,8 +404,6 @@ @nav-disabled-link-color: @gray-light; @nav-disabled-link-hover-color: @gray-light; -@nav-open-link-hover-color: #fff; - //== Tabs @nav-tabs-border-color: #ddd; -- cgit v1.2.3 From dfa2759a52e73e720b0cda302a1edb9e2dbebc1f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 12:25:27 -0700 Subject: Fixes #14348: Add visibility styles to collapse and tab content to match .hidden --- less/component-animations.less | 3 ++- less/navs.less | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/component-animations.less b/less/component-animations.less index 9400a0d32..ebfad9e1d 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -17,8 +17,9 @@ .collapse { display: none; + visibility: hidden; - &.in { display: block; } + &.in { display: block; visibility: visibile; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } diff --git a/less/navs.less b/less/navs.less index 98a64307a..8cf81d7e1 100644 --- a/less/navs.less +++ b/less/navs.less @@ -223,9 +223,11 @@ .tab-content { > .tab-pane { display: none; + visibility: hidden; } > .active { display: block; + visibility: visible; } } -- cgit v1.2.3 From 9a39ee90b4fd4d5b9b6f9a6f2c9d5a29ffeafe92 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 13:26:37 -0700 Subject: Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. --- less/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 0d354d16a..d6a972ff6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,12 +369,12 @@ // Inverted navbar // Reset inverted navbar basics -@navbar-inverse-color: lighten(@gray-light, 12%); +@navbar-inverse-color: lighten(@gray-light, 15%); @navbar-inverse-bg: #222; @navbar-inverse-border: darken(@navbar-inverse-bg, 10%); // Inverted navbar links -@navbar-inverse-link-color: @gray-light; +@navbar-inverse-link-color: lighten(@gray-light, 15%); @navbar-inverse-link-hover-color: #fff; @navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; -- cgit v1.2.3 From 56bb92ac4fbf6d5773e91afd205fb8ec09e3a573 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 13:42:45 -0700 Subject: Fixes #14386: Reset font, text, and line-height properties in popovers --- less/popovers.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/popovers.less b/less/popovers.less index bf6af40a0..3abd0598f 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -11,7 +11,11 @@ display: none; max-width: @popover-max-width; padding: 1px; - text-align: left; // Reset given new insertion method + // Reset font and text propertes given new insertion method + font-size: @font-size-base; + font-weight: normal; + line-height: @line-height-base; + text-align: left; background-color: @popover-bg; background-clip: padding-box; border: 1px solid @popover-fallback-border-color; @@ -33,8 +37,6 @@ margin: 0; // reset heading margin padding: 8px 14px; font-size: @font-size-base; - font-weight: normal; - line-height: 18px; background-color: @popover-title-bg; border-bottom: 1px solid darken(@popover-title-bg, 5%); border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0; -- cgit v1.2.3 From 4c15fa86421f6ee276b15d971618bcd906ab6a5d Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Tue, 26 Aug 2014 02:04:34 +0400 Subject: Update print.less from source (html5-boilerplate). Simplyfy table style. --- less/print.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/print.less b/less/print.less index 3655d0395..90c58a366 100644 --- a/less/print.less +++ b/less/print.less @@ -1,15 +1,15 @@ // // Basic print styles // -------------------------------------------------- -// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css +// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css @media print { * { - text-shadow: none !important; - color: #000 !important; // Black prints faster: h5bp.com/s background: transparent !important; + color: #000 !important; // Black prints faster: h5bp.com/s box-shadow: none !important; + text-shadow: none !important; } a, @@ -25,9 +25,10 @@ content: " (" attr(title) ")"; } - // Don't show links for images, or javascript/internal links - a[href^="javascript:"]:after, - a[href^="#"]:after { + // Don't show links that are fragment identifiers, + // or use the `javascript:` pseudo protocol + a[href^="#"]:after, + a[href^="javascript:"]:after { content: ""; } @@ -72,12 +73,6 @@ .navbar { display: none; } - .table { - td, - th { - background-color: #fff !important; - } - } .btn, .dropup > .btn { > .caret { @@ -90,6 +85,11 @@ .table { border-collapse: collapse !important; + + td, + th { + background-color: #fff !important; + } } .table-bordered { th, -- cgit v1.2.3 From a03d269287f39c22fb7d4f5a5edd94293aa0c1ae Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Tue, 26 Aug 2014 02:24:09 +0400 Subject: Less: Remove empty lines and blanks. --- less/dropdowns.less | 1 - less/list-group.less | 2 +- less/mixins/labels.less | 2 +- less/pager.less | 1 - less/popovers.less | 1 - less/print.less | 2 -- less/variables.less | 2 -- 7 files changed, 2 insertions(+), 9 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index b25b6aacd..742c91265 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -211,4 +211,3 @@ } } } - diff --git a/less/list-group.less b/less/list-group.less index 7d857cfd3..1e62d3b94 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -75,7 +75,7 @@ a.list-group-item { background-color: @list-group-disabled-bg; color: @list-group-disabled-color; cursor: not-allowed; - + // Force color to inherit for custom content .list-group-item-heading { color: inherit; diff --git a/less/mixins/labels.less b/less/mixins/labels.less index 6f9e490b8..9f7a67ee3 100644 --- a/less/mixins/labels.less +++ b/less/mixins/labels.less @@ -2,7 +2,7 @@ .label-variant(@color) { background-color: @color; - + &[href] { &:hover, &:focus { diff --git a/less/pager.less b/less/pager.less index 59103f445..73a660d64 100644 --- a/less/pager.less +++ b/less/pager.less @@ -51,5 +51,4 @@ cursor: not-allowed; } } - } diff --git a/less/popovers.less b/less/popovers.less index 3abd0598f..ab720f2fb 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -131,5 +131,4 @@ bottom: -@popover-arrow-width; } } - } diff --git a/less/print.less b/less/print.less index 3655d0395..473f361b9 100644 --- a/less/print.less +++ b/less/print.less @@ -4,7 +4,6 @@ // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css @media print { - * { text-shadow: none !important; color: #000 !important; // Black prints faster: h5bp.com/s @@ -97,5 +96,4 @@ border: 1px solid #ddd !important; } } - } diff --git a/less/variables.less b/less/variables.less index d6a972ff6..5be258be7 100644 --- a/less/variables.less +++ b/less/variables.less @@ -841,5 +841,3 @@ @dl-horizontal-offset: @component-offset-horizontal; //** Horizontal line color. @hr-border: @gray-lighter; - - -- cgit v1.2.3 From 3ce160754cd55540c68156da599c58f779826c3b Mon Sep 17 00:00:00 2001 From: Jaume Alemany Date: Wed, 27 Aug 2014 14:20:49 +0200 Subject: Make `popover-arrow-color` default to `popover-bg` --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 5be258be7..48b983456 100644 --- a/less/variables.less +++ b/less/variables.less @@ -528,7 +528,7 @@ //** Popover arrow width @popover-arrow-width: 10px; //** Popover arrow color -@popover-arrow-color: #fff; +@popover-arrow-color: @popover-bg; //** Popover outer arrow width @popover-arrow-outer-width: (@popover-arrow-width + 1); -- cgit v1.2.3 From 190452a36df91cebb0d9c7c1b5f46693f583db53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Aug 2014 22:40:46 -0700 Subject: typo --- less/component-animations.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/component-animations.less b/less/component-animations.less index ebfad9e1d..0c4cd1983 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -19,7 +19,7 @@ display: none; visibility: hidden; - &.in { display: block; visibility: visibile; } + &.in { display: block; visibility: visible; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } -- cgit v1.2.3 From 0a816e009f5596e4a73afe4380372bf8c16e55cb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Aug 2014 23:01:58 -0700 Subject: Fixes #14337: Round .jumbotron corners within .container and .container-fluid --- less/jumbotron.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 27cd8b81d..55ca42956 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -23,7 +23,8 @@ border-top-color: darken(@jumbotron-bg, 10%); } - .container & { + .container &, + .container-fluid & { border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container } -- cgit v1.2.3 From aa25ce779de9c4c012f7e0b881cddc9719a027cb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Aug 2014 23:17:37 -0700 Subject: Fixes #14329: Fixed list-groups nested inside of collapsing panels, from @apexskier --- less/panels.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 9136cbfdf..00456f357 100644 --- a/less/panels.less +++ b/less/panels.less @@ -56,7 +56,8 @@ // any kind of custom content between the two. .panel { - > .list-group { + > .list-group, + > .panel-collapse > .list-group { margin-bottom: 0; .list-group-item { -- cgit v1.2.3 From 0ec05da0eea03849fc72bed84a2c7fe7be1de1b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Aug 2014 23:31:34 -0700 Subject: Undo the collapse visibility changes since it breaks our collapse plugin --- less/component-animations.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'less') diff --git a/less/component-animations.less b/less/component-animations.less index 0c4cd1983..9400a0d32 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -17,9 +17,8 @@ .collapse { display: none; - visibility: hidden; - &.in { display: block; visibility: visible; } + &.in { display: block; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } -- cgit v1.2.3 From fe19211e4dee35374803788b24b8c44f1bc179f1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Aug 2014 23:34:46 -0700 Subject: Finish reverting #14444 --- less/navs.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 8cf81d7e1..98a64307a 100644 --- a/less/navs.less +++ b/less/navs.less @@ -223,11 +223,9 @@ .tab-content { > .tab-pane { display: none; - visibility: hidden; } > .active { display: block; - visibility: visible; } } -- cgit v1.2.3 From e37e06d73e8823c3e5fc062ae68d9d131c4c2bb4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Sep 2014 12:48:19 -0700 Subject: Fixes #14443: Only transition what needs transitioning for thumbnails to avoid Safari/Chrome render bug --- 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 c428920bc..0713e67d0 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -12,7 +12,7 @@ background-color: @thumbnail-bg; border: 1px solid @thumbnail-border; border-radius: @thumbnail-border-radius; - .transition(all .2s ease-in-out); + .transition(border .2s ease-in-out); > img, a > img { -- cgit v1.2.3 From 5b7a5f84d4255b09778bdc9b3502660cff511a90 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 4 Sep 2014 19:06:01 -0700 Subject: Fixes #14437: Round the corners of table rows in panels as well as the cells --- less/panels.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 00456f357..f41c16869 100644 --- a/less/panels.less +++ b/less/panels.less @@ -115,6 +115,9 @@ > thead:first-child, > tbody:first-child { > tr:first-child { + border-top-left-radius: (@panel-border-radius - 1); + border-top-right-radius: (@panel-border-radius - 1); + td:first-child, th:first-child { border-top-left-radius: (@panel-border-radius - 1); @@ -134,6 +137,9 @@ > tbody:last-child, > tfoot:last-child { > tr:last-child { + border-bottom-left-radius: (@panel-border-radius - 1); + border-bottom-right-radius: (@panel-border-radius - 1); + td:first-child, th:first-child { border-bottom-left-radius: (@panel-border-radius - 1); -- cgit v1.2.3 From 9f5660c3e3b3d392529d07c4f2cfe0aba2abbe89 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 6 Sep 2014 21:25:33 -0700 Subject: Fixes #14545: Avoid strange formatting on vendor prefixing for placeholder --- less/mixins/vendor-prefixes.less | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/mixins/vendor-prefixes.less b/less/mixins/vendor-prefixes.less index e2008c8b2..31f8e2f7a 100644 --- a/less/mixins/vendor-prefixes.less +++ b/less/mixins/vendor-prefixes.less @@ -99,9 +99,12 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { - &::-moz-placeholder { color: @color; // Firefox - opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 - &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ + // Firefox + &::-moz-placeholder { + color: @color; + 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 475152a9a14fe09035a596b71573d7325b23bdaa Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Sun, 7 Sep 2014 22:45:54 +0200 Subject: Properly hide checkbox and radio inputs in button groups `pointer-events: none;` for modern browsers (including IE11+), `clip: rect(1px, 1px, 1px, 1px);` for everything else. Fixes #14137 --- less/button-groups.less | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index c2e2260f0..6092afcd6 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -226,11 +226,14 @@ // Checkbox and radio options // // In order to support the browser's form validation feedback, powered by the -// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot -// use `display: none;` or `visibility: hidden;` as that also hides the popover. +// `required` attribute, we have to "hide" the inputs via `clip`. We cannot use +// `display: none;` or `visibility: hidden;` as that also hides the popover. +// Simply visually hiding the inputs via `opacity` would leave them clickable in +// certain cases which is prevented by using `clip` and `pointer-events`. // This way, we ensure a DOM element is visible to position the popover from. // -// See https://github.com/twbs/bootstrap/pull/12794 for more. +// See https://github.com/twbs/bootstrap/pull/12794 and +// https://github.com/twbs/bootstrap/pull/14559 for more information. [data-toggle="buttons"] { > .btn, @@ -238,8 +241,8 @@ input[type="radio"], input[type="checkbox"] { position: absolute; - z-index: -1; - .opacity(0); + clip: rect(0,0,0,0); + pointer-events: none; } } } -- cgit v1.2.3 From f2783fbf83fc063f85dd89af2d315ae290f7f38b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 8 Sep 2014 10:29:45 -0700 Subject: Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding --- less/jumbotron.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 55ca42956..9d1e29028 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -4,7 +4,7 @@ .jumbotron { - padding: @jumbotron-padding; + padding: @jumbotron-padding (@jumbotron-padding / 2); margin-bottom: @jumbotron-padding; color: @jumbotron-color; background-color: @jumbotron-bg; @@ -33,8 +33,7 @@ } @media screen and (min-width: @screen-sm-min) { - padding-top: (@jumbotron-padding * 1.6); - padding-bottom: (@jumbotron-padding * 1.6); + padding: (@jumbotron-padding * 1.6) 0; .container & { padding-left: (@jumbotron-padding * 2); -- cgit v1.2.3 From c6d7d71549388b071163a36f3cf05cb201c9230c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 8 Sep 2014 10:57:50 -0700 Subject: Fixes #14557: Reset the bottom margin on .form-group:last-child in .navbar-form to prevent extra spacing --- less/navbar.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index c7bdd36cc..8e82888a9 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -299,6 +299,10 @@ .form-group { @media (max-width: @grid-float-breakpoint-max) { margin-bottom: 5px; + + &:last-child { + margin-bottom: 0; + } } } -- cgit v1.2.3 From 0d8f5fffa5a9a287140946b57570a036b9d33b99 Mon Sep 17 00:00:00 2001 From: Marat Abdullin Date: Fri, 5 Sep 2014 21:27:23 +0400 Subject: Variables for large and small input border radiuses --- less/forms.less | 4 ++-- less/variables.less | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 6077ae7a3..aefc0dea5 100644 --- a/less/forms.less +++ b/less/forms.less @@ -325,12 +325,12 @@ input[type="checkbox"] { .input-sm, .form-group-sm .form-control { - .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); + .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); } .input-lg, .form-group-lg .form-control { - .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); + .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); } diff --git a/less/variables.less b/less/variables.less index 48b983456..5fc82df6e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -182,8 +182,15 @@ @input-color: @gray; //** `` border color @input-border: #ccc; -//** `` border radius + +// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4 +//** Default `.form-control` border radius @input-border-radius: @border-radius-base; +//** Large `.form-control` border radius +@input-border-radius-large: @border-radius-large; +//** Small `.form-control` border radius +@input-border-radius-small: @border-radius-small; + //** Border color for inputs on focus @input-border-focus: #66afe9; -- cgit v1.2.3