diff --git a/app/assets/stylesheets/admin/pure.sass b/app/assets/stylesheets/admin/pure.sass index b3638de514982db5fb02d87543400830c493721b..0f2e9021a18806e06d9109fb8d0cf85cc52ca717 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 ffdb47b85b9d4a40d07889a70e80e9d6f0ad4053..3e5bfe59d5d79fd8fe6cabd7ba2737df90bb5bf6 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 0000000000000000000000000000000000000000..c56b37cac1e96709ce75972df65e1988085b4990 --- /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 a5b9fc61089829ad11af1f7ddc3807e61b2656a8..101169d4715d8817fdb9af969d7cfdf64e2fe791 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