Skip to content

Upgrade Sass to 1.105.2 #1186

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

Merged
stephaniehobson merged 1 commit into from
Oct 29, 2026
Merged

Upgrade Sass to 1.105.2 #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Introducing theme variables! CSS variables beginning with `--theme-` will adjust
### Sass

* Fixed the remaining `mixed-decls` warnings raised by newer Sass versions (Fix #998)
* Un-pinned the `sass` dependency (was pinned to `1.91.0`, now `^1.91.0`)
* Un-pinned the `sass` dependency (was pinned to `1.91.0`, now `^1.105.2`)

### Typography

Expand Down
38 changes: 16 additions & 22 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 @@ -46,11 +46,8 @@ textarea {
@include text-body-md;
@include font-base;

/* stylelint-disable-next-line no-duplicate-selectors, block-no-redundant-nested-style-rules */
& {
// needs to come after @include text-body-md to over-ride value
line-height: var(--theme-button-line-height);
}
// needs to come after @include text-body-md to over-ride value
line-height: var(--theme-button-line-height);
}

button,
Expand Down Expand Up @@ -300,23 +297,20 @@ input[type='file'] {
select {
@include forms.form-input;

/* stylelint-disable-next-line no-duplicate-selectors, block-no-redundant-nested-style-rules */
& {
// needs to come after @include forms.form-input to over-ride its padding
appearance: none;
box-sizing: border-box;
background-image: $url-image-caret-down-form, forms.$select-bg;
background-position: right 8px top 50%;
background-repeat: no-repeat, repeat;
background-size: 1em auto, 100%;
display: block;
font-weight: normal;
max-width: 100%;
min-width: forms.$field-min-width;
padding-block: forms.$field-padding;
padding-inline: forms.$field-padding forms.$symbol-spacing;
text-overflow: ellipsis;
}
// needs to come after @include forms.form-input to over-ride its padding
appearance: none;
box-sizing: border-box;
background-image: $url-image-caret-down-form, forms.$select-bg;
background-position: right 8px top 50%;
background-repeat: no-repeat, repeat;
background-size: 1em auto, 100%;
display: block;
font-weight: normal;
max-width: 100%;
min-width: forms.$field-min-width;
padding-block: forms.$field-padding;
padding-inline: forms.$field-padding forms.$symbol-spacing;
text-overflow: ellipsis;

[dir='rtl'] & {
background-position: left 8px top 50%;
Expand Down
7 changes: 2 additions & 5 deletions assets/sass/protocol/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,8 @@
@include font-mozilla-text;
text-align: start;

/* stylelint-disable-next-line no-duplicate-selectors, block-no-redundant-nested-style-rules */
& {
// needs to come after @include footer-line to over-ride value
border: 0;
}
// needs to come after @include footer-line to over-ride value
border: 0;
}

& button {
Expand Down
6 changes: 2 additions & 4 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 @@ -91,10 +91,8 @@ $line-height-shim: 0.15em; // two elements with text appear to have more space b
@include text-body-md;
@include font-base;

/* stylelint-disable-next-line no-duplicate-selectors, block-no-redundant-nested-style-rules */
& { // needs to come after @include text-body-md to over-ride value
line-height: var(--theme-button-line-height);
}
// needs to come after @include text-body-md to over-ride value
line-height: var(--theme-button-line-height);
}

@mixin form-msg() {
Expand Down
Loading
Loading