From 0fed6cfd12c9ad111901944be61c9d33bbebd4d5 Mon Sep 17 00:00:00 2001 From: isUnknown Date: Tue, 12 Mar 2024 17:12:03 +0100 Subject: [PATCH] header style --- assets/css/src/header.css | 6 +- assets/css/src/html.css | 1 - assets/css/src/{article.css => linear.css} | 0 assets/css/src/tabs.css | 13 +- assets/css/src/texts.css | 19 +- assets/css/style.css | 2 +- assets/dist/script.js | 26 +- assets/dist/style.css | 330 +----------------- site/blueprints/pages/admin-folder.yml | 41 +++ site/blueprints/pages/admin-home.yml | 18 + site/blueprints/tabs/meta.yml | 1 + site/blueprints/users/admin.yml | 7 +- site/blueprints/users/author.yml | 7 +- site/cache/index.html | 0 site/config/config.php | 17 +- .../plugins/panel-text-comments/.editorconfig | 20 -- .../panel-text-comments/.gitattributes | 11 - site/plugins/panel-text-comments/.gitignore | 14 - site/plugins/panel-text-comments/LICENSE.md | 21 -- site/plugins/panel-text-comments/README.md | 117 ------- site/plugins/panel-text-comments/SECURITY.md | 18 - .../plugins/panel-text-comments/composer.json | 21 -- .../plugins/panel-text-comments/composer.lock | 66 ---- site/plugins/panel-text-comments/index.css | 2 - site/plugins/panel-text-comments/index.js | 15 - site/plugins/panel-text-comments/index.php | 3 - site/plugins/panel-text-comments/package.json | 7 - site/plugins/panel-text-comments/src/index.js | 12 - site/snippets/tabs.php | 2 +- site/templates/linear.php | 2 +- 30 files changed, 125 insertions(+), 694 deletions(-) rename assets/css/src/{article.css => linear.css} (100%) create mode 100644 site/blueprints/pages/admin-folder.yml create mode 100644 site/blueprints/pages/admin-home.yml delete mode 100644 site/cache/index.html delete mode 100644 site/plugins/panel-text-comments/.editorconfig delete mode 100644 site/plugins/panel-text-comments/.gitattributes delete mode 100644 site/plugins/panel-text-comments/.gitignore delete mode 100755 site/plugins/panel-text-comments/LICENSE.md delete mode 100755 site/plugins/panel-text-comments/README.md delete mode 100644 site/plugins/panel-text-comments/SECURITY.md delete mode 100755 site/plugins/panel-text-comments/composer.json delete mode 100644 site/plugins/panel-text-comments/composer.lock delete mode 100644 site/plugins/panel-text-comments/index.css delete mode 100644 site/plugins/panel-text-comments/index.js delete mode 100755 site/plugins/panel-text-comments/index.php delete mode 100644 site/plugins/panel-text-comments/package.json delete mode 100755 site/plugins/panel-text-comments/src/index.js diff --git a/assets/css/src/header.css b/assets/css/src/header.css index 42ddd77..aaa93dc 100644 --- a/assets/css/src/header.css +++ b/assets/css/src/header.css @@ -4,7 +4,7 @@ top: 0; left: 0; box-sizing: border-box; - width: 100%; + width: 100vw; height: calc(var(--unit--vertical) * 5); padding: var(--unit--vertical) var(--unit--horizontal); transition: height 0.2s ease-in-out; @@ -37,11 +37,11 @@ .page-cover { box-sizing: border-box; - height: 100vh; + height: 100svh; display: flex; flex-direction: column; justify-content: space-between; - padding-top: calc(8 * var(--unit--vertical)); + padding-top: 25svh; padding-bottom: calc(5 * var(--unit--vertical)); } diff --git a/assets/css/src/html.css b/assets/css/src/html.css index 3275b73..3db9f3d 100644 --- a/assets/css/src/html.css +++ b/assets/css/src/html.css @@ -1,7 +1,6 @@ body { position: relative; box-sizing: border-box; - min-height: 100vh; padding: 0 var(--unit--horizontal); background-color: var(--color-background); color: var(--color-primary); diff --git a/assets/css/src/article.css b/assets/css/src/linear.css similarity index 100% rename from assets/css/src/article.css rename to assets/css/src/linear.css diff --git a/assets/css/src/tabs.css b/assets/css/src/tabs.css index 2750f2a..ca12a67 100644 --- a/assets/css/src/tabs.css +++ b/assets/css/src/tabs.css @@ -26,16 +26,9 @@ button.toggle.right.open::before { } #tabs { - --mg: 4; position: relative; - margin-top: calc(0px - (2 * var(--unit--vertical))); - margin-bottom: calc((var(--mg) / 2) * var(--unit--vertical)); -} -#tabs.safari { - margin-top: calc(-60px - (3 * var(--unit--vertical))); -} -#home #tabs { - margin-top: calc(0px - (6 * var(--unit--vertical))); + margin-top: -30svh; + margin-bottom: 30svh; } .active-tab { @@ -46,7 +39,7 @@ button.toggle.right.open::before { } .page-cover.open .active-tab { - height: calc(100vh - 7.5 * var(--unit--vertical)); + height: calc(100svh - 7.5 * var(--unit--vertical)); } .texts__year.short .year__edito { diff --git a/assets/css/src/texts.css b/assets/css/src/texts.css index a45ba62..cc82e25 100644 --- a/assets/css/src/texts.css +++ b/assets/css/src/texts.css @@ -19,9 +19,13 @@ font-weight: var(--font-weight-extra-bold); } -h3 { - font-size: var(--font-size-l); - font-weight: var(--font-weight-bold); +h1, +h2, +h3, +h4, +h5, +p { + font-weight: var(--font-weight-light); } p, @@ -50,17 +54,16 @@ button, } .title-center { - font-size: var(--font-size-m); - font-weight: var(--font-weight-light); - width: 100%; - margin-left: calc(5 * var(--unit--horizontal)); + --margin-left: calc(4 * var(--unit--horizontal)); + width: calc(100% - var(--margin-left)); + margin-left: var(--margin-left); } .main-title { line-height: 1; text-align: left; box-sizing: border-box; - margin-bottom: 1rem; + font-weight: var(--font-weight-light); } p, diff --git a/assets/css/style.css b/assets/css/style.css index ff26a7c..58311db 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -6,5 +6,5 @@ @import url("src/header.css"); @import url("src/tabs.css"); @import url("src/home.css"); -@import url("src/article.css"); +@import url("src/linear.css"); @import url("src/footer.css"); diff --git a/assets/dist/script.js b/assets/dist/script.js index 6c84d21..078e328 100644 --- a/assets/dist/script.js +++ b/assets/dist/script.js @@ -1,16 +1,29 @@ "use strict"; -function openTab(data, tab) { - data.activeTab === tab ? (data.activeTab = "") : (data.activeTab = tab); +var remFactor = 16; +var verticalUnit = 1.3 * remFactor; +function toggleTab(data, tab) { + if (data.activeTab === tab) { + scrollToElem("body"); + setTimeout(function () { + data.activeTab = ""; + data.isOpen = false; + }, 200); + } else { + data.activeTab = tab; + data.isOpen = true; + scrollToElem(".active-tab"); + } } function scrollToElem(selector) { + document.querySelector(".active-tab").scrollTop = 0; setTimeout(function () { - var yOffset = -185; + var yOffset = -7 * verticalUnit; var elem = document.querySelector(selector); var top = elem.getBoundingClientRect().top; window.scrollTo({ top: top + window.scrollY + yOffset, - behavior: "smooth", + behavior: "smooth" }); }, 100); } @@ -26,4 +39,7 @@ document.addEventListener("DOMContentLoaded", function () { window.addEventListener("scroll", function () { toggleLogoState(); }); -}); + if (navigator.userAgent.toLowerCase().includes("safari") && window.innerWidth < 800) { + document.querySelector("#tabs").classList.add("safari"); + } +}); \ No newline at end of file diff --git a/assets/dist/style.css b/assets/dist/style.css index 0315c11..f27cd78 100644 --- a/assets/dist/style.css +++ b/assets/dist/style.css @@ -1,329 +1 @@ -@font-face { - font-family: Switzer-Variable; - src: url(/assets/fonts/Switzer-Variable.woff2) format("woff2"), - url(/assets/fonts/Switzer-Variable.woff) format("woff"), - url(/assets/fonts/Switzer-Variable.ttf) format("truetype"); - font-weight: 100 900; - font-display: swap; - font-style: normal; -} -body, -h1, -h2, -h3, -h4, -h5, -html, -p, -ul { - margin: 0; - padding: 0; -} -button { - background: none; - border: none; - padding: 0; - font: inherit; - cursor: pointer; - outline: inherit; -} -a, -button { - color: inherit; -} -a { - text-decoration: none; -} -li { - list-style-type: none; -} -body, -html { - scroll-behavior: smooth; -} -* { - scrollbar-width: thin; - scrollbar-color: rgba(0, 0, 0, 0.1) transparent; -} -::-webkit-scrollbar { - width: 6px; - height: 6px; -} -::-webkit-scrollbar-track { - background: transparent; -} -::-webkit-scrollbar-thumb { - background-color: rgba(0, 0, 0, 0.1); - border-radius: 0; - border: none; -} -:root { - --color-background: #000; - --color-primary: #fff; - --color-primary--transparent: hsla(0, 0%, 100%, 0.86); - --color-secondary: rgba(120, 171, 150, 0.86); - --color-secondary--light: rgba(119, 177, 157, 0.25); - --color-secondary--x-light: rgba(119, 177, 157, 0.15); - --unit--horizontal: 5vw; - --unit--vertical: 1.3rem; - --font-size-m: 1.2rem; -} -* { - font-family: Switzer-Variable, sans-serif; -} -.hidden { - display: none; -} -.grid { - background-size: var(--unit--horizontal) var(--unit--vertical); - background-image: linear-gradient( - 90deg, - var(--color-secondary--x-light) 1px, - transparent 0 - ), - linear-gradient(180deg, var(--color-secondary--light) 1px, transparent 0), - linear-gradient(180deg, var(--color-secondary--x-light) 1px, transparent 0); - background-position: 0 0, 0 0, 0 calc(var(--unit--vertical) / 2); - background-attachment: fixed; -} -hr { - height: calc(var(--unit--vertical) / 2); - border: none; - background-color: var(--color-primary); - width: calc(var(--unit--horizontal) * 4); - margin: calc(var(--unit--vertical) * 2) calc(var(--unit--horizontal)); -} -hr.center { - width: calc(100% - (var(--unit--horizontal) * 2)); -} -nav hr { - background-color: var(--color-background); - margin-left: 0; -} -h1 { - font-size: 25vw; - line-height: 4rem; - transform: translate(-2px, -13px); - font-weight: 550; -} -#baseline, -button, -li, -p { - transform: translateY(calc(var(--unit--vertical) * 0.12)); - font-weight: lighter; - font-size: var(--font-size-m); - line-height: calc(var(--unit--vertical)); -} -p { - transform: translateY(3px); -} -button { - display: flex; - align-items: center; -} -article p { - margin-bottom: var(--unit--vertical); -} -#main-header { - position: fixed; - z-index: 1; - top: 0; - left: 0; - box-sizing: border-box; - width: 100%; - height: calc(var(--unit--vertical) * 5); - padding: var(--unit--vertical) var(--unit--horizontal); - transition: height 0.2s ease-in-out; -} -#main-header.minimized { - height: calc(var(--unit--vertical) * 3); -} -#logo, -#logo-nav { - position: relative; -} -#logo-nav { - margin-top: var(--unit--vertical); - margin-left: var(--unit--horizontal); -} -#main-header.open #actuel { - color: var(--color-background); -} -#logo #actuel, -#logo-nav #actuel-nav { - color: var(--color-primary--transparent); - position: relative; - z-index: 1; - margin-left: calc(var(--unit--horizontal) * 2); -} -#logo #inactuel, -#logo-nav #inactuel-nav { - position: absolute; - z-index: 0; - color: var(--color-secondary); - bottom: -48%; - transition: bottom 0.2s ease-in-out; -} -#main-header.minimized #logo #inactuel, -#main-header.minimized #logo-nav #inactuel-nav { - bottom: 0; -} -#nav-btn { - z-index: 3; - position: absolute; - top: var(--unit--vertical); - right: var(--unit--horizontal); - width: calc(var(--unit--horizontal) * 2); - height: var(--unit--vertical); - display: flex; - justify-content: center; -} -#nav-btn .line-center, -#nav-btn .line-down, -#nav-btn .line-up { - position: absolute; - height: 2px; - background-color: var(--color-primary); - transition: all 0.3s ease-in-out; -} -#main-header.open .line-center, -#main-header.open .line-down, -#main-header.open .line-up { - background-color: var(--color-background); -} -#nav-btn .line-up { - width: var(--unit--horizontal); - transform: translateY(calc(0rem - (var(--unit--vertical) / 3))) rotate(0deg); -} -#nav-btn .line-center { - height: 4px; - width: calc(var(--unit--horizontal) * 2); -} -#nav-btn .line-down { - width: var(--unit--horizontal); - transform: translateY(calc(var(--unit--vertical) / 3)) rotate(0deg); -} -#nav-btn.open .line-up { - transform: translateY(0) rotate(90deg); - width: calc(var(--unit--horizontal) * 2); -} -#nav-btn.open .line-center { - height: 2px; -} -#nav-btn.open .line-down { - transform: translateY(0) rotate(-45deg); - width: calc(var(--unit--vertical) * 2); -} -nav { - position: fixed; - z-index: 2; - top: 0; - left: 0; - width: 100vw; - height: 0; - background-color: var(--color-primary); - color: var(--color-background); - overflow: hidden; - transition: all 0.5s ease-in-out; -} -#main-header.open nav { - height: 100vh; -} -#spaces { - margin-left: var(--unit--horizontal); -} -#spaces li { - margin-bottom: var(--unit--vertical); -} -#spaces, -main { - margin-top: calc(var(--unit--vertical) * 6); -} -#baseline { - font-weight: 300; - margin-left: calc(var(--unit--horizontal) * 5); - margin-bottom: calc(var(--unit--vertical) * 10); - width: calc(var(--unit--horizontal) * 12); -} -section.closed { - height: var(--unit--vertical); -} -h2.right { - display: flex; - justify-content: flex-end; - color: var(--color-secondary); -} -h2.left:before, -h2.right:after { - display: inline-block; - content: ""; - height: calc(var(--unit--vertical) / 2); - background-color: var(--color-primary); - width: calc(var(--unit--horizontal) * 1); -} -h2.right:after { - margin-right: calc(0vw - var(--unit--horizontal)); - margin-left: var(--unit--horizontal); - background-color: var(--color-secondary); -} -h2.left:before { - margin-left: calc(0vw - var(--unit--horizontal)); - margin-right: var(--unit--horizontal); -} -h2.left.open:before { - width: calc(var(--unit--horizontal) * 4); -} -.toggle-btns { - display: flex; - justify-content: space-between; -} -button.toggle.open { - font-weight: 700; -} -button.toggle.left:after { - margin-left: var(--unit--horizontal); -} -button.toggle.left.close:after { - content: "+"; -} -button.toggle.left.open:after { - content: "-"; -} -button.toggle.right:before { - margin-right: var(--unit--horizontal); -} -button.toggle.right.close:before { - content: "+"; -} -button.toggle.right.open:before { - content: "-"; -} -.content { - margin-top: calc(var(--unit--vertical) * 2); -} -#texts { - margin: 0 var(--unit--horizontal); -} -#organize { - margin-bottom: calc(var(--unit--vertical)); -} -.texts { - position: relative; - margin-bottom: calc(var(--unit--vertical) * 2); - box-sizing: border-box; -} -.texts__infos, -.texts__labels { - transform: translateY(calc(0rem - (var(--unit--vertical) * 0.1))); -} -.texts__infos, -.texts__labels { - display: flex; -} -.texts .label { - margin-right: var(--unit--horizontal); - text-decoration: underline; - text-decoration-style: dotted; - text-underline-offset: 6px; -} +body,h1,h2,h3,h4,h5,html,p,ul{margin:0;padding:0}button{background:none;border:none;padding:0;font:inherit;cursor:pointer;outline:inherit}a,button{color:inherit}a{text-decoration:none}li{list-style-type:none}:root{--color-background:#000;--color-primary:#fff;--color-primary--transparent:hsla(0,0%,100%,.86);--color-secondary:rgba(120,171,150,.86);--color-secondary--light:rgba(119,177,157,.25);--color-secondary--x-light:rgba(119,177,157,.15);--unit--horizontal:5vw;--unit--vertical:1.7rem;--font-size-s:0.8rem;--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;--font-weight-extra-bold:550}@media screen and (min-width:640px){:root{--color-background:#000;--color-primary:#fff;--color-primary--transparent:hsla(0,0%,100%,.86);--color-secondary:rgba(120,171,150,.86);--color-secondary--light:rgba(119,177,157,.25);--color-secondary--x-light:rgba(119,177,157,.15);--unit--horizontal:5vw;--unit--vertical:1.7rem;--font-size-s:0.9rem;--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;--font-weight-extra-bold:550}}body{position:relative;box-sizing:border-box;min-height:100vh;padding:0 var(--unit--horizontal);background-color:var(--color-background);color:var(--color-primary)}hr{height:calc(var(--unit--vertical) / 2);border:none;background-color:var(--color-primary);width:calc(var(--unit--horizontal) * 4);margin:calc(var(--unit--vertical) * 2) calc(var(--unit--horizontal))}nav hr{background-color:var(--color-background);margin-left:0}body,html{scroll-behavior:smooth}*{scrollbar-width:thin;scrollbar-color:rgba(0,0,0,.1) transparent}::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-track{background:transparent}::-webkit-scrollbar-thumb{background-color:rgba(0,0,0,.1);border-radius:0;border:none}@media screen and (min-width:640px){body{padding:0 calc(6 * var(--unit--horizontal))}}.hidden{display:none}.grid{background-size:var(--unit--horizontal) var(--unit--vertical);background-image:linear-gradient(90deg,var(--color-secondary--x-light) 1px,transparent 0),linear-gradient(180deg,var(--color-secondary--light) 1px,transparent 0),linear-gradient(180deg,var(--color-secondary--x-light) 1px,transparent 0);background-position:0 0,0 0,0 calc(var(--unit--vertical) / 2);background-attachment:fixed}.left:not(.padding){margin-left:calc(var(--unit--horizontal) * var(--left))}.padding.left{padding-left:calc(var(--unit--horizontal) * var(--left))}.top:not(.padding){margin-top:calc(var(--unit--vertical) * var(--top))}.padding.top{padding-top:calc(var(--unit--vertical) * var(--top))}.right:not(.padding){margin-right:calc(var(--unit--horizontal) * var(--right))}.padding.right{padding-right:calc(var(--unit--horizontal) * var(--right))}.bottom:not(.padding){margin-bottom:calc(var(--unit--vertical) * var(--bottom))}.padding.bottom{padding-bottom:calc(var(--unit--vertical) * var(--bottom))}.full-width{width:100%}.width{width:calc(var(--unit--horizontal) * var(--width))}.flex{display:flex;justify-content:var(--content);align-items:var(--align);gap:calc(var(--gap) * var(--unit--horizontal))}.flex.column{flex-direction:column}.color{color:var(--color)}.opacity{opacity:var(--opacity)}@font-face{font-family:Switzer-Variable;src:url(/assets/fonts/Switzer-Variable.woff2) format("woff2"),url(/assets/fonts/Switzer-Variable.woff) format("woff"),url(/assets/fonts/Switzer-Variable.ttf) format("truetype");font-weight:100 900;font-display:swap;font-style:normal}*{font-family:Switzer-Variable,sans-serif}#logo *{font-size:25vw;line-height:4rem;transform:translate(-2px,-13px);font-weight:var(--font-weight-extra-bold)}h3{font-size:var(--font-size-l);font-weight:var(--font-weight-bold)}.fs-m,button,li,p{transform:translateY(calc(var(--unit--vertical) * .12));font-size:var(--font-size-m);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)!important}.fs-xxl{font-size:var(--font-size-xxl)!important}.title-center{font-size:var(--font-size-m);font-weight:var(--font-weight-light);width:100%;margin-left:calc(5 * var(--unit--horizontal))}.main-title{line-height:1;text-align:left;box-sizing:border-box;margin-bottom:1rem}.fw-light,button,li,p{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}p{transform:translateY(3px)}button{display:flex;align-items:center}a:not(.no-line){-webkit-text-decoration:dotted;text-decoration:dotted;text-decoration-color:#fff;text-decoration-line:underline;text-underline-offset:.2rem;text-decoration-thickness:.5px}article p{margin-bottom:var(--unit--vertical)}@media screen and (min-width:640px){.title-center{margin-left:calc(2 * var(--unit--horizontal))}}#main-header{position:fixed;z-index:1;top:0;left:0;box-sizing:border-box;width:100%;height:calc(var(--unit--vertical) * 5);padding:var(--unit--vertical) var(--unit--horizontal);transition:height .2s ease-in-out}#main-header.minimized{height:calc(var(--unit--vertical) * 3)}#logo{position:relative}#main-header.open #actuel{color:var(--color-background)}#logo #actuel{color:var(--color-primary--transparent);position:relative;z-index:1}#logo #inactuel{position:absolute;z-index:0;color:var(--color-secondary);bottom:-48%;transition:bottom .2s ease-in-out}#main-header.minimized #logo #inactuel{bottom:0}.page-cover{box-sizing:border-box;height:100vh;display:flex;flex-direction:column;justify-content:space-between;padding-top:calc(8 * var(--unit--vertical));padding-bottom:calc(5 * var(--unit--vertical))}@media screen and (min-width:640px){#main-header{display:flex;justify-content:center}#logo{width:37vw}#logo *{font-size:11vw}#main-header.minimized{height:calc(var(--unit--vertical) * 4.3)}.page-cover{padding:calc(10 * var(--unit--vertical)) 0}}.toggle-btns{position:sticky}button.toggle.open:not(.see-more){font-weight:700}button.toggle.left:after{margin-left:var(--unit--horizontal)}button.toggle.left.close:after{content:"+"}button.toggle.left.open:after{content:"-"}button.toggle.right:before{margin-right:var(--unit--horizontal)}button.toggle.right.close:before{content:"+"}button.toggle.right.open:before{content:"-"}#tabs{--mg:4;position:relative;margin-top:calc(0px - (2 * var(--unit--vertical)));margin-bottom:calc((var(--mg) / 2) * var(--unit--vertical))}#tabs.safari{margin-top:calc(-60px - (3 * var(--unit--vertical)))}#home #tabs{margin-top:calc(0px - (6 * var(--unit--vertical)))}.active-tab{max-height:70vh;overflow:auto;margin-top:calc((var(--unit--vertical) * .5));transition:height .5s ease-in-out}.page-cover.open .active-tab{height:calc(100vh - 7.5 * var(--unit--vertical))}.texts__year.short .year__edito{display:-webkit-box;-webkit-line-clamp:3;overflow:hidden}.texts__year .see-more{width:100%;margin-top:calc(var(--unit--vertical) / 2)}@media screen and (min-width:640px){#home #tabs{margin-top:calc(0px - (10 * var(--unit--vertical)))}button.toggle.left:after{margin-left:calc(var(--unit--horizontal) / 2)}button.toggle.right:before{margin-right:calc(var(--unit--horizontal) / 2)}}.article-header .title-wrapper{--margin-left:2;width:calc(100% - (var(--margin-left) * var(--unit--horizontal)));padding-left:calc(var(--margin-left) * var(--unit--horizontal))}#main-footer{position:fixed;left:0;bottom:0;width:calc(18 * var(--unit--horizontal));padding:var(--unit--horizontal)}#main-footer a{text-shadow:0 0 2px #000;-moz-text-shadow:0 0 2px #000;-webkit-text-shadow:0 0 2px #000}@media screen and (min-width:640px){#main-footer{padding:calc(var(--unit--horizontal) / 2) var(--unit--horizontal)}} \ No newline at end of file diff --git a/site/blueprints/pages/admin-folder.yml b/site/blueprints/pages/admin-folder.yml new file mode 100644 index 0000000..ffd5e23 --- /dev/null +++ b/site/blueprints/pages/admin-folder.yml @@ -0,0 +1,41 @@ +title: Administration +icon: folder +image: + back: "#000" + color: "#fff" + +create: + status: listed + +status: + listed: Privée + text: Page réservée + +columns: + - width: 1/2 + sections: + subfoldersSection: + label: Sous-dossiers + type: pages + template: admin-folder + + - width: 1/2 + sections: + filesSection: + label: Fichiers propres + type: files + linkedFilesSection: + type: fields + fields: + linkedFiles: + label: Fichiers liés + type: multiselect + options: + type: query + query: site.find('admin').index.files + + - width: 1/1 + fields: + notesField: + label: Notes + type: writer diff --git a/site/blueprints/pages/admin-home.yml b/site/blueprints/pages/admin-home.yml new file mode 100644 index 0000000..2326fc2 --- /dev/null +++ b/site/blueprints/pages/admin-home.yml @@ -0,0 +1,18 @@ +title: Administration +icon: folder +image: + back: "#000" + color: "#fff" + +create: + status: listed + +status: + listed: Privée + text: Page réservée + +sections: + folderSection: + label: Dossiers + type: pages + template: admin-folder diff --git a/site/blueprints/tabs/meta.yml b/site/blueprints/tabs/meta.yml index 1cf3c4d..493b21b 100644 --- a/site/blueprints/tabs/meta.yml +++ b/site/blueprints/tabs/meta.yml @@ -17,4 +17,5 @@ sections: author: label: Auteur type: users + max: 1 width: 1/3 diff --git a/site/blueprints/users/admin.yml b/site/blueprints/users/admin.yml index ebd2b1e..ddd22b1 100644 --- a/site/blueprints/users/admin.yml +++ b/site/blueprints/users/admin.yml @@ -1,7 +1,8 @@ -title: Adminitrateurs -description: Un administrateur a tous les droits. +title: Éditeur +description: Tous les droits. image: - icon: star-filled + icon: cog + color: "#FFF" fields: presentation: diff --git a/site/blueprints/users/author.yml b/site/blueprints/users/author.yml index 53bc4f7..04e5565 100644 --- a/site/blueprints/users/author.yml +++ b/site/blueprints/users/author.yml @@ -1,12 +1,13 @@ -title: Auteurs -description: Un auteur a tous les droits. +title: Auteur +description: Droits de lecture et écriture de certaines pages. image: icon: pen + color: "#FFF" permissions: access: *: false - files: + files: *: false languages: *: false diff --git a/site/cache/index.html b/site/cache/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/site/config/config.php b/site/config/config.php index 7494df9..c4c4c8b 100644 --- a/site/config/config.php +++ b/site/config/config.php @@ -23,6 +23,7 @@ return [ } ], '-', + '-', 'infos' => [ 'icon' => 'question', 'label' => 'À propos', @@ -34,7 +35,7 @@ return [ ], 'newsletter' => [ 'icon' => 'email', - 'label' => 'Lettre', + 'label' => 'Infolettre', 'link' => 'pages/lettre', 'current' => function ($current) { $path = Kirby::instance()->request()->path()->toString(); @@ -42,9 +43,21 @@ return [ } ], '-', + '-', 'users', 'comments', - 'system' + 'admin' => [ + 'icon' => 'folder', + 'label' => 'Administration', + 'link' => 'pages/admin', + 'current' => function ($current) { + $path = Kirby::instance()->request()->path()->toString(); + return Str::contains($path, 'pages/admin'); + } + ], + '-', + '-', + 'system', ] ], 'routes' => [ diff --git a/site/plugins/panel-text-comments/.editorconfig b/site/plugins/panel-text-comments/.editorconfig deleted file mode 100644 index 3b762c9..0000000 --- a/site/plugins/panel-text-comments/.editorconfig +++ /dev/null @@ -1,20 +0,0 @@ -# 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 deleted file mode 100644 index 033ba13..0000000 --- a/site/plugins/panel-text-comments/.gitattributes +++ /dev/null @@ -1,11 +0,0 @@ -# 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 deleted file mode 100644 index 4d81cf5..0000000 --- a/site/plugins/panel-text-comments/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# 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 deleted file mode 100755 index 8e663d7..0000000 --- a/site/plugins/panel-text-comments/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/site/plugins/panel-text-comments/README.md b/site/plugins/panel-text-comments/README.md deleted file mode 100755 index ad2b202..0000000 --- a/site/plugins/panel-text-comments/README.md +++ /dev/null @@ -1,117 +0,0 @@ -# Kirby Pluginkit: Example plugin for Kirby - -> Variant "Panel plugin setup" - -This is a boilerplate for a Kirby Panel plugin that can be installed via all three [supported installation methods](https://getkirby.com/docs/guide/plugins/plugin-setup-basic#the-three-plugin-installation-methods). - -You can find a list of Pluginkit variants on the [`master` branch](https://github.com/getkirby/pluginkit/tree/master). - -**** - -## How to use the Pluginkit - -1. Fork this repository -2. Change the plugin name and description in the `composer.json` -3. Change the plugin name in the `index.php` and `src/index.js` -4. Change the license if you don't want to publish under MIT -5. Add your plugin code to the `index.php` and `src/index.js` -6. Update this `README` with instructions for your plugin - -### Install the development and build setup - -We use [kirbyup](https://github.com/johannschopplich/kirbyup) for the development and build setup. - -You can start developing directly. kirbyup will be fetched remotely with your first `npm run` command, which may take a short amount of time. - -### Development - -You can start the dev process with: - -```bash -npm run dev -``` - -This will automatically update the `index.js` and `index.css` of your plugin as soon as you make changes. -Reload the Panel to see your code changes reflected. - -With kirbyup 2.0.0+ and Kirby 3.7.4+ you can alternatively use hot module reloading (HMR): - -```bash -npm run serve -``` - -This will start a development server that updates the page as soon as you make changes. Some updates are instant, like CSS or Vue template changes, others require a reload of the page, which happens automatically. - -> [!NOTE] -> The live reload functionality requires top level await, [which is only supported in modern browsers](https://caniuse.com/mdn-javascript_operators_await_top_level). If you're developing in older browsers, use `npm run dev` and reload the page manually to see changes. - -### Production - -As soon as you are happy with your plugin, you should build the final version with: - -```bash -npm run build -``` - -This will automatically create a minified and optimized version of your `index.js` and `index.css` -which you can ship with your plugin. - -We have a tutorial on how to build your own plugin based on the Pluginkit [in the Kirby documentation](https://getkirby.com/docs/guide/plugins/plugin-setup-basic). - -### Build reproducibility - -While kirbyup will stay backwards compatible, exact build reproducibility may be of importance to you. If so, we recommend to target a specific package version, rather than using npx: - -```json -{ - "scripts": { - "dev": "kirbyup src/index.js --watch", - "build": "kirbyup src/index.js" - }, - "devDependencies": { - "kirbyup": "^3.1.0" - } -} -``` - -What follows is an example README for your plugin. - -**** - -## Installation - -### Download - -Download and copy this repository to `/site/plugins/{{ plugin-name }}`. - -### Git submodule - -```bash -git submodule add https://github.com/{{ your-name }}/{{ plugin-name }}.git site/plugins/{{ plugin-name }} -``` - -### Composer - -```bash -composer require {{ your-name }}/{{ plugin-name }} -``` - -## Setup - -*Additional instructions on how to configure the plugin (e.g. blueprint setup, config options, etc.)* - -## Options - -*Document the options and APIs that this plugin offers* - -## Development - -*Add instructions on how to help working on the plugin (e.g. npm setup, Composer dev dependencies, etc.)* - -## License - -MIT - -## Credits - -- [Your Name](https://github.com/ghost) diff --git a/site/plugins/panel-text-comments/SECURITY.md b/site/plugins/panel-text-comments/SECURITY.md deleted file mode 100644 index 3726336..0000000 --- a/site/plugins/panel-text-comments/SECURITY.md +++ /dev/null @@ -1,18 +0,0 @@ -# Security Policy - -## Supported Versions - -*Use this section to tell people about which versions of your project are currently being supported with security updates.* - -| Version | Supported | -| ------- | ------------------ | -| 5.1.x | :white_check_mark: | -| 5.0.x | :x: | -| 4.0.x | :white_check_mark: | -| < 4.0 | :x: | - -## Reporting a Vulnerability - -*Use this section to tell people how to report a vulnerability.* - -*Tell them where to go, how often they can expect to get an update on a reported vulnerability, what to expect if the vulnerability is accepted or declined, etc.* diff --git a/site/plugins/panel-text-comments/composer.json b/site/plugins/panel-text-comments/composer.json deleted file mode 100755 index fa07b14..0000000 --- a/site/plugins/panel-text-comments/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "getkirby/pluginkit", - "description": "Kirby Example Plugin", - "license": "MIT", - "type": "kirby-plugin", - "version": "1.0.0", - "authors": [ - { - "name": "Your Name", - "email": "you@example.com" - } - ], - "require": { - "getkirby/composer-installer": "^1.1" - }, - "config": { - "allow-plugins": { - "getkirby/composer-installer": true - } - } -} diff --git a/site/plugins/panel-text-comments/composer.lock b/site/plugins/panel-text-comments/composer.lock deleted file mode 100644 index a5ae0fa..0000000 --- a/site/plugins/panel-text-comments/composer.lock +++ /dev/null @@ -1,66 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "37a8e61308b9b6f49cb9835f477f0c64", - "packages": [ - { - "name": "getkirby/composer-installer", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/getkirby/composer-installer.git", - "reference": "c98ece30bfba45be7ce457e1102d1b169d922f3d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/getkirby/composer-installer/zipball/c98ece30bfba45be7ce457e1102d1b169d922f3d", - "reference": "c98ece30bfba45be7ce457e1102d1b169d922f3d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0" - }, - "require-dev": { - "composer/composer": "^1.8 || ^2.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Kirby\\ComposerInstaller\\Plugin" - }, - "autoload": { - "psr-4": { - "Kirby\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Kirby's custom Composer installer for the Kirby CMS and for Kirby plugins", - "homepage": "https://getkirby.com", - "support": { - "issues": "https://github.com/getkirby/composer-installer/issues", - "source": "https://github.com/getkirby/composer-installer/tree/1.2.1" - }, - "funding": [ - { - "url": "https://getkirby.com/buy", - "type": "custom" - } - ], - "time": "2020-12-28T12:54:39+00:00" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.6.0" -} diff --git a/site/plugins/panel-text-comments/index.css b/site/plugins/panel-text-comments/index.css deleted file mode 100644 index d9c4995..0000000 --- a/site/plugins/panel-text-comments/index.css +++ /dev/null @@ -1,2 +0,0 @@ - -/** Put your CSS here **/ diff --git a/site/plugins/panel-text-comments/index.js b/site/plugins/panel-text-comments/index.js deleted file mode 100644 index 3306d17..0000000 --- a/site/plugins/panel-text-comments/index.js +++ /dev/null @@ -1,15 +0,0 @@ -(function () { - "use strict"; - window.panel.plugin("adrienpayet/panel-text-comments", { - textareaButtons: { - highlight: { - label: "Highlight", - icon: "wand", - click: function () { - this.command("toggle", "", ""); - }, - shortcut: "m", - }, - }, - }); -})(); diff --git a/site/plugins/panel-text-comments/index.php b/site/plugins/panel-text-comments/index.php deleted file mode 100755 index 3c928b9..0000000 --- a/site/plugins/panel-text-comments/index.php +++ /dev/null @@ -1,3 +0,0 @@ -", ""); - }, - shortcut: "m", - }, - }, -}); diff --git a/site/snippets/tabs.php b/site/snippets/tabs.php index ad735e7..920b3f6 100644 --- a/site/snippets/tabs.php +++ b/site/snippets/tabs.php @@ -53,7 +53,7 @@ $activeTab = isset($activeTab) ? Str::slug($activeTab) : ''; class="see-more toggle left" @click="isOpen = !isOpen">Lire children() as $article): ?> - author()->toUser()->name()->value()) : ?> + author()->toUser()->name()->value()) : ?>

  • title() ?>

    diff --git a/site/templates/linear.php b/site/templates/linear.php index c5bc597..c3d2fd4 100644 --- a/site/templates/linear.php +++ b/site/templates/linear.php @@ -3,7 +3,7 @@
    true], slots: true) ?> -

    title() ?>

    +

    title() ?>

    par