Skip to content

Commit 5bbce39

Browse files
committed
[Frame][ContextualSaveBar] Consolidate se23 styles and logic
1 parent 3a19bb9 commit 5bbce39

File tree

3 files changed

+21
-42
lines changed

3 files changed

+21
-42
lines changed

polaris-react/src/components/Frame/components/ContextualSaveBar/ContextualSaveBar.scss

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,28 @@
7171
flex-direction: row;
7272
gap: var(--p-space-2);
7373

74-
#{$se23} & [class*='Polaris-Icon__Svg'],
75-
#{$se23} & [class*='Icon-Svg'] {
74+
// stylelint-disable -- Icon overrides specific to Contextual Save Bar
75+
& [class*='Polaris-Icon__Svg'],
76+
& [class*='Icon-Svg'] {
7677
fill: var(--p-color-text-inverse);
7778
}
7879
}
7980

8081
.ActionContainer {
8182
flex-shrink: 0;
8283

83-
// Button overrides specific to Contextual Save Bar
84-
/* stylelint-disable -- summer edition overrides */
85-
#{$se23} & [class*='Polaris-Button--primary'],
86-
#{$se23} & [class*='Button-primary'] {
84+
& [class*='Polaris-Button--primary'],
85+
& [class*='Button-primary'] {
8786
--pc-color-text: rgba(48, 48, 48, 1);
8887
--pc-button-text: var(--pc-color-text);
8988
--pc-button-color: rgba(255, 255, 255, 1);
9089
--pc-button-color-hover: rgba(250, 250, 250, 1);
9190
--pc-button-color-active: rgba(247, 247, 247, 1);
9291
--pc-button-color-depressed: rgba(247, 247, 247, 1);
93-
--pc-button-color-disabled: rgba(255, 255, 255, 0.2);
94-
--pc-button-shadow-inset: 0px 2px 1px 0px rgba(26, 26, 26, 0.2) inset, 1px 0px 1px 0px rgba(26, 26, 26, 0.12) inset, -1px 0px 1px 0px rgba(26, 26, 26, 0.12) inset;
92+
--pc-button-color-disabled: rgba(255, 255, 255, 0.2);
93+
--pc-button-shadow-inset: 0px 2px 1px 0px rgba(26, 26, 26, 0.2) inset,
94+
1px 0px 1px 0px rgba(26, 26, 26, 0.12) inset,
95+
-1px 0px 1px 0px rgba(26, 26, 26, 0.12) inset;
9596

9697
&::before {
9798
top: 0;
@@ -115,21 +116,21 @@
115116
}
116117

117118
&[class*='Polaris-Button--disabled'],
118-
&[class*='Button-disabled']{
119+
&[class*='Button-disabled'] {
119120
--pc-button-text: var(--p-color-text-subdued);
120121
background: var(--pc-button-color-disabled);
121122
}
122123
}
123124

124-
#{$se23} & [class*='Polaris-Button--tertiary'],
125-
#{$se23} & [class*='Button-tertiary'] {
125+
& [class*='Polaris-Button--tertiary'],
126+
& [class*='Button-tertiary'] {
126127
--pc-button-color: var(--p-color-bg-inset-strong);
127128
--pc-button-color-hover: var(--p-color-bg-inverse-hover);
128129
--pc-button-color-active: var(--p-color-bg-inverse-active);
129130
--pc-button-text: var(--p-color-text-inverse);
130131

131132
&::after {
132-
content: none;
133+
content: none;
133134
}
134135

135136
&:hover {

polaris-react/src/components/Frame/components/Loading/Loading.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111
width: 100%;
1212
height: 100%;
1313
transform-origin: 0;
14-
background-color: var(--p-color-icon-success);
14+
background-color: var(--p-color-bg-primary);
1515
transition: transform var(--p-motion-duration-500) linear;
1616

17-
#{$se23} & {
18-
background-color: var(--p-color-bg-primary);
19-
}
20-
2117
@media screen and (-ms-high-contrast: active) {
2218
background-color: highlight;
2319
}

polaris-react/src/components/Frame/components/Toast/Toast.scss

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ $Backdrop-opacity: 0.88;
1212
margin-bottom: var(--p-space-5);
1313
box-shadow: var(--p-shadow-xl);
1414

15-
#{$se23} & {
16-
@include shadow-bevel(
17-
$boxShadow: var(--p-shadow-lg),
18-
$borderRadius: var(--p-border-radius-2)
19-
);
20-
}
15+
@include shadow-bevel(
16+
$boxShadow: var(--p-shadow-lg),
17+
$borderRadius: var(--p-border-radius-2)
18+
);
2119

2220
@media #{$p-breakpoints-sm-up} {
2321
padding: var(--p-space-3);
@@ -29,12 +27,8 @@ $Backdrop-opacity: 0.88;
2927
}
3028

3129
.Action {
32-
margin-left: var(--p-space-2);
30+
margin-left: var(--p-space-4);
3331
color: var(--p-color-text-on-color);
34-
35-
#{$se23} & {
36-
margin-left: var(--p-space-4);
37-
}
3832
}
3933

4034
.error {
@@ -43,19 +37,11 @@ $Backdrop-opacity: 0.88;
4337

4438
.CloseButton {
4539
color: var(--p-color-icon-on-color);
46-
47-
#{$se23} & {
48-
color: var(--p-color-icon-on-color);
49-
}
5040
}
5141
}
5242

5343
.LeadingIcon {
54-
margin-right: var(--p-space-2);
55-
56-
#{$se23} & {
57-
margin-right: var(--p-space-1_5-experimental);
58-
}
44+
margin-right: var(--p-space-1_5-experimental);
5945

6046
svg {
6147
fill: currentColor;
@@ -71,14 +57,10 @@ $Backdrop-opacity: 0.88;
7157
border: none;
7258
appearance: none;
7359
background: transparent;
74-
color: var(--p-color-icon-subdued);
60+
color: var(--p-color-icon-inverse);
7561
cursor: pointer;
7662
margin-left: var(--p-space-2);
7763

78-
#{$se23} & {
79-
color: var(--p-color-icon-inverse);
80-
}
81-
8264
svg {
8365
fill: currentColor;
8466
}

0 commit comments

Comments
 (0)