From 6331cbc95ce6cabbbcc3b53bea67f4bdb66be28e Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 14 Oct 2022 18:50:03 +0200
Subject: [PATCH] fix offset
---
assets/sass/_theme/_utils.sass | 15 +++++++++++----
assets/sass/_theme/blocks/call_to_action.sass | 6 +++---
assets/sass/_theme/design-system/grid.sass | 3 ++-
assets/sass/_theme/sections/posts.sass | 5 +++--
assets/sass/_theme/sections/programs.sass | 2 +-
assets/sass/_theme/sections/sitemap.sass | 2 +-
6 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index 4a9f0f95..7d3ca441 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -88,10 +88,17 @@
@include media-breakpoint-down(md)
grid-gap: $grid-gutter-sm
-@function col($nb, $base: 12)
- $nb: $nb/$base * 12
- $nbCol: calc( (100% + #{$grid-gutter}) / 12 * #{$nb} )
- @return #{$nbCol}
+// This must be used for content inside columns
+@function col($quantity, $base: 12)
+ $quantity-on-base: $quantity / $base * 12
+ $width: calc( (100% + #{$grid-gutter}) / 12 * #{$quantity-on-base} - #{$grid-gutter} )
+ @return #{$width}
+
+// This must be used for offset, outside columns
+@function offset($quantity, $base: 12)
+ $quantity-on-base: $quantity / $base * 12
+ $width: calc( (100% + #{$grid-gutter}) / 12 * #{$quantity-on-base} )
+ @return #{$width}
@mixin stretched-link($pseudo-element: after)
&::#{$pseudo-element}
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index 25f50809..a1ef9a9f 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -43,10 +43,10 @@
@include media-breakpoint-up(md)
picture
- padding-left: col(1, 8)
- padding-right: col(3, 8)
+ padding-left: offset(1, 7)
+ padding-right: offset(3, 7)
> div
- padding: col(1, 8)
+ padding: offset(1, 7)
[role="group"]
a
margin-right: px2rem(20)
diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass
index 452a8a8c..1431a501 100644
--- a/assets/sass/_theme/design-system/grid.sass
+++ b/assets/sass/_theme/design-system/grid.sass
@@ -20,7 +20,8 @@
pointer-events: auto
> .blocks
.block-content
- padding-left: col(5)
+ padding-left: offset(5)
+
@include media-breakpoint-down(md)
aside
display: none
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index 736f7b07..ae42fbfb 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -63,7 +63,6 @@
.posts__page
aside
@include container
- margin-top: $spacing1
.post-categories
@include list-reset
@@ -75,14 +74,16 @@
&::after
content: ", "
margin-left: -3px
+ margin-right: 3px
&:last-child
&::after
content: none
.table-infos
border-top: 1px solid $main-border-color
- font-size: $small-font-size
margin-bottom: 0
+ &, li
+ font-size: $small-font-size
ul
@include list-reset
caption
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 9d662240..8d730a2c 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -136,7 +136,7 @@ ol.programs
.blocks
.block-content
@include media-breakpoint-up(md)
- padding-left: col(5)
+ padding-left: offset(5)
@include media-breakpoint-up(md)
article
diff --git a/assets/sass/_theme/sections/sitemap.sass b/assets/sass/_theme/sections/sitemap.sass
index 85d9c268..60ae8ff9 100644
--- a/assets/sass/_theme/sections/sitemap.sass
+++ b/assets/sass/_theme/sections/sitemap.sass
@@ -2,7 +2,7 @@
.content
> div
@include media-breakpoint-up(md)
- padding-left: col(5)
+ padding-left: offset(5)
ul
list-style: none
margin-bottom: calc(7.5rem / 2)
--
GitLab