From 3f01c85393ba44f45ba5a110d9ff47d31ac50d3c Mon Sep 17 00:00:00 2001 From: alexisben <alex@noesya.coop> Date: Wed, 9 Nov 2022 10:17:57 +0100 Subject: [PATCH] non-breaking link blank picto --- assets/sass/_theme/_configuration.sass | 2 +- assets/sass/_theme/_todo/bootstrap-breakpoints.scss | 6 +++--- assets/sass/_theme/blocks/timeline.sass | 4 ++-- assets/sass/_theme/design-system/typography.sass | 5 +++-- assets/sass/_theme/design-system/vendors/glightbox.sass | 4 ++-- layouts/partials/posts/post.html | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass index 270d058e..2393355c 100644 --- a/assets/sass/_theme/_configuration.sass +++ b/assets/sass/_theme/_configuration.sass @@ -146,7 +146,7 @@ $icons: map-merge($icons, ("twitter": "\e90d")) // Breakpoints // TODO: réécrire en sass les mixins bootstrap -$grid-breakpoints: (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1400px) !default +$grid-breakpoints: (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1440px) !default // BLOCKS diff --git a/assets/sass/_theme/_todo/bootstrap-breakpoints.scss b/assets/sass/_theme/_todo/bootstrap-breakpoints.scss index 827d381c..ad1e47d7 100644 --- a/assets/sass/_theme/_todo/bootstrap-breakpoints.scss +++ b/assets/sass/_theme/_todo/bootstrap-breakpoints.scss @@ -2,7 +2,7 @@ // // Breakpoints are defined as a map of (name: minimum width), order from small to large: // -// (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px) +// (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1440px) // // The map defined in the `$grid-breakpoints` global variable is used as the `$breakpoints` argument by default. @@ -10,9 +10,9 @@ // // >> breakpoint-next(sm) // md -// >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) +// >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1440px)) // md -// >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl)) +// >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl xxl)) // md @function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) { $n: index($breakpoint-names, $name); diff --git a/assets/sass/_theme/blocks/timeline.sass b/assets/sass/_theme/blocks/timeline.sass index 5c4dbc5b..4fd9a5d4 100644 --- a/assets/sass/_theme/blocks/timeline.sass +++ b/assets/sass/_theme/blocks/timeline.sass @@ -60,9 +60,9 @@ font-size: 1rem padding: calc(#{$grid-gutter} / 2) &:first-child - @include icon("arrow-left", before) + @include icon(arrow-left, before) &:last-child - @include icon("arrow-right", before) + @include icon(arrow-right, before) &:disabled cursor: default opacity: 0.3 diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass index 56e7058f..436f49f4 100644 --- a/assets/sass/_theme/design-system/typography.sass +++ b/assets/sass/_theme/design-system/typography.sass @@ -84,8 +84,9 @@ a, &[target="_blank"]:not(.icon) @include icon("link-blank", "after") &::after + content: " #{map-get($icons, "link-blank")}" + display: inline font-size: px2rem(10) - margin-left: px2rem(5) &[href^="mailto"] &::after content: none @@ -136,4 +137,4 @@ dd .btn-#{$name} @include icon($name) &::before - margin-right: px2rem(5) + margin-inline-end: px2rem(5) diff --git a/assets/sass/_theme/design-system/vendors/glightbox.sass b/assets/sass/_theme/design-system/vendors/glightbox.sass index b70f94bd..491a1472 100644 --- a/assets/sass/_theme/design-system/vendors/glightbox.sass +++ b/assets/sass/_theme/design-system/vendors/glightbox.sass @@ -13,9 +13,9 @@ svg display: none .gnext - @include icon("arrow-right") + @include icon(arrow-right) .gprev - @include icon("arrow-left") + @include icon(arrow-left) .gdesc-inner padding-left: 0 padding-right: 0 diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html index f9c0b489..2101419e 100644 --- a/layouts/partials/posts/post.html +++ b/layouts/partials/posts/post.html @@ -1,7 +1,7 @@ <article class="post" itemprop="blogPosts" itemscope itemtype="http://schema.org/BlogPosting"> <div> {{- $title := partial "PrepareHTML" .Title -}} - <h2 class="h4" itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h2> + <h1 class="h4" itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a></h1> {{- if (partial "GetTextFromHTML" .Params.description_short) -}} <p itemprop="articleBody">{{ partial "PrepareHTML" .Params.description_short }}</p> {{- end -}} -- GitLab