diff options
| author | Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> | 2024-01-19 07:32:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 07:32:30 +0000 |
| commit | 0b2fbe3f5b9e2fcf0da2b320af504d5cca759045 (patch) | |
| tree | 6616775cbd5090eca7656eefa45dc2767a602d2f /scss/values/spacing/_grid.scss | |
| parent | da96287803ea26f4cc35173f9f34b71a1d6adfa5 (diff) | |
Layout and typography improvements (#63)
* Adds soft hyphens to homepage
* auto-hyphenates!
* Tighter line-height in logo
* Fixes spacing and typography below xs breakpoint
* Fixes xs-sm spacing and typography
* Fixes border widths
* Link hover uses wavy underline instead of fat underline
* Fixes committee img layout on <xs
* Nice separators between committee members
* Better styling for committee member heading
* Consistent start-end block padding for sections
* Better breadcrumb styling
* Neatens alignment in footer
* Renames scss/variables -> scss/custom-properties
* Pulls out colours SCSS variables
* Merges margins and padding values
* Moves variables/colours -> values/colours
* Starts migrating spacing values to SCSS
* Pulls out typography logic to SCSS variables/functions
* Removes unneeded --er custom property
* Calculates grid-total-width-absolute in SCSS
* Forwards constants with @forward
* Removes TODOs and unnecessary assignment to --width-prose
Diffstat (limited to 'scss/values/spacing/_grid.scss')
| -rw-r--r-- | scss/values/spacing/_grid.scss | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/scss/values/spacing/_grid.scss b/scss/values/spacing/_grid.scss new file mode 100644 index 0000000..50d11c9 --- /dev/null +++ b/scss/values/spacing/_grid.scss @@ -0,0 +1,63 @@ +@use 'sass:list'; +@use 'sass:map'; + +@use 'constants'; + +@function padding($breakpoint: initial) { + @return er-to-absolute(map.get(constants.$grid-padding-er, $breakpoint), $breakpoint); +} + +@function column-width($breakpoint: initial) { + @return er-to-absolute(constants.$grid-column-width-er, $breakpoint); +} + +@function gutter-width($breakpoint: initial) { + @return er-to-absolute(constants.$grid-gutter-width-er, $breakpoint); +} + +@function column-count($breakpoint: initial) { + @return map.get(constants.$grid-column-count, $breakpoint); +} + +@function total-width-er($breakpoint) { + $padding-width: calc(2 * map.get(constants.$grid-padding-er, $breakpoint)); + $column-count: map.get(constants.$grid-column-count, $breakpoint); + $columns-width: calc($column-count * constants.$grid-column-width-er); + $gutters-width: calc(($column-count - 1) * constants.$grid-gutter-width-er); + @return $padding-width + $columns-width + $gutters-width; +} + +@function total-width-absolute($breakpoint: initial) { + /** + * In theory, the grid total width should be clamped between the min at this + * breakpoint and the min at the next breakpoint minus grid padding. In + * practice, the only time this makes a difference is at xs, so at every + * other breakpoint, we'll just return the min at the current breakpoint. + */ + + @if $breakpoint == xs { + $min-width-xs: map.get(constants.$grid-min-total-width-absolute, xs); + $min-width-sm: map.get(constants.$grid-min-total-width-absolute, sm); + $padding-sm: calc(2 * padding(sm)); + @return min($min-width-xs, calc($min-width-sm - $padding-sm)); + } + + @return map.get(constants.$grid-min-total-width-absolute, $breakpoint); +} + +/** + * Converts er units to absolute units. + * + * This doesn't really belong here, but I think it has to, because it depends + * on grid-total-width-absolute which depends on grid-padding which depends on + * this. It's fine here, it's just a recursion. But if it lived in a separate + * 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) + ); + @return calc($length-er * $absolute-per-er); +} + |
