diff --git a/assets/css/src/article.css b/assets/css/src/article.css index 189444a..740af2c 100644 --- a/assets/css/src/article.css +++ b/assets/css/src/article.css @@ -1,3 +1,10 @@ main.article { margin-top: 0; } + +.article-header { + --margin-left: 2; + padding-left: calc(var(--unit--horizontal) * var(--margin-left)); + margin-bottom: calc(var(--unit--vertical) * 4); + width: calc(100% - (var(--margin-left) * var(--unit--horizontal))); +} diff --git a/assets/css/src/texts.css b/assets/css/src/texts.css index 17247fb..861de9e 100644 --- a/assets/css/src/texts.css +++ b/assets/css/src/texts.css @@ -33,8 +33,20 @@ button, line-height: calc(var(--unit--vertical)); } +.fs-s { + font-size: var(--font-size-s) !important; +} +.fs-m { + font-size: var(--font-size-m) !important; +} +.fs-l { + font-size: var(--font-size-l) !important; +} .fs-xl { - font-size: var(--font-size-xl); + font-size: var(--font-size-xl) !important; +} +.fs-xxl { + font-size: var(--font-size-xxl) !important; } .title-center { @@ -44,6 +56,13 @@ button, width: 100%; } +.main-title { + line-height: 1; + text-align: left; + box-sizing: border-box; + margin-bottom: 1rem; +} + p, li, button, diff --git a/assets/css/src/variables.css b/assets/css/src/variables.css index b8d2192..c817a8b 100644 --- a/assets/css/src/variables.css +++ b/assets/css/src/variables.css @@ -10,9 +10,10 @@ --unit--vertical: 1.7rem; --font-size-s: 0.8rem; - --font-size-m: 1.2rem; - --font-size-l: 1.5rem; - --font-size-xl: 3.7rem; + --font-size-m: calc(var(--font-size-s) * 1.5); + --font-size-l: calc(var(--font-size-m) * 1.5); + --font-size-xl: calc(var(--font-size-l) * 1.5); + --font-size-xxl: calc(var(--font-size-xl) * 1.5); --font-weight-light: 200; --font-weight-bold: 400; diff --git a/site/blueprints/pages/articles.yml b/site/blueprints/pages/texts.yml similarity index 100% rename from site/blueprints/pages/articles.yml rename to site/blueprints/pages/texts.yml diff --git a/site/blueprints/pages/year.yml b/site/blueprints/pages/year.yml index fdf4f17..5c84ef1 100644 --- a/site/blueprints/pages/year.yml +++ b/site/blueprints/pages/year.yml @@ -7,6 +7,7 @@ columns: - width: 1/3 sections: texts: + label: Textes type: pages templates: - linear diff --git a/site/blueprints/users/admin.yml b/site/blueprints/users/admin.yml index c72820a..ebd2b1e 100644 --- a/site/blueprints/users/admin.yml +++ b/site/blueprints/users/admin.yml @@ -3,12 +3,6 @@ description: Un administrateur a tous les droits. image: icon: star-filled -columns: - - width: 1/2 - fields: - link: - label: Lien - - width: 1/2 - fields: - presentation: - type: writer +fields: + presentation: + type: writer diff --git a/site/blueprints/users/author.yml b/site/blueprints/users/author.yml index b1a581a..53bc4f7 100644 --- a/site/blueprints/users/author.yml +++ b/site/blueprints/users/author.yml @@ -19,12 +19,6 @@ permissions: users: *: false -columns: - - width: 1/2 - fields: - link: - label: Lien - - width: 1/2 - fields: - presentation: - type: writer +fields: + presentation: + type: writer diff --git a/site/config/config.php b/site/config/config.php index a5fcfd1..dda8bdc 100644 --- a/site/config/config.php +++ b/site/config/config.php @@ -1,5 +1,7 @@ true, 'panel' => [ @@ -44,5 +46,25 @@ return [ 'comments', 'system' ] - ] + ], + 'routes' => [ + [ + 'pattern' => 'auteur/(:any)', + 'action' => function ($slug) { + $kirby = kirby(); + $author = getAuthorBySlug($slug); + + return Page::factory([ + 'slug' => '', + 'template' => 'author', + 'model' => 'authors', + 'content' => [ + 'title' => $author->name(), + 'presentation' => $author->presentation(), + 'uuid' => Uuid::generate(), + ] + ]); + } + ] + ] ]; diff --git a/site/plugins/helpers/index.php b/site/plugins/helpers/index.php new file mode 100644 index 0000000..c01e7ad --- /dev/null +++ b/site/plugins/helpers/index.php @@ -0,0 +1,37 @@ +users() as $user) { + + if (Str::slug($user->name()) === $slug) { + + $author = $user; + } + } + + return $author; +} diff --git a/site/snippets/header.php b/site/snippets/header.php index 024d3dd..0c91f34 100644 --- a/site/snippets/header.php +++ b/site/snippets/header.php @@ -4,7 +4,7 @@