From 3d8bf0a726ad198854cda19146ae094bf780172d Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Wed, 16 Nov 2022 11:21:27 +0100
Subject: [PATCH] cleanup js
---
.../theme/{nav => design-system}/mainMenu.js | 0
assets/js/theme/index.js | 6 +-
assets/js/theme/nav/aside.js | 0
assets/js/theme/nav/responsive.js | 43 ------------
assets/js/theme/nav/stickyNav.js | 51 --------------
assets/sass/_theme/_utils.sass | 4 ++
assets/sass/_theme/design-system/layout.sass | 13 +++-
assets/sass/_theme/hugo-osuny.sass | 66 +++++++++----------
assets/sass/_theme/sections/persons.sass | 10 +--
assets/sass/_theme/sections/posts.sass | 3 -
10 files changed, 57 insertions(+), 139 deletions(-)
rename assets/js/theme/{nav => design-system}/mainMenu.js (100%)
delete mode 100644 assets/js/theme/nav/aside.js
delete mode 100644 assets/js/theme/nav/responsive.js
delete mode 100644 assets/js/theme/nav/stickyNav.js
diff --git a/assets/js/theme/nav/mainMenu.js b/assets/js/theme/design-system/mainMenu.js
similarity index 100%
rename from assets/js/theme/nav/mainMenu.js
rename to assets/js/theme/design-system/mainMenu.js
diff --git a/assets/js/theme/index.js b/assets/js/theme/index.js
index 52984c38..337a149b 100644
--- a/assets/js/theme/index.js
+++ b/assets/js/theme/index.js
@@ -1,7 +1,5 @@
import './body.js';
+import './design-system/dropdowns';
+import './design-system/mainMenu';
import './blocks/keyFigures';
import './blocks/timeline';
-import './design-system/dropdowns';
-import './nav/stickyNav';
-// import './nav/responsive';
-import './nav/mainMenu';
diff --git a/assets/js/theme/nav/aside.js b/assets/js/theme/nav/aside.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/assets/js/theme/nav/responsive.js b/assets/js/theme/nav/responsive.js
deleted file mode 100644
index 6e287c1a..00000000
--- a/assets/js/theme/nav/responsive.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const events = ['load', 'resize'];
-let navBtn = document.querySelector('nav[role="navigation"] button'),
- menuHeader = document.querySelector('.menu'),
- bodyOverlay = document.querySelector('body'), // document.body
- dropdownBtns = document.querySelectorAll('.has-children a[role="button"]'),
- breckpointMd = 768,
- classMobile = 'show';
-
-events.forEach((event) => {
- window.addEventListener(event, () => {
- windowWidth = window.innerWidth;
-
- if (windowWidth <= breckpointMd) {
- navBtn.addEventListener("click", function(){
- if(menuHeader.className.includes(classMobile)) {
- navBtn.setAttribute('aria-expanded', 'false')
- }
- else {
- navBtn.setAttribute('aria-expanded', 'true')
- }
- menuHeader.classList.toggle(classMobile)
- bodyOverlay.classList.toggle('has-overlay')
- });
-
- dropdownBtns.forEach((dropdownBtn) => {
- dropdownBtn.addEventListener("click", (e) => {
- e.preventDefault()
-
- if(dropdownBtn.getAttribute('aria-expanded') == "true") {
- dropdownBtn.setAttribute('aria-expanded', 'false')
- }
- else {
- dropdownBtn.setAttribute('aria-expanded', 'true')
- }
- })
- })
- }
- })
-});
-
-
-
-
diff --git a/assets/js/theme/nav/stickyNav.js b/assets/js/theme/nav/stickyNav.js
deleted file mode 100644
index 4f533aa4..00000000
--- a/assets/js/theme/nav/stickyNav.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// const events = ['scroll', 'touchmove'];
-// let previousY = 0,
-// y = 0,
-// classSticky = 'is-sticky',
-// classScrollingDown = 'is-scrolling-down',
-// classMenuOpen = 'is-menu-open',
-// header = document.querySelector('header[role="banner"]'),
-// offset = header.offsetHeight,
-// dropdowns = header.querySelectorAll('[data-bs-toggle="dropdown"]'),
-// menu = header.querySelector('.menu');
-
-// // dropdowns.forEach((dropdown) => {
-// // dropdown.addEventListener('hidden.bs.dropdown', () => {
-// // if (!header.querySelector('[aria-expanded="true"]')) {
-// // document.documentElement.classList.remove(classMenuOpen);
-// // }
-// // });
-// // dropdown.addEventListener('show.bs.dropdown', () => {
-// // document.documentElement.classList.add(classMenuOpen);
-// // });
-// // });
-
-// // menu.addEventListener('show.bs.collapse', () => {
-// // document.documentElement.classList.add(classMenuOpen);
-// // });
-
-// // menu.addEventListener('hide.bs.collapse', () => {
-// // document.documentElement.classList.remove(classMenuOpen);
-// // });
-
-// events.forEach((event) => {
-// window.addEventListener(event, () => {
-// y = window.scrollY;
-
-// if (y > offset) {
-// header.classList.add(classSticky);
-// } else {
-// header.classList.remove(classSticky);
-// }
-
-// if (y > previousY && y > offset) {
-// document.documentElement.classList.add(classScrollingDown);
-// // document.documentElement.style.setProperty(scrollMarginTop, '100px');
-// } else {
-// document.documentElement.classList.remove(classScrollingDown);
-// // document.documentElement.style.setProperty(scrollMarginTop, '200px');
-// }
-
-// previousY = y;
-// });
-// });
diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass
index b8e7b05c..a8a921dd 100644
--- a/assets/sass/_theme/_utils.sass
+++ b/assets/sass/_theme/_utils.sass
@@ -18,6 +18,10 @@
body.full-width &,
@content
+@mixin full-page
+ @include in-page-without-aside
+ @content
+
@mixin link($color: $link-color)
color: $color
text-decoration-color: rgba($color, 0.3)
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 2f2f06de..96a54105 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -4,10 +4,19 @@
box-sizing: border-box
\:root
+ --spacing0: #{$spacing0}
+ --spacing1: #{$spacing1}
+ --spacing2: #{$spacing2}
+ --spacing3: #{$spacing3}
+ --spacing4: #{$spacing4}
+ --spacing5: #{$spacing5}
+ --grid-gutter: #{$grid-gutter}
+ --grid-max-width: #{$grid-max-width}
--header-height: #{$header-height}
- @include media-breakpoint-up(md)
+ @include media-breakpoint-up(md)
--header-height: #{$header-height-md}
+// TODO: choisir entre margin top / bottom --> https://matthewjamestaylor.com/css-margin-top-vs-bottom
body
color: $body-color
@@ -29,6 +38,8 @@ main
.container
@include container
+ .hero + &
+ margin-top: $spacing3
ul
padding-left: px2rem(15)
diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass
index 596031b1..613ffb57 100644
--- a/assets/sass/_theme/hugo-osuny.sass
+++ b/assets/sass/_theme/hugo-osuny.sass
@@ -29,37 +29,37 @@
@import "design-system/typography"
// Blocks
-@import "blocks/datatable"
-@import "blocks/call_to_action"
-@import "blocks/chapter"
-@import "blocks/contact"
-@import "blocks/definitions"
-@import "blocks/embed"
-@import "blocks/files"
-@import "blocks/gallery"
-@import "blocks/image"
-@import "blocks/key_figures"
-@import "blocks/organization_chart"
-@import "blocks/pages"
-@import "blocks/partners"
-@import "blocks/posts"
-@import "blocks/testimonials"
-@import "blocks/timeline"
-@import "blocks/video"
+// @import "blocks/datatable"
+// @import "blocks/call_to_action"
+// @import "blocks/chapter"
+// @import "blocks/contact"
+// @import "blocks/definitions"
+// @import "blocks/embed"
+// @import "blocks/files"
+// @import "blocks/gallery"
+// @import "blocks/image"
+// @import "blocks/key_figures"
+// @import "blocks/organization_chart"
+// @import "blocks/pages"
+// @import "blocks/partners"
+// @import "blocks/posts"
+// @import "blocks/testimonials"
+// @import "blocks/timeline"
+// @import "blocks/video"
-// Sections
-@import "sections/administrators"
-@import "sections/authors"
-@import "sections/categories"
-@import "sections/diplomas"
-@import "sections/home"
-@import "sections/organizations"
-@import "sections/pages"
-@import "sections/papers"
-@import "sections/persons"
-@import "sections/posts"
-@import "sections/programs"
-@import "sections/researchers"
-@import "sections/sitemap"
-@import "sections/teachers"
-@import "sections/volumes"
+// // Sections
+// @import "sections/administrators"
+// @import "sections/authors"
+// @import "sections/categories"
+// @import "sections/diplomas"
+// @import "sections/home"
+// @import "sections/organizations"
+// @import "sections/pages"
+// @import "sections/papers"
+// @import "sections/persons"
+// @import "sections/posts"
+// @import "sections/programs"
+// @import "sections/researchers"
+// @import "sections/sitemap"
+// @import "sections/teachers"
+// @import "sections/volumes"
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index edd9f358..574f2ba8 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -34,10 +34,12 @@ div.persons
@include grid(5, xxl)
.persons__section
- .lead
- padding-top: $spacing2
- @include media-breakpoint-up(md)
- width: col(7)
+ @include page-without-aside
+ .lead
+ padding-top: $spacing2
+ @include media-breakpoint-up(md)
+ width: col(7)
+
ol.persons
@include list-reset
> li
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index a2c24b58..977dd036 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -16,9 +16,6 @@
.posts__section,
.authors__term
- .hero
- margin-bottom: $spacing4
-
@if $posts-layout-list
.posts
@include grid(1)
--
GitLab