From 621e77e0521a3c7ceb418d53ef2988444d342c7d Mon Sep 17 00:00:00 2001 From: Richard Dern Date: Thu, 9 May 2024 16:48:54 +0200 Subject: [PATCH] Fix: Standards --- resources/css/TypoPRO-FantasqueSansMono.css | 56 +++++++++++++++++++ resources/css/app.css | 2 +- resources/views/article-card.blade.php | 4 +- resources/views/article.blade.php | 4 +- resources/views/components/image.blade.php | 4 +- .../views/components/pagination.blade.php | 4 +- .../views/components/read-more.blade.php | 2 +- resources/views/components/sound.blade.php | 2 +- resources/views/components/video.blade.php | 2 +- resources/views/dossier-card.blade.php | 4 +- 10 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 resources/css/TypoPRO-FantasqueSansMono.css diff --git a/resources/css/TypoPRO-FantasqueSansMono.css b/resources/css/TypoPRO-FantasqueSansMono.css new file mode 100644 index 0000000..451f770 --- /dev/null +++ b/resources/css/TypoPRO-FantasqueSansMono.css @@ -0,0 +1,56 @@ + +/* TypoPRO Fantasque Sans Mono Bold */ +@font-face { + font-family: 'TypoPRO Fantasque Sans Mono'; + src: url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Bold.eot'); + src: local('*'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Bold.eot?#iefix') format('embedded-opentype'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Bold.woff') format('woff'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Bold.ttf') format('truetype'); + font-style: normal; + font-weight: bold; + font-stretch: normal; +} + + +/* TypoPRO Fantasque Sans Mono Bold Italic */ +@font-face { + font-family: 'TypoPRO Fantasque Sans Mono'; + src: url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-BoldItalic.eot'); + src: local('*'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-BoldItalic.eot?#iefix') format('embedded-opentype'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-BoldItalic.woff') format('woff'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-BoldItalic.ttf') format('truetype'); + font-style: italic; + font-weight: bold; + font-stretch: normal; +} + + +/* TypoPRO Fantasque Sans Mono Regular */ +@font-face { + font-family: 'TypoPRO Fantasque Sans Mono'; + src: url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Regular.eot'); + src: local('*'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Regular.eot?#iefix') format('embedded-opentype'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Regular.woff') format('woff'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Regular.ttf') format('truetype'); + font-style: normal; + font-weight: normal; + font-stretch: normal; +} + + +/* TypoPRO Fantasque Sans Mono Regular Italic */ +@font-face { + font-family: 'TypoPRO Fantasque Sans Mono'; + src: url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-RegularItalic.eot'); + src: local('*'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-RegularItalic.eot?#iefix') format('embedded-opentype'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-RegularItalic.woff') format('woff'), + url('@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-RegularItalic.ttf') format('truetype'); + font-style: italic; + font-weight: normal; + font-stretch: normal; +} + diff --git a/resources/css/app.css b/resources/css/app.css index 584e298..9e85131 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,5 +1,5 @@ @import "@fontsource/quicksand"; -@import "@typopro/web-fantasque-sans-mono/TypoPRO-FantasqueSansMono-Regular"; +@import "TypoPRO-FantasqueSansMono"; @import "reset"; @import "utilities"; @import "links"; diff --git a/resources/views/article-card.blade.php b/resources/views/article-card.blade.php index ca86aa4..16a49c7 100644 --- a/resources/views/article-card.blade.php +++ b/resources/views/article-card.blade.php @@ -14,13 +14,13 @@ @if (!empty($bundle->metadata()->get('subTitle'))) {{ $bundle->metadata()->get('subTitle') }} @endif -
+
@if (!empty($date))

@endif @if (!empty($section))

{!! $section->getArticleTitle() !!}

@endif -
+ diff --git a/resources/views/article.blade.php b/resources/views/article.blade.php index 49d304c..7fa1bc5 100644 --- a/resources/views/article.blade.php +++ b/resources/views/article.blade.php @@ -32,7 +32,7 @@ class="{!! $mainLink['classes'] !!}" @if (!empty($body) || (isset($showToc) && $showToc)) -
+
@if(isset($showToc) && $showToc)
Sommaire @@ -60,7 +60,7 @@ class="{!! $mainLink['classes'] !!}"
@endif -
+ @endif @if(!empty($bundle->virtualMetadata()->all())) diff --git a/resources/views/components/image.blade.php b/resources/views/components/image.blade.php index eb62426..f469f42 100644 --- a/resources/views/components/image.blade.php +++ b/resources/views/components/image.blade.php @@ -5,10 +5,10 @@ @endif @if(!empty($options['nolink'])) - + {{ $originalData['alt'] ?? 'Texte alternatif non fourni' }} @else - + {{ $originalData['alt'] ?? 'Texte alternatif non fourni' }} @endif @if (empty($options['nolink']) && (!empty($originalData['title']) || !empty($originalData['attribution']))) diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php index f7ab4ce..d7f124b 100644 --- a/resources/views/components/pagination.blade.php +++ b/resources/views/components/pagination.blade.php @@ -1,11 +1,11 @@ @if (!empty($data['items'])) -
+
@foreach ($data['items'] as $bundle) {!! $bundle->renderCard() !!} @endforeach -
+ @endif diff --git a/resources/views/components/read-more.blade.php b/resources/views/components/read-more.blade.php index a90047b..d93eafb 100644 --- a/resources/views/components/read-more.blade.php +++ b/resources/views/components/read-more.blade.php @@ -1 +1 @@ -
@foreach ($bundles as $bundle){!! $bundle->renderCard() !!}@endforeach
+
@foreach ($bundles as $bundle){!! $bundle->renderCard() !!}@endforeach
diff --git a/resources/views/components/sound.blade.php b/resources/views/components/sound.blade.php index 52a0056..d9b37c1 100644 --- a/resources/views/components/sound.blade.php +++ b/resources/views/components/sound.blade.php @@ -1,6 +1,6 @@
@if (!empty($originalData['title'])) diff --git a/resources/views/components/video.blade.php b/resources/views/components/video.blade.php index 0e23e40..51be9cd 100644 --- a/resources/views/components/video.blade.php +++ b/resources/views/components/video.blade.php @@ -1,6 +1,6 @@
diff --git a/resources/views/dossier-card.blade.php b/resources/views/dossier-card.blade.php index d5f8135..ad9fe1c 100644 --- a/resources/views/dossier-card.blade.php +++ b/resources/views/dossier-card.blade.php @@ -1,13 +1,13 @@

{!! $bundle->getArticleTitle() !!}

-
+
@if (!empty($date))

@endif @if (!empty($section))

{!! $section->getArticleTitle() !!}

@endif -
+