Skip to content

Commit

Permalink
Remove transition function, fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
adamlaki committed Dec 16, 2023
1 parent 0373518 commit a366e11
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 53 deletions.
2 changes: 1 addition & 1 deletion scss/config/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
$typography: () !default;
$typography: map.merge(
(
'border-radius': map.get($display, 'border-radius-sm'),
'font-family-base': #{Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif},
'font-family-cursive': #{ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace},
'font-family-heading': #{Avenir, 'Avenir Next LT Pro', Montserrat, Corbel, 'URW Gothic', source-sans-pro, sans-serif},
Expand All @@ -15,7 +16,6 @@ $typography: map.merge(
'font-size-sm': 0.875rem,
'font-weight-base': null,
'font-weight-heading': 700,
'inline-border-radius': map.get($display, 'border-radius-sm'),
'inline-padding': 0.1em 0.3em,
'letter-spacing-heading': null,
'line-height-base': 1.8,
Expand Down
4 changes: 2 additions & 2 deletions scss/element/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
a {
color: color('link');
text-decoration: underline;
transition-duration: transition('duration');
transition-duration: config('duration', $transition);
transition-property: color;
transition-timing-function: transition('timing-function');
transition-timing-function: config('timing-function', $transition);

&:hover {
color: color('link-hover');
Expand Down
8 changes: 5 additions & 3 deletions scss/element/_root.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
@include generate-color-variables;

:root {
@media (prefers-reduced-motion: no-preference) {
--#{$internal-prefix}duration: #{config('duration', $transition, false)};
--#{$internal-prefix}timing-function: #{config('timing-function', $transition, false)};
@if setting('css-custom-properties') {
@media (prefers-reduced-motion: no-preference) {
--#{$internal-prefix}duration: #{config('duration', $transition, false)};
--#{$internal-prefix}timing-function: #{config('timing-function', $transition, false)};
}
}

@if map.get($generators, 'content', 'typography') {
Expand Down
6 changes: 3 additions & 3 deletions scss/element/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
line-height: config('line-height-base', $typography);
}

@if setting(hyphens) {
@if setting('hyphens') {
p,
li,
h1,
Expand Down Expand Up @@ -130,7 +130,7 @@

mark {
background-color: color('mark-background');
border-radius: config('inline-border-radius', $typography);
border-radius: config('border-radius', $typography);
color: color('mark-foreground');
padding: config('inline-padding', $typography);
}
Expand All @@ -139,7 +139,7 @@
kbd,
samp {
background-color: color('code-background');
border-radius: config('inline-border-radius', $typography);
border-radius: config('border-radius', $typography);
color: color('code-foreground');
padding: config('inline-padding', $typography);
}
Expand Down
4 changes: 2 additions & 2 deletions scss/form/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
text-align: start;
text-decoration: none;
text-transform: config('text-transform', $btn);
transition-duration: transition(duration);
transition-duration: config('duration', $transition);
transition-property: background-color, border-color, box-shadow, color;
transition-timing-function: transition(timing-function);
transition-timing-function: config('timing-function', $transition);
}

#{$selector}:focus {
Expand Down
4 changes: 2 additions & 2 deletions scss/form/_check.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
inline-size: 1em;
line-height: 1;
margin-block: config('margin-block', $form-check);
transition-duration: transition('duration');
transition-duration: config('duration', $transition);
transition-property: border, box-shadow;
transition-timing-function: transition('timing-function');
transition-timing-function: config('timing-function', $transition);

&[type='radio'] {
border-radius: 50%;
Expand Down
4 changes: 2 additions & 2 deletions scss/form/_control.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
inline-size: 100%;
line-height: config('line-height', $form-control);
padding: config('padding', $form-control);
transition-duration: transition('duration');
transition-duration: config('duration', $transition);
transition-property: border, box-shadow;
transition-timing-function: transition('timing-function');
transition-timing-function: config('timing-function', $transition);

&::placeholder {
color: color('placeholder', 'form');
Expand Down
2 changes: 1 addition & 1 deletion scss/form/_label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
font-style: map.get($form-label, 'font-style');
font-weight: map.get($form-label, 'font-weight');
line-height: map.get($typography, 'line-height-md');
text-align: map.get($form-label, 'text-align');;
text-align: map.get($form-label, 'text-align');
}
}
4 changes: 2 additions & 2 deletions scss/form/_switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
inline-size: 2em;
line-height: 1;
margin-block: config('margin-block', $form-switch);
transition-duration: transition('duration');
transition-duration: config('duration', $transition);
transition-property: background-position, border, box-shadow;
transition-timing-function: transition('timing-function');
transition-timing-function: config('timing-function', $transition);

&:focus-visible {
@include focus-ring(
Expand Down
1 change: 0 additions & 1 deletion scss/function/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
@forward 'utilities';
@forward 'setting';
@forward 'spacer';
@forward 'transition';
16 changes: 0 additions & 16 deletions scss/function/_transition.scss

This file was deleted.

8 changes: 2 additions & 6 deletions scss/mixin/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
$gap: m,
$max-inline-size: config('container-inline-size', $layout)
) {
@if meta.type-of($gap) == string and string.index($gap, ':') {
$gap: spacer($gap);
} @else if map.has-key($spacers, $gap) {
@if map.has-key($spacers, $gap) {
$gap: map.get($spacers, $gap);
}

Expand All @@ -37,9 +35,7 @@
$align: none,
$important: false
) {
@if meta.type-of($gap) == string and string.index($gap, ':') {
$gap: spacer($gap);
} @else if map.has-key($spacers, $gap) {
@if map.has-key($spacers, $gap) {
$gap: map.get($spacers, $gap);
}

Expand Down
17 changes: 5 additions & 12 deletions scss/mixin/_transition.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use 'sass:string';
@use '../function' as *;
@use '../config' as *;

/// Generates transition related declarations.
/// @param {string} $duration - The duration of the transition.
Expand All @@ -8,19 +9,11 @@
/// @return {string} - The generated transition declarations.
/// @throws {error} - If the duration or timing-function is invalid.
@mixin transition(
$duration: duration,
$duration: config('duration', $transition),
$property: all,
$timing-function: timing-function,
$timing-function: config('timing-function', $transition),
) {
@if $duration == duration {
transition-duration: transition($duration);
} @else {
transition-duration: $duration;
}
transition-duration: $duration;
transition-property: string.unquote($property);
@if $timing-function == timing-function {
transition-timing-function: transition($timing-function);
} @else {
transition-timing-function: $timing-function;
}
transition-timing-function: $timing-function;
}

0 comments on commit a366e11

Please sign in to comment.