diff --git a/.gitignore b/.gitignore index 37e1b44..32dd5b1 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,6 @@ Icon /kirby /vendor -/node_modules \ No newline at end of file +/node_modules + +/content \ No newline at end of file diff --git a/assets/css/src/article.css b/assets/css/src/article.css new file mode 100644 index 0000000..189444a --- /dev/null +++ b/assets/css/src/article.css @@ -0,0 +1,3 @@ +main.article { + margin-top: 0; +} diff --git a/assets/css/src/articles.css b/assets/css/src/articles.css deleted file mode 100644 index 515c50d..0000000 --- a/assets/css/src/articles.css +++ /dev/null @@ -1,31 +0,0 @@ -#articles { - margin: 0 var(--unit--horizontal); -} -#organize { - margin-bottom: calc(var(--unit--vertical)); -} -.article { - position: relative; - margin-bottom: calc(var(--unit--vertical) * 2); - box-sizing: border-box; -} - -.article__infos, -.article__labels { - transform: translateY(calc(0rem - (var(--unit--vertical) * 0.1))); -} - -.article__infos { - display: flex; -} - -.article__labels { - display: flex; -} - -.article .label { - margin-right: var(--unit--horizontal); - text-decoration: underline; - text-decoration-style: dotted; - text-underline-offset: 6px; -} diff --git a/assets/css/src/footer.css b/assets/css/src/footer.css index aaec82a..afead59 100644 --- a/assets/css/src/footer.css +++ b/assets/css/src/footer.css @@ -1,5 +1,8 @@ #main-footer { - position: absolute; + position: fixed; left: 0; bottom: 0; + width: calc(18 * var(--unit--horizontal)); + padding: var(--unit--horizontal); + padding-top: var(); } diff --git a/assets/css/src/generic.css b/assets/css/src/generic.css index f4ca74a..3928074 100644 --- a/assets/css/src/generic.css +++ b/assets/css/src/generic.css @@ -64,3 +64,11 @@ .flex.column { flex-direction: column; } + +/* ================= COLORS ================= */ +.color { + color: var(--color); +} +.opacity { + opacity: var(--opacity); +} diff --git a/assets/css/src/home.css b/assets/css/src/home.css new file mode 100644 index 0000000..cfb02a4 --- /dev/null +++ b/assets/css/src/home.css @@ -0,0 +1,3 @@ +main#home .toggle-btns { + margin-top: calc(var(--unit--vertical) * 6); +} diff --git a/assets/css/src/html.css b/assets/css/src/html.css index 5f46e5d..7332e02 100644 --- a/assets/css/src/html.css +++ b/assets/css/src/html.css @@ -26,6 +26,10 @@ html { scroll-behavior: smooth; } +main { + margin-top: calc(6 * var(--unit--vertical)); +} + /* Works on Firefox */ * { diff --git a/assets/css/src/tabs.css b/assets/css/src/tabs.css index 9f1292c..4b83435 100644 --- a/assets/css/src/tabs.css +++ b/assets/css/src/tabs.css @@ -1,3 +1,6 @@ +.toggle-btns { + position: sticky; +} button.toggle.open { font-weight: bold; } @@ -22,6 +25,9 @@ button.toggle.right.open::before { content: "-"; } -.content { - margin-top: calc(var(--unit--vertical) * 2); +.active-tab { + margin-top: calc(var(--unit--vertical) * 0.5); + overflow: auto; + max-height: calc(100vh - 7.5 * var(--unit--vertical)); + margin-bottom: calc(2 * var(--unit--vertical)); } diff --git a/assets/css/src/texts.css b/assets/css/src/texts.css index f471329..17247fb 100644 --- a/assets/css/src/texts.css +++ b/assets/css/src/texts.css @@ -12,11 +12,16 @@ font-family: "Switzer-Variable", sans-serif; } -h1 { +#logo * { font-size: 25vw; line-height: 4rem; transform: translate(-2px, -13px); - font-weight: 550; + font-weight: var(--font-weight-extra-bold); +} + +h3 { + font-size: var(--font-size-l); + font-weight: var(--font-weight-bold); } p, @@ -27,6 +32,18 @@ button, font-size: var(--font-size-m); line-height: calc(var(--unit--vertical)); } + +.fs-xl { + font-size: var(--font-size-xl); +} + +.title-center { + font-size: var(--font-size-m); + font-weight: var(--font-weight-light); + text-align: center; + width: 100%; +} + p, li, button, @@ -34,6 +51,20 @@ button, font-weight: var(--font-weight-light); } +.fw-bold { + font-weight: var(--font-weight-bold); +} + +.fw-extra-bold { + font-weight: var(--font-weight-extra-bold); +} + +.f-inherit { + font-size: inherit; + line-height: inherit; + font-weight: inherit; +} + .ta-center { text-align: center; } diff --git a/assets/css/src/variables.css b/assets/css/src/variables.css index 39e3dbd..b8d2192 100644 --- a/assets/css/src/variables.css +++ b/assets/css/src/variables.css @@ -7,9 +7,14 @@ --color-secondary--x-light: rgb(119, 177, 157, 0.15); --unit--horizontal: 5vw; - --unit--vertical: 1.3rem; + --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-weight-light: 200; + --font-weight-bold: 400; + --font-weight-extra-bold: 550; } diff --git a/assets/css/style.css b/assets/css/style.css index e3d8ed7..90046f8 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -5,4 +5,6 @@ @import url("src/texts.css"); @import url("src/header.css"); @import url("src/tabs.css"); +@import url("src/home.css"); +@import url("src/articles.css"); @import url("src/footer.css"); diff --git a/assets/js/script.js b/assets/js/script.js index 5059283..61d6095 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -1,13 +1,21 @@ const remFactor = 16; const verticalUnit = 1.3 * remFactor; -function openTab(data, tab) { - data.activeTab === tab ? (data.activeTab = "") : (data.activeTab = tab); +function toggleTab(data, tab) { + if (data.activeTab === tab) { + scrollToElem("body"); + setTimeout(() => { + data.activeTab = ""; + }, 200); + } else { + data.activeTab = tab; + scrollToElem(".active-tab"); + } } function scrollToElem(selector) { setTimeout(() => { - const yOffset = -9 * verticalUnit; + const yOffset = -7 * verticalUnit; const elem = document.querySelector(selector); const top = elem.getBoundingClientRect().top; window.scrollTo({ diff --git a/content/articles/1_1988/year.txt b/content/articles/1_1988/year.txt deleted file mode 100644 index 26e94c6..0000000 --- a/content/articles/1_1988/year.txt +++ /dev/null @@ -1,5 +0,0 @@ -Title: 1988 - ----- - -Uuid: QSTPXlaDnnN5uITb \ No newline at end of file diff --git a/content/articles/articles.txt b/content/articles/articles.txt deleted file mode 100644 index c9bea6b..0000000 --- a/content/articles/articles.txt +++ /dev/null @@ -1,9 +0,0 @@ -Title: Articles - ----- - -Categories: objet, texte, image, film, scène - ----- - -Uuid: IBp23Db7518Sg0V1 \ No newline at end of file diff --git a/content/error/error.txt b/content/error/error.txt deleted file mode 100644 index 13afef0..0000000 --- a/content/error/error.txt +++ /dev/null @@ -1,5 +0,0 @@ -Title: Error - ----- - -Uuid: atOcJYYJAw8Buk3z \ No newline at end of file diff --git a/content/home/home.txt b/content/home/home.txt deleted file mode 100644 index a06f769..0000000 --- a/content/home/home.txt +++ /dev/null @@ -1,5 +0,0 @@ -Title: Home - ----- - -Uuid: Ie9MrbnsQDy1oSUB \ No newline at end of file diff --git a/content/site.txt b/content/site.txt deleted file mode 100644 index c7740f5..0000000 --- a/content/site.txt +++ /dev/null @@ -1,9 +0,0 @@ -Title: actuel / inactuel - ----- - -Edito:
Leo tortor nunc placerat adipiscing diam elementum facilisis nunc elit eget nisl suspendisse accumsan tincidunt nisi urna sit leo arcu suspendisse eu congue eget id.
Et sollicitudin massa sem commodo elementum phasellus arcu diam purus tempus ex mi condimentum interdum maecenas scelerisque sed elit sem eget elit vel et a.
Ac rutrum elementum purus cursus quisque aliquam scelerisque scelerisque metus eu bibendum et euismod ac quisque aliquam tortor amet sollicitudin sit lorem portaest adipiscing sollicitudin.
Commodo morbi magna bibendum ut sem arcu ipsum maecenas vivamus quis tempus lacus urna quis morbi enim tincidunt nisi placerat quisque euismod eget tristique nunc.
Molestie cursus ex tempus varius gravida phasellus placerat quam varius maecenas nisl nunc facilisis nunc condimentum et mi purus interdum orci quis sollicitudin enim dolor.
- ----- - -Categories: texte, scène, image, film, objet \ No newline at end of file diff --git a/site/blueprints/pages/article.yml b/site/blueprints/pages/article.yml deleted file mode 100644 index fdf4ecd..0000000 --- a/site/blueprints/pages/article.yml +++ /dev/null @@ -1,36 +0,0 @@ -title: Article -image: - back: black - -tabs: - contentTab: - label: Contenu - sections: - bodySection: - label: Corps - type: fields - fields: - body: - label: Corps - type: textarea - metaTab: - label: Métadonnées - sections: - metadata: - type: fields - fields: - published: - label: Date de publication - type: date - default: today - width: 1/3 - category: - label: Catégorie - type: select - options: query - query: site.categories.split - width: 1/3 - author: - label: Auteur - type: users - width: 1/3 diff --git a/site/blueprints/pages/articles.yml b/site/blueprints/pages/articles.yml index 9bd5358..992ea86 100644 --- a/site/blueprints/pages/articles.yml +++ b/site/blueprints/pages/articles.yml @@ -11,3 +11,4 @@ columns: label: Années type: pages template: year + sortBy: title desc diff --git a/site/blueprints/pages/blocks.yml b/site/blueprints/pages/blocks.yml new file mode 100644 index 0000000..0d66478 --- /dev/null +++ b/site/blueprints/pages/blocks.yml @@ -0,0 +1,17 @@ +title: Blocs +image: + back: black +icon: bars + +tabs: + contentTab: + label: Contenu + sections: + bodySection: + label: Corps + type: fields + fields: + body: + label: Corps + type: layout + metaTab: tabs/meta diff --git a/site/blueprints/pages/linear.yml b/site/blueprints/pages/linear.yml new file mode 100644 index 0000000..35b15b7 --- /dev/null +++ b/site/blueprints/pages/linear.yml @@ -0,0 +1,20 @@ +title: Linéaire +image: + back: black +icon: bars +create: + fields: + - category + +tabs: + contentTab: + label: Contenu + sections: + bodySection: + label: Corps + type: fields + fields: + body: + label: Corps + type: writer + metaTab: tabs/meta diff --git a/site/blueprints/pages/year.yml b/site/blueprints/pages/year.yml index 04de684..d484825 100644 --- a/site/blueprints/pages/year.yml +++ b/site/blueprints/pages/year.yml @@ -8,8 +8,10 @@ columns: sections: articles: type: pages - template: article + templates: + - linear + - blocks - width: 2/3 fields: edito: - type: textarea + type: writer diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml index a4eb933..b2860f3 100644 --- a/site/blueprints/site.yml +++ b/site/blueprints/site.yml @@ -3,15 +3,7 @@ title: Site tabs: contentTab: label: Contenu - columns: - - width: 1/3 - sections: - informativePages: - label: Pages d'informations - type: pages - template: static - - width: 2/3 - fields: - edito: - label: Éditorial - type: writer + fields: + edito: + label: Éditorial + type: writer diff --git a/site/blueprints/tabs/meta.yml b/site/blueprints/tabs/meta.yml new file mode 100644 index 0000000..1cf3c4d --- /dev/null +++ b/site/blueprints/tabs/meta.yml @@ -0,0 +1,20 @@ +label: Métadonnées +sections: + metadata: + type: fields + fields: + published: + label: Date de publication + type: date + default: today + width: 1/3 + category: + label: Catégorie + type: select + options: query + query: site.categories.split + width: 1/3 + author: + label: Auteur + type: users + width: 1/3 diff --git a/site/blueprints/users/admin.yml b/site/blueprints/users/admin.yml index 25ed8d7..c72820a 100644 --- a/site/blueprints/users/admin.yml +++ b/site/blueprints/users/admin.yml @@ -1,4 +1,4 @@ -title: Adminitrateur +title: Adminitrateurs description: Un administrateur a tous les droits. image: icon: star-filled diff --git a/site/blueprints/users/author.yml b/site/blueprints/users/author.yml new file mode 100644 index 0000000..b1a581a --- /dev/null +++ b/site/blueprints/users/author.yml @@ -0,0 +1,30 @@ +title: Auteurs +description: Un auteur a tous les droits. +image: + icon: pen + +permissions: + access: + *: false + files: + *: false + languages: + *: false + pages: + *: false + site: + *: false + user: + *: false + users: + *: false + +columns: + - width: 1/2 + fields: + link: + label: Lien + - width: 1/2 + fields: + presentation: + type: writer diff --git a/site/collections/articles.php b/site/collections/articles.php deleted file mode 100644 index 058250f..0000000 --- a/site/collections/articles.php +++ /dev/null @@ -1,5 +0,0 @@ -index(); -}; \ No newline at end of file diff --git a/site/collections/years.php b/site/collections/years.php new file mode 100644 index 0000000..323c68c --- /dev/null +++ b/site/collections/years.php @@ -0,0 +1,5 @@ +find('articles')->children(); +}; \ No newline at end of file diff --git a/site/config/config.php b/site/config/config.php index a9fa6c9..98d300e 100644 --- a/site/config/config.php +++ b/site/config/config.php @@ -12,7 +12,7 @@ return [ } ], 'articles' => [ - 'icon' => 'folder', + 'icon' => 'pen', 'label' => 'Articles', 'link' => 'pages/articles', 'current' => function ($current) { @@ -21,6 +21,25 @@ return [ } ], '-', + 'infos' => [ + 'icon' => 'question', + 'label' => 'À propos', + 'link' => 'pages/a-propos', + 'current' => function ($current) { + $path = Kirby::instance()->request()->path()->toString(); + return Str::contains($path, 'pages/a-propos'); + } + ], + 'newsletter' => [ + 'icon' => 'email', + 'label' => 'Lettre', + 'link' => 'pages/lettre', + 'current' => function ($current) { + $path = Kirby::instance()->request()->path()->toString(); + return Str::contains($path, 'pages/lettre'); + } + ], + '-', 'users', 'system' ] diff --git a/site/plugins/panel-text-comments/.editorconfig b/site/plugins/panel-text-comments/.editorconfig new file mode 100644 index 0000000..3b762c9 --- /dev/null +++ b/site/plugins/panel-text-comments/.editorconfig @@ -0,0 +1,20 @@ +# This file is for unifying the coding style for different editors and IDEs +# editorconfig.org + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.php] +indent_size = 4 + +[*.md,*.txt] +trim_trailing_whitespace = false +insert_final_newline = false + +[composer.json] +indent_size = 4 diff --git a/site/plugins/panel-text-comments/.gitattributes b/site/plugins/panel-text-comments/.gitattributes new file mode 100644 index 0000000..033ba13 --- /dev/null +++ b/site/plugins/panel-text-comments/.gitattributes @@ -0,0 +1,11 @@ +# Note: You need to uncomment the lines you want to use; the other lines can be deleted + +# Git +# .gitattributes export-ignore +# .gitignore export-ignore + +# Tests +# /.coveralls.yml export-ignore +# /.travis.yml export-ignore +# /phpunit.xml.dist export-ignore +# /tests/ export-ignore diff --git a/site/plugins/panel-text-comments/.gitignore b/site/plugins/panel-text-comments/.gitignore new file mode 100644 index 0000000..4d81cf5 --- /dev/null +++ b/site/plugins/panel-text-comments/.gitignore @@ -0,0 +1,14 @@ +# OS files +.DS_Store + +# npm modules +/node_modules + +# Parcel cache folder +.cache + +# Composer files +/vendor + +# kirbyup temp development entry +/index.dev.mjs diff --git a/site/plugins/panel-text-comments/LICENSE.md b/site/plugins/panel-text-comments/LICENSE.md new file mode 100755 index 0000000..8e663d7 --- /dev/null +++ b/site/plugins/panel-text-comments/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c)