Skip to content
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

fix(@clayui/css): Mixins update sheet-footer-btn-block and clay-loading-animation-variant to use clay-css pattern #4171

Merged
merged 2 commits into from
Jul 20, 2021
Merged

fix(@clayui/css): Mixins update sheet-footer-btn-block and clay-loading-animation-variant to use clay-css pattern #4171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5523b67
fix(@clayui/css): Mixins update `sheet-footer-btn-block` to use `clay…
pat270 Jul 19, 2021
4280c6f
fix(@clayui/css): Mixins update `clay-loading-animation-variant` to u…
pat270 Jul 19, 2021
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
4 changes: 3 additions & 1 deletion packages/clay-css/src/scss/atlas/variables/_loaders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
$loading-animation: () !default;
$loading-animation: map-deep-merge(
(
color: $gray-600,
after: (
color: $gray-600,
),
),
$loading-animation
);
22 changes: 18 additions & 4 deletions packages/clay-css/src/scss/cadmin/variables/_loaders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,31 @@ $cadmin-loading-icon-font-size-sm: 20px !default; // 20px
$cadmin-loading-animation: () !default;
$cadmin-loading-animation: map-deep-merge(
(
animation-name: loading-animation,
color: $cadmin-gray-600,
after: (
animation: 1.2s ease-out infinite,
animation-name: loading-animation,
border-radius: 50%,
color: $cadmin-gray-600,
content: '',
display: block,
height: 1em,
left: 0,
position: absolute,
top: 0,
transform: scale(0.33334),
width: 1em,
),
),
$cadmin-loading-animation
);

$cadmin-loading-animation-light: () !default;
$cadmin-loading-animation-light: map-deep-merge(
(
animation-name: loading-animation-light,
color: $cadmin-white,
after: (
animation-name: loading-animation-light,
color: $cadmin-white,
),
),
$cadmin-loading-animation-light
);
16 changes: 15 additions & 1 deletion packages/clay-css/src/scss/cadmin/variables/_sheets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,21 @@ $cadmin-sheet-footer-btn-block-sm-down: () !default;
$cadmin-sheet-footer-btn-block-sm-down: map-deep-merge(
(
breakpoint-down: sm,
btn-margin-bottom-mobile: 16px,
mobile: (
display: block,
btn: (
display: block,
margin-bottom: 16px,
width: 100%,
),
btn-group: (
display: block,
),
btn-group-item: (
display: block,
margin-right: 0,
),
),
),
$cadmin-sheet-footer-btn-block-sm-down
);
Expand Down
84 changes: 45 additions & 39 deletions packages/clay-css/src/scss/mixins/_loaders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,8 @@
$enabled: setter(map-get($map, enabled), true);
$mixin-name: 'clay-loading-animation-variant';

$border-radius: setter(map-get($map, border-radius), 50%);
$color: setter(
map-get($map, color),
if(variable-exists(secondary), $secondary, $cadmin-secondary)
);
$transform: setter(map-get($map, transform), scale(0.33334));

$animation: setter(map-get($map, animation), 1.2s ease-out infinite);
$animation-name: required(
map-get($map, animation-name),
'The property `animation-name` in `#{$mixin-name}` is required!'
);
$after: setter(map-get($map, after), ());
$after-color: setter(map-get($map, color), map-get($after, color));

$ball-0-scale: setter(map-get($map, ball-0-scale), 0em);
$ball-1-scale: setter(map-get($map, ball-1-scale), -0.1em);
Expand All @@ -66,54 +56,70 @@

$ball-0-color: setter(
map-get($map, ball-0-color),
rgba($color, $ball-0-alpha)
rgba($after-color, $ball-0-alpha)
);
$ball-1-color: setter(
map-get($map, ball-1-color),
rgba($color, $ball-1-alpha)
rgba($after-color, $ball-1-alpha)
);
$ball-2-color: setter(
map-get($map, ball-2-color),
rgba($color, $ball-2-alpha)
rgba($after-color, $ball-2-alpha)
);
$ball-3-color: setter(
map-get($map, ball-3-color),
rgba($color, $ball-3-alpha)
rgba($after-color, $ball-3-alpha)
);
$ball-4-color: setter(
map-get($map, ball-4-color),
rgba($color, $ball-4-alpha)
rgba($after-color, $ball-4-alpha)
);
$ball-5-color: setter(
map-get($map, ball-5-color),
rgba($color, $ball-5-alpha)
rgba($after-color, $ball-5-alpha)
);

$after: map-merge(
$after,
(
animation:
setter(map-get($map, animation), map-get($after, animation)),
animation-name:
required(
setter(
map-get($map, animation-name),
map-get($after, animation-name)
),
'The property `animation-name` in `#{$mixin-name}` is required!'
),
border-radius:
setter(
map-get($map, border-radius),
map-get($after, border-radius)
),
box-shadow:
setter(
map-get($map, box-shadow),
map-get($after, box-shadow),
#{0 -1em 0 $ball-0-scale $ball-0-color,
1em -0.5em 0 $ball-5-scale $ball-5-color,
1em 0.5em 0 $ball-4-scale $ball-4-color,
0 1em 0 $ball-3-scale $ball-3-color,
-1em 0.5em 0 $ball-2-scale $ball-2-color,
-1em -0.5em 0 $ball-1-scale $ball-1-color}
),
color: $after-color,
transform:
setter(map-get($map, transform), map-get($after, transform)),
)
);

@if ($enabled) {
&:after {
animation: $animation;
animation-name: $animation-name;
border-radius: $border-radius;
content: '';

// Box shadow needs this specific order for proper animation

box-shadow: 0 -1em 0 $ball-0-scale $ball-0-color,
1em -0.5em 0 $ball-5-scale $ball-5-color,
1em 0.5em 0 $ball-4-scale $ball-4-color,
0 1em 0 $ball-3-scale $ball-3-color,
-1em 0.5em 0 $ball-2-scale $ball-2-color,
-1em -0.5em 0 $ball-1-scale $ball-1-color;
display: block;
height: 1em;
left: 0;
position: absolute;
top: 0;
transform: $transform;
width: 1em;
@include clay-css($after);
}

@keyframes #{$animation-name} {
@keyframes #{map-get($after, animation-name)} {
// Box shadows need this specific order for proper animation

0%,
Expand Down
29 changes: 21 additions & 8 deletions packages/clay-css/src/scss/mixins/_sheet.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,38 @@

$breakpoint-down: map-get($map, breakpoint-down);

$btn-margin-bottom-mobile: map-get($map, btn-margin-bottom-mobile);
$mobile: setter(map-get($map, mobile), ());

$btn-mobile: setter(map-get($mobile, btn), ());
$btn-mobile: map-merge(
$btn-mobile,
(
margin-bottom:
setter(
map-get($map, btn-margin-bottom-mobile),
map-get($btn-mobile, margin-bottom)
),
)
);

$btn-group-mobile: setter(map-get($mobile, btn-group), ());

$btn-group-item-mobile: setter(map-get($mobile, btn-group-item), ());

@if ($enabled) {
@include media-breakpoint-down($breakpoint-down) {
display: block;
@include clay-css($mobile);

.btn {
display: block;
margin-bottom: $btn-margin-bottom-mobile;
width: 100%;
@include clay-css($btn-mobile);
}

.btn-group {
display: block;
@include clay-css($btn-group-mobile);
}

.btn-group-item {
display: block;
margin-right: 0;
@include clay-css($btn-group-item-mobile);
}
}
}
Expand Down
22 changes: 18 additions & 4 deletions packages/clay-css/src/scss/variables/_loaders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,31 @@ $loading-icon-font-size-sm: 1.25rem !default; // 20px
$loading-animation: () !default;
$loading-animation: map-deep-merge(
(
animation-name: loading-animation,
color: $gray-900,
after: (
animation: 1.2s ease-out infinite,
animation-name: loading-animation,
border-radius: 50%,
color: $gray-900,
content: '',
display: block,
height: 1em,
left: 0,
position: absolute,
top: 0,
transform: scale(0.33334),
width: 1em,
),
),
$loading-animation
);

$loading-animation-light: () !default;
$loading-animation-light: map-deep-merge(
(
animation-name: loading-animation-light,
color: $white,
after: (
animation-name: loading-animation-light,
color: $white,
),
),
$loading-animation-light
);
16 changes: 15 additions & 1 deletion packages/clay-css/src/scss/variables/_sheets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,21 @@ $sheet-footer-btn-block-sm-down: () !default;
$sheet-footer-btn-block-sm-down: map-deep-merge(
(
breakpoint-down: sm,
btn-margin-bottom-mobile: 1rem,
mobile: (
display: block,
btn: (
display: block,
margin-bottom: 1rem,
width: 100%,
),
btn-group: (
display: block,
),
btn-group-item: (
display: block,
margin-right: 0,
),
),
),
$sheet-footer-btn-block-sm-down
);
Expand Down