From 39abb2d7d3edb4ee0b89150bf300abb4ebad8eeb Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 12 Dec 2022 19:14:00 +0100
Subject: [PATCH] diplome essential
---
assets/sass/_theme/_configuration.sass | 4 ++--
assets/sass/_theme/sections/diplomas.sass | 18 ++++++------------
layouts/diplomas/term.html | 4 ++--
layouts/partials/diplomas/essential.html | 4 +---
layouts/partials/diplomas/hero-single.html | 20 +++++++++++++++-----
layouts/partials/programs/essential.html | 2 +-
6 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index d65d8b86..12c87877 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -309,8 +309,8 @@ $post-time-color: $color-text-alt !default
$persons-avatar-background-color: $color-background-alt !default
// Program
-$program-essential-font-size: $h5-size !default
-$program-essential-font-size-md: $h5-size-md !default
+$program-essential-font-size: $meta-size !default
+$program-essential-font-size-md: $meta-size-md !default
$program-share-font-size: $h5-size !default
$program-share-font-size-md: $h5-size-md !default
$program-zindex-toc: $zindex-toc !default
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index 46e44538..a9f1410b 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -100,18 +100,6 @@ ul.diplomas
+ .dropdown-menu
display: block
-
- // TODO : style de l'icone
- // button::after,
- // button[aria-expanded="true"]::after
- // display: inline-block
- // font-family: Icon
- // font-size: .375rem
- // font-weight: 400
- // line-height: 1
- // margin-left: 0.3125rem
- // vertical-align: middle
-
.essential
flex-wrap: wrap
font-size: $program-essential-font-size
@@ -133,3 +121,9 @@ ul.diplomas
grid-column: 3/13
@include media-breakpoint-down(md)
padding-top: 0
+
+.diplomas__term
+ ol.programs
+ li
+ @include grid(2, md)
+ align-items: start
\ No newline at end of file
diff --git a/layouts/diplomas/term.html b/layouts/diplomas/term.html
index 3197e843..581f0101 100644
--- a/layouts/diplomas/term.html
+++ b/layouts/diplomas/term.html
@@ -11,10 +11,10 @@
<a href="{{ .Permalink }}" class="title" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
{{- $title -}}
</a>
- <div class="description">
+ <p class="description">
{{/* TODO: replace with description_short */}}
{{- partial "PrepareHTML" .Params.description -}}
- </div>
+ </p>
</li>
{{- end -}}
</ol>
diff --git a/layouts/partials/diplomas/essential.html b/layouts/partials/diplomas/essential.html
index 9b3bd3e0..d8a7dcf6 100644
--- a/layouts/partials/diplomas/essential.html
+++ b/layouts/partials/diplomas/essential.html
@@ -1,7 +1,5 @@
{{- with . -}}
- <dl class="essential">
- <dt>{{ i18n "programs.diploma" }}</dt>
- <dd><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></dd>
+ <dl class="essential meta">
{{- if .Params.level -}}
<dt>{{ i18n "programs.level" }}</dt>
<dd>{{ partial "PrepareHTML" .Params.level }}</dd>
diff --git a/layouts/partials/diplomas/hero-single.html b/layouts/partials/diplomas/hero-single.html
index d989fe21..27a8f101 100644
--- a/layouts/partials/diplomas/hero-single.html
+++ b/layouts/partials/diplomas/hero-single.html
@@ -1,6 +1,16 @@
{{- $title := or .Params.header_text .Title -}}
-{{- partial "header/hero.html"
- (dict
- "title" $title
- "context" .
- ) -}}
+<header class="hero">
+ <div class="container">
+ {{- if .Params.breadcrumb | default true -}}
+ {{ partial "header/breadcrumbs.html" . }}
+ {{- end -}}
+ <div>
+ <h1>{{ partial "PrepareHTML" $title }}</h1>
+ </div>
+ </div>
+ <div id="essential">
+ <div class="container">
+ {{- partial "diplomas/essential" . -}}
+ </div>
+ </div>
+</header>
diff --git a/layouts/partials/programs/essential.html b/layouts/partials/programs/essential.html
index bc5730ec..9e8b1bc0 100644
--- a/layouts/partials/programs/essential.html
+++ b/layouts/partials/programs/essential.html
@@ -2,7 +2,7 @@
{{- with .Params.diplomas -}}
{{- $diploma := site.GetPage (printf "/diplomas/%s" .) -}}
{{- with $diploma -}}
- <dl class="essential">
+ <dl class="essential meta">
<dt>{{ i18n "programs.diploma" }}</dt>
<dd><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></dd>
{{- if .Params.level -}}
--
GitLab