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.

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

Fix (form range): change colors for hover and active states #1605

Merged
merged 28 commits into from
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3a79033
Fix (form range): change colors for hover and active states
isabellechanclou Nov 9, 2022
5f1e17f
Fixes after review
isabellechanclou Nov 10, 2022
44aa980
Update site/content/docs/5.2/migration.md
julien-deramond Nov 14, 2022
7473cdc
Fixes after review
isabellechanclou Nov 22, 2022
e84cd63
Fix focus regression
isabellechanclou Nov 23, 2022
25ef2f1
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
isabellechanclou Nov 23, 2022
1204afe
Fixes after 2nd review
isabellechanclou Nov 25, 2022
e4bb96f
Fixes after 3rd review
isabellechanclou Dec 1, 2022
88bde8c
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
isabellechanclou Dec 1, 2022
d70d829
Fixes after review
isabellechanclou Dec 13, 2022
25c3b16
Add new sass variables to migration page
isabellechanclou Dec 13, 2022
bb66b45
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
julien-deramond Dec 26, 2022
45cc2ab
Fix bundlewatch
julien-deramond Dec 26, 2022
8901276
Minor modif migration guide note
julien-deramond Dec 26, 2022
7d97f04
Minor modif migration guide note
julien-deramond Dec 26, 2022
6f0fe51
Update scss/_variables.scss
julien-deramond Dec 26, 2022
d895736
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
louismaximepiton Mar 1, 2023
78c063a
.
louismaximepiton Mar 1, 2023
5f9cd37
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
louismaximepiton Mar 9, 2023
d0e5499
Fix
louismaximepiton Mar 9, 2023
bb9b064
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
louismaximepiton Mar 31, 2023
6794a07
Avoid deprecation of `$form-range-thumb-active-border`
julien-deramond Apr 3, 2023
e37e2b9
Add instead of in Boosted mod comment
julien-deramond Apr 3, 2023
3273da0
Use `--bs-highlight-bg` instead of `--bs-link-color`
julien-deramond Apr 4, 2023
519ce5f
Add a dark variant in the docs
julien-deramond Apr 4, 2023
5991971
Fix npm run docs
julien-deramond Apr 4, 2023
d6ab0b0
Merge branch 'main' into main-ic-fix-form-range-interactive-colors
julien-deramond Apr 4, 2023
e4e9393
.
julien-deramond Apr 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion js/dist/util/template-factory.js.map

This file was deleted.

8 changes: 6 additions & 2 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1159,8 +1159,12 @@ $form-range-thumb-border-radius: 50% !default;
$form-range-thumb-box-shadow: 0 .1rem .25rem rgba($black, .1) !default;
$form-range-thumb-focus-box-shadow: null !default;
$form-range-thumb-focus-box-shadow-width: $input-focus-width !default; // For focus box shadow issue in Edge
$form-range-thumb-active-bg: null !default;
$form-range-thumb-active-border: $component-active-bg !default; // Boosted mod
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
$form-range-thumb-hover-bg: $black !default; // Boosted mod
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
$form-range-thumb-active-bg: $primary !default; // Boosted mod
// fusv-disable
$form-range-thumb-active-border: $component-active-bg !default; // Boosted mod / Deprecated in v5.2.2
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
// fusv-enable
$form-range-thumb-active-border-color: $primary !default; // Boosted mod
$form-range-thumb-disabled-bg: $gray-500 !default;
$form-range-thumb-transition: background-color $transition-duration $transition-timing, border-color $transition-duration $transition-timing, box-shadow $transition-duration $transition-timing !default;
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
// scss-docs-end form-range-variables
Expand Down
20 changes: 17 additions & 3 deletions scss/forms/_form-range.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
// Pseudo-elements must be split across multiple rulesets to have an effect.
// No box-shadow() mixin for focus accessibility.
&::-webkit-slider-thumb {
border-color: $form-range-thumb-active-border;
border-color: $form-range-thumb-active-border-color;
box-shadow: $form-range-thumb-focus-box-shadow;
}
&::-moz-range-thumb {
border-color: $form-range-thumb-active-border;
border-color: $form-range-thumb-active-border-color;
box-shadow: $form-range-thumb-focus-box-shadow;
}
// End mod
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
}

&::-moz-focus-outer {
Expand All @@ -43,8 +42,15 @@
@include transition($form-range-thumb-transition);
appearance: none;

// Boosted mod
&:hover {
@include gradient-bg($form-range-thumb-hover-bg);
}
// End mod

&:active {
cursor: grabbing; // Boosted mod
border-color: $form-range-thumb-active-border-color; // Boosted mod
@include gradient-bg($form-range-thumb-active-bg);
}
}
Expand All @@ -71,8 +77,16 @@
@include transition($form-range-thumb-transition);
appearance: none;

// Boosted mod
&:hover {
border: $form-range-thumb-border;
@include gradient-bg($form-range-thumb-hover-bg);
}
// End mod

&:active {
cursor: grabbing; // Boosted mod
border-color: $form-range-thumb-active-border-color; // Boosted mod
@include gradient-bg($form-range-thumb-active-bg);
}
}
Expand Down
10 changes: 10 additions & 0 deletions site/content/docs/5.2/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ If you need more details about the changes, please refer to the [v5.2.2 release]

- `@mixin button-size()` has a new interface including a new optional parameter for button letter spacing.

<!-- - <span class="badge bg-danger">Breaking</span> `$form-range-thumb-active-border` is now deprecated and will be removed in V5.3.0. It has been replaced by `$form-range-thumb-active-border-color`. -->

- <details class="mb-2">
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
<summary><span class="badge bg-danger">Breaking</span> Sass variables:</summary>
<ul>
<li><code>$form-range-thumb-active-border</code> is now deprecated. It has been replaced by <code>$form-range-thumb-active-border-color</code> and will be removed in V5.3.0</li>
</ul>
</details>

- <details class="mb-2">
<summary><span class="badge bg-success">New</span> CSS variables:</summary>
<ul>
Expand All @@ -63,6 +72,7 @@ If you need more details about the changes, please refer to the [v5.2.2 release]
<li><code>$btn-letter-spacing-lg</code></li>
<li><code>$btn-letter-spacing-sm</code></li>
<li><code>$form-feedback-line-height</code></li>
<li><code>$form-range-thumb-active-border-color</code></li>
</ul>
</details>

Expand Down