From bab61ab670fb55967363de2209079c49127dfc8f Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 23 Aug 2023 18:26:43 +0100 Subject: Pulls out --width-prose --- public/css/layout/grid.css | 7 ++----- public/css/layout/grid.xl.css | 6 ------ public/css/layout/index.css | 1 - public/css/variables/spacing.css | 4 ++++ public/css/variables/spacing.xl.css | 4 ++++ 5 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 public/css/layout/grid.xl.css diff --git a/public/css/layout/grid.css b/public/css/layout/grid.css index cf0e9f9..e3c8d59 100644 --- a/public/css/layout/grid.css +++ b/public/css/layout/grid.css @@ -30,11 +30,8 @@ width: calc(var(--grid-column-width) * 3 + var(--grid-gutter-width) * 2); } -.grid-span-prose { - width: calc( - var(--grid-column-width) * min(6, var(--grid-column-count)) + - var(--grid-gutter-width) * min(5, (var(--grid-column-count) - 1)) - ); +.width-prose { + width: var(--prose-width); } .grid-span-full { diff --git a/public/css/layout/grid.xl.css b/public/css/layout/grid.xl.css deleted file mode 100644 index 587fb2f..0000000 --- a/public/css/layout/grid.xl.css +++ /dev/null @@ -1,6 +0,0 @@ -.grid-span-prose { - width: calc( - var(--grid-column-width) * min(8, var(--grid-column-count)) + - var(--grid-gutter-width) * min(7, (var(--grid-column-count) - 1)) - ); - } \ No newline at end of file diff --git a/public/css/layout/index.css b/public/css/layout/index.css index a5af1d1..0d378e0 100644 --- a/public/css/layout/index.css +++ b/public/css/layout/index.css @@ -1,4 +1,3 @@ @import './grid.css'; @import './grid.md.css' (min-width: 48rem); -@import './grid.xl.css' (min-width: 120rem); @import './section-margins.css'; \ No newline at end of file diff --git a/public/css/variables/spacing.css b/public/css/variables/spacing.css index 9a683e0..2bbb013 100644 --- a/public/css/variables/spacing.css +++ b/public/css/variables/spacing.css @@ -23,6 +23,10 @@ --relative-eighth-rem: calc( var(--grid-total-width) / var(--grid-total-relative-eighth-rem-width) ); + --width-prose: calc( + var(--grid-column-width) * min(6, var(--grid-column-count)) + + var(--grid-gutter-width) * min(5, (var(--grid-column-count) - 1)) + ); --grid-column-width-relative-eighth-rem: 32; --grid-gutter-width-relative-eighth-rem: 4; diff --git a/public/css/variables/spacing.xl.css b/public/css/variables/spacing.xl.css index a726962..6fe02f2 100644 --- a/public/css/variables/spacing.xl.css +++ b/public/css/variables/spacing.xl.css @@ -2,4 +2,8 @@ --grid-total-width: 80rem; --grid-padding-start-relative-eighth-rem: 26; --grid-column-count: 12; + --width-prose: calc( + var(--grid-column-width) * min(8, var(--grid-column-count)) + + var(--grid-gutter-width) * min(7, (var(--grid-column-count) - 1)) + ); } \ No newline at end of file -- cgit v1.2.3