Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc v4 backports #31793

Merged
merged 4 commits into from Oct 5, 2020
Merged

Misc v4 backports #31793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db04008
Backport Reboot's th updates
mdo Sep 29, 2020
647406c
Backport color-adjust for v4
mdo Sep 29, 2020
010084c
Backport versions update from #31754 and reverse order of versions to…
mdo Sep 30, 2020
8898065
Update .text-break for wider browser support
mdo Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions scss/_custom-forms.scss
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
10 changes: 7 additions & 3 deletions scss/_reboot.scss
View file
Open in desktop
Expand Up @@ -278,10 +278,14 @@ caption {
caption-side: bottom;
}

// 1. Removes font-weight bold by inheriting
// 2. Matches default `<td>` alignment by inheriting `text-align`.
// 3. Fix alignment for Safari

th {
// Matches default `<td>` alignment by inheriting from the `<body>`, 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
}


Expand Down
1 change: 1 addition & 0 deletions scss/_variables.scss
View file
Open in desktop
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions scss/utilities/_text.scss
View file
Open in desktop
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions site/docs/versions.html
View file
Open in desktop
Expand Up @@ -5,8 +5,9 @@
---

<div class="row">
{% for release in site.data.docs-versions %}
<div class="col-md">
{% assign releases = site.data.docs-versions | reverse %}
mdo marked this conversation as resolved.
Show resolved Hide resolved
{% for release in releases %}
<div class="col-md-6 col-lg-4 col-xl mb-4">
<h2>{{ release.group }}</h2>
<p>{{ release.description }}</p>
{% assign versions = release.versions | reverse %}
Expand Down