From 86f31617fb3b2f7f8b42451451840a6cc8ee851c Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sat, 5 Oct 2024 17:20:10 +0100 Subject: applies prettier --- scss/values/_colours.scss | 1 - scss/values/spacing/_constants.scss | 23 +++++++++++++++-------- scss/values/spacing/_grid.scss | 6 +----- scss/values/spacing/_index.scss | 1 - scss/values/spacing/_spacing.scss | 12 +++--------- scss/values/typography/_constants.scss | 3 +-- scss/values/typography/_index.scss | 10 +++------- 7 files changed, 23 insertions(+), 33 deletions(-) (limited to 'scss/values') diff --git a/scss/values/_colours.scss b/scss/values/_colours.scss index 40db6e8..79d1da4 100644 --- a/scss/values/_colours.scss +++ b/scss/values/_colours.scss @@ -31,4 +31,3 @@ $secondary-95: #b2fff6; $secondary-98: #e4fffb; $secondary-99: #f2fffc; $secondary-100: #ffffff; - diff --git a/scss/values/spacing/_constants.scss b/scss/values/spacing/_constants.scss index c89fdc8..3663bf3 100644 --- a/scss/values/spacing/_constants.scss +++ b/scss/values/spacing/_constants.scss @@ -8,7 +8,7 @@ $grid-padding-er: ( 'md': 16, 'sm': 12, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-column-count: ( @@ -18,7 +18,7 @@ $grid-column-count: ( 'md': 8, 'sm': 8, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-prose-column-count: ( @@ -28,7 +28,7 @@ $grid-prose-column-count: ( 'md': 8, 'sm': 8, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-padding-er: ( @@ -38,12 +38,20 @@ $grid-padding-er: ( 'md': 16, 'sm': 12, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $spacing-factor: ( - 'inline': (lg: 12, md: 6, sm: 3), - 'block': (lg: 16, md: 10, sm: 5) + 'inline': ( + lg: 12, + md: 6, + sm: 3, + ), + 'block': ( + lg: 16, + md: 10, + sm: 5, + ), ); $grid-min-total-width-absolute: ( @@ -53,6 +61,5 @@ $grid-min-total-width-absolute: ( 'md': 48rem, 'sm': 30rem, 'xs': 100vw, - 'initial': 100vw + 'initial': 100vw, ); - diff --git a/scss/values/spacing/_grid.scss b/scss/values/spacing/_grid.scss index 50d11c9..e448363 100644 --- a/scss/values/spacing/_grid.scss +++ b/scss/values/spacing/_grid.scss @@ -54,10 +54,6 @@ * module you'd end up with a circular dependency. */ @function er-to-absolute($length-er, $breakpoint: initial) { - $absolute-per-er: calc( - total-width-absolute($breakpoint) - / total-width-er($breakpoint) - ); + $absolute-per-er: calc(total-width-absolute($breakpoint) / total-width-er($breakpoint)); @return calc($length-er * $absolute-per-er); } - diff --git a/scss/values/spacing/_index.scss b/scss/values/spacing/_index.scss index 8f8a454..1d65bb5 100644 --- a/scss/values/spacing/_index.scss +++ b/scss/values/spacing/_index.scss @@ -21,4 +21,3 @@ @forward 'grid' as grid-* hide er-to-absolute; @forward 'grid' show er-to-absolute; @forward 'spacing'; - diff --git a/scss/values/spacing/_spacing.scss b/scss/values/spacing/_spacing.scss index 4fd94e8..ac0d79e 100644 --- a/scss/values/spacing/_spacing.scss +++ b/scss/values/spacing/_spacing.scss @@ -9,24 +9,18 @@ * - direction: inline, block */ @function spacing($direction, $size, $breakpoint: initial) { - $factor: map.get( - map.get(constants.$spacing-factor, $direction), - $size - ); + $factor: map.get(map.get(constants.$spacing-factor, $direction), $size); @if list.index([xxl xl lg md sm], ($breakpoint)) { @return grid.er-to-absolute($factor, $breakpoint); - } - @else if $breakpoint == xs { + } @else if $breakpoint == xs { @return clamp( spacing($direction, $size, initial), grid.er-to-absolute($factor, xs), spacing($direction, $size, sm) ); - } - @else if $breakpoint == initial { + } @else if $breakpoint == initial { @return calc($factor * 0.0625rem); } @error "Invalid breakpoint: #{$breakpoint}"; } - diff --git a/scss/values/typography/_constants.scss b/scss/values/typography/_constants.scss index 4ea0117..4921059 100644 --- a/scss/values/typography/_constants.scss +++ b/scss/values/typography/_constants.scss @@ -15,6 +15,5 @@ $font-size-factor: ( '3': 2, '4': 2.5, '5': 3, - '6': 3.5 + '6': 3.5, ); - diff --git a/scss/values/typography/_index.scss b/scss/values/typography/_index.scss index 3aa4384..cacadcf 100644 --- a/scss/values/typography/_index.scss +++ b/scss/values/typography/_index.scss @@ -4,15 +4,11 @@ @function font-size($font-size-grade, $breakpoint: initial) { @return calc( - map.get(constants.$base-font-size, $breakpoint) - * map.get(constants.$font-size-factor, $font-size-grade) + map.get(constants.$base-font-size, $breakpoint) * + map.get(constants.$font-size-factor, $font-size-grade) ); } @function border-width($breakpoint: initial) { - @return calc( - map.get(constants.$base-font-size, $breakpoint) - / 8 - ); + @return calc(map.get(constants.$base-font-size, $breakpoint) / 8); } - -- cgit v1.2.3