From 147d3ef6e7cccd80a71bf443e51922c4b7cd59d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Thu, 4 May 2023 14:26:16 +0200
Subject: [PATCH] fix sass mixin
---
app/assets/stylesheets/admin/pure.sass | 1 +
app/assets/stylesheets/admin/pure/grid.sass | 4 ++--
app/assets/stylesheets/admin/pure/mixins.sass | 3 +++
app/assets/stylesheets/extranet/layout/_default.sass | 6 +++---
4 files changed, 9 insertions(+), 5 deletions(-)
create mode 100644 app/assets/stylesheets/admin/pure/mixins.sass
diff --git a/app/assets/stylesheets/admin/pure.sass b/app/assets/stylesheets/admin/pure.sass
index b3638de51..0f2e9021a 100644
--- a/app/assets/stylesheets/admin/pure.sass
+++ b/app/assets/stylesheets/admin/pure.sass
@@ -1,6 +1,7 @@
@import 'pure/utils'
@import 'pure/fonts'
@import 'pure/variables'
+@import 'pure/mixins'
@import 'pure/grid'
@import 'bootstrap'
@import 'bootstrap-icons/font/bootstrap-icons'
diff --git a/app/assets/stylesheets/admin/pure/grid.sass b/app/assets/stylesheets/admin/pure/grid.sass
index ffdb47b85..3e5bfe59d 100644
--- a/app/assets/stylesheets/admin/pure/grid.sass
+++ b/app/assets/stylesheets/admin/pure/grid.sass
@@ -1,4 +1,4 @@
*
- --bs-gutter-x: 64px !important
+ @include root-prop(--bs-gutter-x, 64px !important)
@media (max-width: 768px)
- --bs-gutter-x: 32px !important
+ @include root-prop(--bs-gutter-x, 32px !important)
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/pure/mixins.sass b/app/assets/stylesheets/admin/pure/mixins.sass
new file mode 100644
index 000000000..c56b37cac
--- /dev/null
+++ b/app/assets/stylesheets/admin/pure/mixins.sass
@@ -0,0 +1,3 @@
+@mixin root-prop($prop: null, $value: null)
+ @if ($prop and $value)
+ #{$prop}: $value
\ No newline at end of file
diff --git a/app/assets/stylesheets/extranet/layout/_default.sass b/app/assets/stylesheets/extranet/layout/_default.sass
index a5b9fc610..101169d47 100644
--- a/app/assets/stylesheets/extranet/layout/_default.sass
+++ b/app/assets/stylesheets/extranet/layout/_default.sass
@@ -1,7 +1,7 @@
.container
@include media-breakpoint-up(md)
- padding-right: var(--bs-gutter-x)
padding-left: var(--bs-gutter-x)
+ padding-right: var(--bs-gutter-x)
.action-show
dl
@@ -11,11 +11,11 @@
dd
margin-bottom: px2rem(26)
a
- transition: text-decoration 0.5s
text-decoration: underline
+ text-decoration-color: adjust-color(black, $alpha: -0.8)
text-decoration-thickness: 1px
text-underline-offset: 4px
- text-decoration-color: adjust-color(black, $alpha: -0.8)
+ transition: text-decoration 0.5s
&:hover
text-decoration-color: black
--
GitLab