Skip to content

Commit 61c7447

Browse files
author
Stefanie Hein
committed
Pane: move the styles for pane-title-button and pane-close-button into the pane-header() mixin to resolve specificity issues. See #78367
1 parent a3f1c48 commit 61c7447

2 files changed

Lines changed: 43 additions & 64 deletions

File tree

src/scss/themes/fylr/components/_pane.scss

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -40,70 +40,6 @@
4040
.cui-select {
4141
margin-right: $spacer-xs;
4242
}
43-
44-
.cui-pane-close-button {
45-
transform: translateX($spacer-sm);
46-
}
47-
48-
// Pane Header title is clickable and works as a pane-close-button
49-
&:has(.cui-pane-close-button-with-title) {
50-
> .cui-horizontal-layout-left {
51-
width: 100%;
52-
53-
> .cui-buttonbar {
54-
width: 100%;
55-
}
56-
}
57-
58-
.cui-pane-close-button-with-title {
59-
width: 100%;
60-
max-width: 100%;
61-
62-
@include button-color-reset();
63-
64-
.cui-button-visual {
65-
@include h3(0);
66-
67-
justify-content: space-between;
68-
69-
.cui-button-center {
70-
padding-left: 0;
71-
}
72-
73-
.cui-button-right {
74-
padding-right: $spacer-xs;
75-
}
76-
}
77-
78-
&:not(.cui-disabled) {
79-
transform: translateX(3px);
80-
81-
&:focus .cui-button-visual.cui-button-visual {
82-
--focus-shadow-outer-width: 0px;
83-
84-
box-shadow: none !important;
85-
border: 0;
86-
87-
&::after {
88-
content: '';
89-
display: block;
90-
position: absolute;
91-
top: 3px;
92-
left: -2px;
93-
width: calc(100% - 3px);
94-
height: calc(100% - 5px);
95-
outline: 3px solid $focused;
96-
outline-offset: -2px;
97-
border-radius: 1px;
98-
}
99-
100-
.cui-button-right {
101-
padding-right: $spacer-sm;
102-
}
103-
}
104-
}
105-
}
106-
}
10743
}
10844

10945
.cui-pane-footer {

src/scss/themes/fylr/mixins/_pane.scss

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,47 @@
5555
}
5656
}
5757
}
58+
59+
.cui-pane-close-button:not(.cui-disabled) {
60+
$pane-close-button-offset: 4px;
61+
62+
transform: translateX($pane-close-button-offset);
63+
64+
.cui-button-visual {
65+
min-width: 20px; // make explicetely narrower to move to the very right
66+
}
67+
68+
&:focus .cui-button-visual.cui-button-visual {
69+
box-shadow: none !important;
70+
border: 0;
71+
72+
&::after {
73+
content: '';
74+
display: block;
75+
position: absolute;
76+
top: 5px;
77+
left: 0.5 * $pane-close-button-offset;
78+
width: calc(100% - (2 * $pane-close-button-offset));
79+
height: calc(100% - 10px);
80+
outline: 2px solid $focused;
81+
border-radius: 0.5px;
82+
}
83+
}
84+
}
85+
86+
// Pane Header title is clickable and works as a pane-close-button
87+
.cui-pane-title-button {
88+
@include button-color-reset();
89+
90+
.cui-button-visual {
91+
@include h3(0);
92+
93+
justify-content: space-between;
94+
95+
.cui-button-center {
96+
padding-left: 2px;
97+
padding-right: 2px;
98+
}
99+
}
100+
}
58101
}

0 commit comments

Comments
 (0)