From b931070bd7becb0c9ab67d323ab90432a0bfafc1 Mon Sep 17 00:00:00 2001 From: Andres Galante Date: Tue, 31 Oct 2017 09:04:26 -0300 Subject: [PATCH 1/8] changes list-inline-padding from 5px to .5rem --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index a8e4392ab6..69cd5d34e7 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -280,7 +280,7 @@ $dt-font-weight: $font-weight-bold !default; $kbd-box-shadow: inset 0 -.1rem 0 rgba($black, .25) !default; $nested-kbd-font-weight: $font-weight-bold !default; -$list-inline-padding: 5px !default; +$list-inline-padding: .5rem !default; $mark-bg: #fcf8e3 !default; From 058123440fbfcdf06e48b84ed855e100ffda1f3f Mon Sep 17 00:00:00 2001 From: Andres Galante Date: Mon, 6 Nov 2017 14:29:12 -0300 Subject: [PATCH 2/8] Convert px values to rem on tooltip variables (#23468) * converts px valures to rem on tooltip variables * keep as px to match popover changes --- scss/_tooltip.scss | 8 ++++---- scss/_variables.scss | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss index 7b5db1cf2a..b03139c911 100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@ -34,7 +34,7 @@ } .arrow::before { - margin-left: -($tooltip-arrow-width - 2); + margin-left: -$tooltip-arrow-width; content: ""; border-width: $tooltip-arrow-width $tooltip-arrow-width 0; border-top-color: $tooltip-arrow-color; @@ -47,7 +47,7 @@ } .arrow::before { - margin-top: -($tooltip-arrow-width - 2); + margin-top: -$tooltip-arrow-width; content: ""; border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0; border-right-color: $tooltip-arrow-color; @@ -60,7 +60,7 @@ } .arrow::before { - margin-left: -($tooltip-arrow-width - 2); + margin-left: -$tooltip-arrow-width; content: ""; border-width: 0 $tooltip-arrow-width $tooltip-arrow-width; border-bottom-color: $tooltip-arrow-color; @@ -74,7 +74,7 @@ .arrow::before { right: 0; - margin-top: -($tooltip-arrow-width - 2); + margin-top: -($tooltip-arrow-width); content: ""; border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width; border-left-color: $tooltip-arrow-color; diff --git a/scss/_variables.scss b/scss/_variables.scss index 69cd5d34e7..a1f31b9b03 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -665,18 +665,17 @@ $card-columns-margin: $card-spacer-y !default; // Tooltips -$tooltip-max-width: 200px !default; -$tooltip-color: $white !default; -$tooltip-bg: $black !default; -$tooltip-opacity: .9 !default; -$tooltip-padding-y: 3px !default; -$tooltip-padding-x: 8px !default; -$tooltip-margin: 0 !default; +$tooltip-max-width: 200px !default; +$tooltip-color: $white !default; +$tooltip-bg: $black !default; +$tooltip-opacity: .9 !default; +$tooltip-padding-y: .25rem !default; +$tooltip-padding-x: .5rem !default; +$tooltip-margin: 0 !default; - -$tooltip-arrow-width: 5px !default; -$tooltip-arrow-height: 5px !default; -$tooltip-arrow-color: $tooltip-bg !default; +$tooltip-arrow-width: .4rem !default; +$tooltip-arrow-height: $tooltip-arrow-width !default; +$tooltip-arrow-color: $tooltip-bg !default; // Popovers From bfbf24e7a567229b73032894a6641f66f08c5b98 Mon Sep 17 00:00:00 2001 From: Gijs Boddeus Date: Mon, 6 Nov 2017 18:57:25 +0100 Subject: [PATCH 3/8] fixing label cutoff at 0% (#24544) --- scss/_progress.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_progress.scss b/scss/_progress.scss index efbb440340..56e5308cc6 100644 --- a/scss/_progress.scss +++ b/scss/_progress.scss @@ -14,9 +14,10 @@ .progress-bar { display: flex; - align-items: center; + flex-direction: column; justify-content: center; color: $progress-bar-color; + text-align: center; background-color: $progress-bar-bg; } From a8aaccbd4dfccf1ad277197c80721bd0761f57d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Nov 2017 12:02:42 -0800 Subject: [PATCH 4/8] Restore .progress-bar transition (#24694) Unintentionally removed in #22703. Fixes #24643. --- scss/_progress.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_progress.scss b/scss/_progress.scss index 56e5308cc6..cd130c66ef 100644 --- a/scss/_progress.scss +++ b/scss/_progress.scss @@ -19,6 +19,7 @@ color: $progress-bar-color; text-align: center; background-color: $progress-bar-bg; + @include transition($progress-bar-transition); } .progress-bar-striped { From bb53b32585aa3388a0364d7cfce2492654c95438 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Nov 2017 12:04:56 -0800 Subject: [PATCH 5/8] fixes #24553: override border-color on focus of custom select with form validation (#24695) --- scss/mixins/_forms.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 6c171aae8c..cea803de33 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -57,6 +57,7 @@ border-color: $color; &:focus { + border-color: $color; box-shadow: 0 0 0 $input-focus-width rgba($color, .25); } From 1524837af2aa7c78bbf4b91585237fa5fee75608 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 6 Nov 2017 22:11:25 +0200 Subject: [PATCH 6/8] getting-started.md: Redirect from `/getting-started/` too. (#24669) --- docs/4.0/getting-started/introduction.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/4.0/getting-started/introduction.md b/docs/4.0/getting-started/introduction.md index ec3c4033c6..604c3f5258 100644 --- a/docs/4.0/getting-started/introduction.md +++ b/docs/4.0/getting-started/introduction.md @@ -4,9 +4,10 @@ title: Introduction description: Get started with Bootstrap, the world's most popular framework for building responsive, mobile-first sites, with the Bootstrap CDN and a template starter page. group: getting-started redirect_from: - - /docs/4.0/getting-started/ - - /docs/4.0/ - /docs/ + - /docs/4.0/ + - /docs/4.0/getting-started/ + - /docs/getting-started/ toc: true --- From e2c15da96781c1fba011198267c551cbedd001d9 Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Mon, 6 Nov 2017 13:34:42 -0800 Subject: [PATCH 7/8] Move hardcoded opacity value in `.btn:disabled` to variable `$btn-disabled-opacity` (#24680) --- scss/_buttons.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 16d879cd85..749f96a7cc 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -28,7 +28,7 @@ // Disabled comes first so active can properly restyle &.disabled, &:disabled { - opacity: .65; + opacity: $btn-disabled-opacity; @include box-shadow(none); } diff --git a/scss/_variables.scss b/scss/_variables.scss index a1f31b9b03..c12001a27d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -357,6 +357,7 @@ $btn-font-weight: $font-weight-normal !default; $btn-box-shadow: inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default; $btn-focus-width: $input-btn-focus-width !default; $btn-focus-box-shadow: $input-btn-focus-box-shadow !default; +$btn-disabled-opacity: .65 !default; $btn-active-box-shadow: inset 0 3px 5px rgba($black, .125) !default; $btn-link-disabled-color: $gray-600 !default; From c2a7a2c41d0409d70d64e7848f449fe3dac8bae0 Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Mon, 6 Nov 2017 13:35:52 -0800 Subject: [PATCH 8/8] Nav Tabs use single variable to style `$nav-tabs-link-hover-border-color` and `$nav-tabs-link-active-border-color` (#24639) --- scss/_nav.scss | 4 ++-- scss/_variables.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 14e76c9acc..fc82161e34 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -41,7 +41,7 @@ @include border-top-radius($nav-tabs-border-radius); @include hover-focus { - border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; + border-color: $nav-tabs-link-hover-border-color; } &.disabled { @@ -55,7 +55,7 @@ .nav-item.show .nav-link { color: $nav-tabs-link-active-color; background-color: $nav-tabs-link-active-bg; - border-color: $nav-tabs-link-active-border-color $nav-tabs-link-active-border-color $nav-tabs-link-active-bg; + border-color: $nav-tabs-link-active-border-color; } .dropdown-menu { diff --git a/scss/_variables.scss b/scss/_variables.scss index c12001a27d..99a5179a81 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -570,10 +570,10 @@ $nav-link-disabled-color: $gray-600 !default; $nav-tabs-border-color: $gray-300 !default; $nav-tabs-border-width: $border-width !default; $nav-tabs-border-radius: $border-radius !default; -$nav-tabs-link-hover-border-color: $gray-200 !default; +$nav-tabs-link-hover-border-color: $gray-200 $gray-200 $nav-tabs-border-color !default; $nav-tabs-link-active-color: $gray-700 !default; $nav-tabs-link-active-bg: $body-bg !default; -$nav-tabs-link-active-border-color: $gray-300 !default; +$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default; $nav-pills-border-radius: $border-radius !default; $nav-pills-link-active-color: $component-active-color !default;