From db04008d613194d7483fb9aebd51d60e6c00b7c8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Sep 2020 13:11:56 -0700 Subject: [PATCH 1/4] Backport Reboot's th updates Manually backports #30781 to v4. --- scss/_reboot.scss | 10 +++++++--- scss/_variables.scss | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 505df6fdf2b8..6f73466d3b75 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -278,10 +278,14 @@ caption { caption-side: bottom; } +// 1. Removes font-weight bold by inheriting +// 2. Matches default `` alignment by inheriting `text-align`. +// 3. Fix alignment for Safari + th { - // Matches default `` alignment by inheriting from the ``, or the - // closest parent with a set `text-align`. - text-align: inherit; + font-weight: $table-th-font-weight; // 1 + text-align: inherit; // 2 + text-align: -webkit-match-parent; // 3 } diff --git a/scss/_variables.scss b/scss/_variables.scss index fb9b7cd609c1..d7171e5a4bcf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -363,6 +363,7 @@ $table-border-color: $border-color !default; $table-head-bg: $gray-200 !default; $table-head-color: $gray-700 !default; +$table-th-font-weight: null !default; $table-dark-color: $white !default; $table-dark-bg: $gray-800 !default; From 647406c292b1465e9da304124cbc44a43f3e7fa0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Sep 2020 13:25:50 -0700 Subject: [PATCH 2/4] Backport color-adjust for v4 Keeps checkboxes, radios, and switches with their intended design when printing. Backports #29714 --- scss/_custom-forms.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 2d1228efe53e..0057b330f1c6 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -13,6 +13,7 @@ display: block; min-height: $font-size-base * $line-height-base; padding-left: $custom-control-gutter + $custom-control-indicator-size; + color-adjust: exact; // Keep themed appearance for print } .custom-control-inline { From 010084c7205b324490e99eb78a46572a251a1206 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Sep 2020 12:53:40 -0700 Subject: [PATCH 3/4] Backport versions update from #31754 and reverse order of versions to match v5 --- site/docs/versions.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/site/docs/versions.html b/site/docs/versions.html index 4f8f4ea3ac84..085bdb813343 100644 --- a/site/docs/versions.html +++ b/site/docs/versions.html @@ -5,8 +5,9 @@ ---
-{% for release in site.data.docs-versions %} -
+{% assign releases = site.data.docs-versions | reverse %} +{% for release in releases %} +

{{ release.group }}

{{ release.description }}

{% assign versions = release.versions | reverse %} From 88980659712653e9d9a00bf370e52f71babe9683 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 4 Oct 2020 15:37:46 -0700 Subject: [PATCH 4/4] Update .text-break for wider browser support --- scss/utilities/_text.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index 5d0f1c845f8d..3a9f83edf016 100644 --- a/scss/utilities/_text.scss +++ b/scss/utilities/_text.scss @@ -63,8 +63,8 @@ .text-decoration-none { text-decoration: none !important; } .text-break { - word-break: break-word !important; // IE & < Edge 18 - overflow-wrap: break-word !important; + word-break: break-word !important; // Deprecated, but avoids issues with flex containers + word-wrap: break-word !important; // Used instead of `overflow-wrap` for IE & Edge Legacy } // Reset