Skip to content

Commit 02a9ca8

Browse files
Merge pull request #421 from asbjornu/v2-include-close-button-in-classless
feat: include the close icon styles in classless
2 parents 357ab1f + 49d289b commit 02a9ca8

10 files changed

+76
-35
lines changed

css/pico.classless.css

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/pico.classless.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.

css/pico.classless.min.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.

css/pico.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/pico.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.

css/pico.fluid.classless.css

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/pico.fluid.classless.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.

css/pico.fluid.classless.min.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.

css/pico.min.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.

scss/components/_modal.scss

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
// Content
3333
article {
34+
$close-selector: if($enable-classes, ".close, a[rel='prev']", "a[rel='prev']");
3435
width: 100%;
3536
max-height: calc(100vh - var(#{$css-var-prefix}spacing) * 2);
3637
margin: var(#{$css-var-prefix}spacing);
@@ -59,12 +60,10 @@
5960
margin-bottom: 0;
6061
}
6162

62-
@if $enable-classes {
63-
.close {
64-
margin: 0;
65-
margin-left: var(#{$css-var-prefix}spacing);
66-
float: right;
67-
}
63+
#{$close-selector} {
64+
margin: 0;
65+
margin-left: var(#{$css-var-prefix}spacing);
66+
float: right;
6867
}
6968
}
7069

@@ -82,27 +81,25 @@
8281
}
8382

8483
// Close icon
85-
@if $enable-classes {
86-
.close {
87-
display: block;
88-
width: 1rem;
89-
height: 1rem;
90-
margin-top: calc(var(#{$css-var-prefix}spacing) * -1);
91-
margin-bottom: var(#{$css-var-prefix}spacing);
92-
margin-left: auto;
93-
background-image: var(#{$css-var-prefix}icon-close);
94-
background-position: center;
95-
background-size: auto 1rem;
96-
background-repeat: no-repeat;
97-
opacity: 0.5;
98-
99-
@if $enable-transitions {
100-
transition: opacity var(#{$css-var-prefix}transition);
101-
}
84+
#{$close-selector} {
85+
display: block;
86+
width: 1rem;
87+
height: 1rem;
88+
margin-top: calc(var(#{$css-var-prefix}spacing) * -1);
89+
margin-bottom: var(#{$css-var-prefix}spacing);
90+
margin-left: auto;
91+
background-image: var(#{$css-var-prefix}icon-close);
92+
background-position: center;
93+
background-size: auto 1rem;
94+
background-repeat: no-repeat;
95+
opacity: 0.5;
96+
97+
@if $enable-transitions {
98+
transition: opacity var(#{$css-var-prefix}transition);
99+
}
102100

103-
&:is([aria-current]:not([aria-current="false"]), :hover, :active, :focus) {
104-
opacity: 1;
105-
}
101+
&:is([aria-current]:not([aria-current="false"]), :hover, :active, :focus) {
102+
opacity: 1;
106103
}
107104
}
108105
}

0 commit comments

Comments
 (0)