Skip to content

Commit 736c95b

Browse files
authored
Merge pull request #2989 from tvdeyen/tackle-sass-deprecations
Tackle Sass deprecation with mixed declarations
2 parents 97b7584 + 893db89 commit 736c95b

File tree

7 files changed

+38
-31
lines changed

7 files changed

+38
-31
lines changed

app/assets/builds/alchemy/admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/admin.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/stylesheets/alchemy/admin/buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ button,
22
input[type="submit"],
33
a.button,
44
input.button {
5-
@include button-defaults;
65
position: relative;
6+
@include button-defaults;
77

88
&.secondary {
99
background-color: $secondary-button-bg-color;

app/assets/stylesheets/alchemy/admin/resource_info.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.resource_info {
22
.value {
3-
@include clearfix;
43
position: relative;
4+
@include clearfix;
55

66
> label {
77
@include form-label;

app/assets/stylesheets/alchemy/admin/selects.scss

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,21 @@ select {
1111
$color: $form-field-text-color,
1212
$margin: 0
1313
);
14-
height: $form-field-height;
15-
max-width: 100%;
16-
width: auto;
17-
font-weight: normal;
18-
vertical-align: middle;
19-
20-
background-image: var(
21-
--select-background-image,
22-
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='hsla(224deg, 23%, 26%, 0.75)' viewBox='0 0 24 24'%3E%3Cpath d='M11.9997 13.1714L16.9495 8.22168L18.3637 9.63589L11.9997 15.9999L5.63574 9.63589L7.04996 8.22168L11.9997 13.1714Z'%3E%3C/path%3E%3C/svg%3E")
23-
);
24-
background-position: right 0.75em center;
25-
background-repeat: no-repeat;
26-
background-size: 1em;
14+
15+
& {
16+
height: $form-field-height;
17+
max-width: 100%;
18+
width: auto;
19+
font-weight: normal;
20+
vertical-align: middle;
21+
background-image: var(
22+
--select-background-image,
23+
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='hsla(224deg, 23%, 26%, 0.75)' viewBox='0 0 24 24'%3E%3Cpath d='M11.9997 13.1714L16.9495 8.22168L18.3637 9.63589L11.9997 15.9999L5.63574 9.63589L7.04996 8.22168L11.9997 13.1714Z'%3E%3C/path%3E%3C/svg%3E")
24+
);
25+
background-position: right 0.75em center;
26+
background-repeat: no-repeat;
27+
background-size: 1em;
28+
}
2729

2830
&.tiny {
2931
padding-right: 0.6em;
@@ -53,12 +55,15 @@ select {
5355
$color: $form-field-text-color,
5456
$margin: 0
5557
);
56-
background-image: none;
57-
display: flex;
58-
gap: var(--spacing-2);
59-
align-items: center;
60-
font-weight: normal;
61-
text-align: left;
58+
59+
& {
60+
background-image: none;
61+
display: flex;
62+
gap: var(--spacing-2);
63+
align-items: center;
64+
font-weight: normal;
65+
text-align: left;
66+
}
6267

6368
.select2-chosen {
6469
flex-grow: 1;

app/assets/stylesheets/alchemy/admin/sitemap.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
margin: var(--spacing-3) 0;
106106
position: relative;
107107
transition: background-color $transition-duration;
108+
--sitemap-status-width: calc(
109+
var(--sitemap-status-width-base) * var(--sitemap-status-length)
110+
);
108111

109112
&.highlight {
110113
background-color: $sitemap-highlight-color;
@@ -122,10 +125,6 @@
122125
&:has(.page_infos :nth-child(3)) {
123126
--sitemap-status-length: 3;
124127
}
125-
126-
--sitemap-status-width: calc(
127-
var(--sitemap-status-width-base) * var(--sitemap-status-length)
128-
);
129128
}
130129

131130
.sitemap_left_images {

app/assets/stylesheets/alchemy/admin/tags.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@
3636

3737
a {
3838
@include tag-base;
39-
text-decoration: none;
40-
display: flex;
39+
40+
& {
41+
display: flex;
42+
text-decoration: none;
43+
}
4144
}
4245

4346
&:hover {
@@ -59,12 +62,12 @@
5962
}
6063

6164
.tag {
65+
pointer-events: none;
66+
font-size: $small-font-size;
6267
@include tag-base(
6368
$margin: var(--spacing-0) 0,
6469
$padding: var(--spacing-1) var(--spacing-2) var(--spacing-1)
6570
);
66-
pointer-events: none;
67-
font-size: $small-font-size;
6871
}
6972

7073
.tags .list .tag {

0 commit comments

Comments
 (0)