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

Fix disabled ‹select› decoration #959

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix disabled ‹select› decoration #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64b4dec
Add arrow-down-disabled _images
janbrasna Jul 26, 2024
5975064
Update _forms select disabled arrow
janbrasna Jul 26, 2024
2a0b115
Add form color vars
janbrasna Jul 29, 2024
295fc6d
Streamline _forms colors
janbrasna Jul 29, 2024
35b4f7a
Use default select caret
janbrasna Jul 29, 2024
931ca8b
Skip adding new disabled caret to _images
janbrasna Jul 29, 2024
543c49f
Update CHANGELOG
janbrasna Jul 29, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
## Features
* **js:** Migrate tests from Karma to Jasmine browser runner (#899)

## Bug Fixes
* **css:** Form select elements don't match styling when disabled (#885)

# 19.2.0

## Features
Expand Down
35 changes: 16 additions & 19 deletions assets/sass/protocol/base/elements/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ input[type='url'] {
@include forms.form-input;

&::placeholder {
color: $color-marketing-gray-70;
color: forms.$form-inactive;
}

&:hover {
Expand All @@ -142,7 +142,7 @@ input[type='url'] {

&:focus {
outline: none;
border-color: $color-link;
border-color: forms.$field-border-color-focus;
box-shadow: forms.$field-focus-ring;

.mzp-t-dark & {
Expand All @@ -167,11 +167,11 @@ input[type='url'] {
&:disabled,
&[aria-disabled='true'] {
background: $color-marketing-gray-10;
border-color: $color-marketing-gray-30;
color: $color-marketing-gray-70;
border-color: forms.$field-border-color-disabled;
color: forms.$form-inactive;

&:focus {
border-color: $color-marketing-gray-80;
border-color: forms.$field-border-color-disabled-focus;
}
}
}
Expand Down Expand Up @@ -255,7 +255,7 @@ input[type='file'] {
}

&:focus {
border-color: $color-link;
border-color: forms.$field-border-color-focus;
box-shadow: forms.$field-focus-ring;
outline: none;
}
Expand All @@ -276,12 +276,12 @@ input[type='file'] {

&:disabled,
&[aria-disabled='true'] {
background: $color-marketing-gray-30;
border-color: $color-marketing-gray-30;
color: $color-marketing-gray-70;
background: forms.$field-border-color-disabled;
border-color: forms.$field-border-color-disabled;
color: forms.$form-inactive;

&:focus {
border-color: $color-marketing-gray-80;
border-color: forms.$field-border-color-disabled-focus;
}
}
}
Expand Down Expand Up @@ -331,7 +331,7 @@ select {
}

&:focus {
border-color: $color-link;
border-color: forms.$field-border-color-focus;
background-image: $url-image-arrow-down-link, forms.$select-bg;
box-shadow: forms.$field-focus-ring;
color: #222;
Expand All @@ -358,19 +358,16 @@ select {

&:disabled,
&[aria-disabled='true'] {
/* stylelint-disable declaration-colon-newline-after */
background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23007CB2%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E'),
forms.$select-bg-disabled;
/* stylelint-enable declaration-colon-newline-after */
border-color: $color-marketing-gray-30;
color: $color-marketing-gray-70;
background-image: $url-image-arrow-down-form, forms.$select-bg-disabled;
border-color: forms.$field-border-color-disabled;
color: forms.$form-inactive;

&:hover {
border-color: $color-marketing-gray-30;
border-color: forms.$field-border-color-disabled;
}

&:focus {
border-color: $color-marketing-gray-80;
border-color: forms.$field-border-color-disabled-focus;
}
}

Expand Down
3 changes: 3 additions & 0 deletions assets/sass/protocol/includes/forms/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@
// colors
$form-red: #d70022;
$form-text: $body-text-color-secondary;
$form-inactive: $color-marketing-gray-70;

// fields
$field-border-color: $color-marketing-gray-50;
$field-border-color-hover: $color-link-hover;
$field-border-color-focus: $color-link;
$field-border-color-error: $form-red;
$field-border-color-error-hover: $color-red-80;
$field-border-color-disabled: $color-marketing-gray-30;
$field-border-color-disabled-focus: $color-marketing-gray-80;
$field-border: 2px solid $field-border-color;
$field-min-width: $content-xs - ($layout-xs * 2);
$field-border-radius: $border-radius-sm;
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/protocol/includes/mixins/_images.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $svg-expand-white: '<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http:
$svg-expand-black: '<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke="#000" stroke-width="2" fill="none" fill-rule="evenodd" stroke-linecap="round"><path d="M12 3.515v16.97M3.515 12h16.97"/></g></svg>';

// https://github.com/mozilla/protocol-assets/blob/master/icons/arrow-down.svg
$svg-arrow-down-form: '<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><polyline stroke="#9595a3" stroke-width="2" points="5 9 12 16 19 9"></polyline></g></svg>';
$svg-arrow-down-form: '<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><polyline stroke="#9595a2" stroke-width="2" points="5 9 12 16 19 9"></polyline></g></svg>';
$svg-arrow-down-link: '<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><polyline stroke="#0060df" stroke-width="2" points="5 9 12 16 19 9"></polyline></g></svg>';
$svg-arrow-down-link-hover: '<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><polyline stroke="#0250bb" stroke-width="2" points="5 9 12 16 19 9"></polyline></g></svg>';

Expand Down