From 79051ca34eca57dae8e5fde7c245f60fcbb21678 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 23 Nov 2022 12:23:27 +0100
Subject: [PATCH] clean up
---
assets/sass/_theme/_todo/normalize.css | 350 ------------------
.../bootstrap-breakpoints.scss | 0
.../vendors => dependencies}/glightbox.sass | 0
.../sass/_theme/dependencies/normalize.sass | 318 ++++++++++++++++
.../vendors => dependencies}/splide.sass | 0
assets/sass/_theme/design-system/reset.sass | 46 ---
.../sass/_theme/design-system/typography.sass | 30 +-
assets/sass/_theme/hugo-osuny.sass | 18 +-
8 files changed, 344 insertions(+), 418 deletions(-)
delete mode 100644 assets/sass/_theme/_todo/normalize.css
rename assets/sass/_theme/{_todo => dependencies}/bootstrap-breakpoints.scss (100%)
rename assets/sass/_theme/{design-system/vendors => dependencies}/glightbox.sass (100%)
create mode 100644 assets/sass/_theme/dependencies/normalize.sass
rename assets/sass/_theme/{design-system/vendors => dependencies}/splide.sass (100%)
delete mode 100644 assets/sass/_theme/design-system/reset.sass
diff --git a/assets/sass/_theme/_todo/normalize.css b/assets/sass/_theme/_todo/normalize.css
deleted file mode 100644
index f8118ebc..00000000
--- a/assets/sass/_theme/_todo/normalize.css
+++ /dev/null
@@ -1,350 +0,0 @@
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
-
-/* Document
- ========================================================================== */
-
-/**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
-
-html {
- line-height: 1.15; /* 1 */
- -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/* Sections
- ========================================================================== */
-
-/**
- * Remove the margin in all browsers.
- */
-
-body {
- margin: 0;
-}
-
-/**
- * Render the `main` element consistently in IE.
- */
-
-main {
- display: block;
-}
-
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
- font-size: 2em;
- margin: 0.67em 0;
-}
-
-/* Grouping content
- ========================================================================== */
-
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
- box-sizing: content-box; /* 1 */
- height: 0; /* 1 */
- overflow: visible; /* 2 */
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
- font-family: monospace, monospace; /* 1 */
- font-size: 1em; /* 2 */
-}
-
-/* Text-level semantics
- ========================================================================== */
-
-/**
- * Remove the gray background on active links in IE 10.
- */
-
-a {
- background-color: transparent;
-}
-
-/**
- * 1. Remove the bottom border in Chrome 57-
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
- border-bottom: none; /* 1 */
- text-decoration: underline; /* 2 */
- text-decoration: underline dotted; /* 2 */
-}
-
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
- font-weight: bolder;
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
- font-family: monospace, monospace; /* 1 */
- font-size: 1em; /* 2 */
-}
-
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
- font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
-sub {
- bottom: -0.25em;
-}
-
-sup {
- top: -0.5em;
-}
-
-/* Embedded content
- ========================================================================== */
-
-/**
- * Remove the border on images inside links in IE 10.
- */
-
-img {
- border-style: none;
-}
-
-/* Forms
- ========================================================================== */
-
-/**
- * 1. Change the font styles in all browsers.
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
- font-family: inherit; /* 1 */
- font-size: 100%; /* 1 */
- line-height: 1.15; /* 1 */
- margin: 0; /* 2 */
-}
-
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
- overflow: visible;
-}
-
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
- text-transform: none;
-}
-
-/**
- * Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
- -webkit-appearance: button;
-}
-
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
- border-style: none;
- padding: 0;
-}
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
- outline: 1px dotted ButtonText;
-}
-
-/**
- * Correct the padding in Firefox.
- */
-
-fieldset {
- padding: 0.35em 0.75em 0.625em;
-}
-
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- * `fieldset` elements in all browsers.
- */
-
-legend {
- box-sizing: border-box; /* 1 */
- color: inherit; /* 2 */
- display: table; /* 1 */
- max-width: 100%; /* 1 */
- padding: 0; /* 3 */
- white-space: normal; /* 1 */
-}
-
-/**
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
- vertical-align: baseline;
-}
-
-/**
- * Remove the default vertical scrollbar in IE 10+.
- */
-
-textarea {
- overflow: auto;
-}
-
-/**
- * 1. Add the correct box sizing in IE 10.
- * 2. Remove the padding in IE 10.
- */
-
-[type="checkbox"],
-[type="radio"] {
- box-sizing: border-box; /* 1 */
- padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
- height: auto;
-}
-
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
- -webkit-appearance: textfield; /* 1 */
- outline-offset: -2px; /* 2 */
-}
-
-/**
- * Remove the inner padding in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-decoration {
- -webkit-appearance: none;
-}
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
- -webkit-appearance: button; /* 1 */
- font: inherit; /* 2 */
-}
-
-/* Interactive
- ========================================================================== */
-
-/*
- * Add the correct display in Edge, IE 10+, and Firefox.
- */
-
-details {
- display: block;
-}
-
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
- display: list-item;
-}
-
-/* Misc
- ========================================================================== */
-
-/**
- * Add the correct display in IE 10+.
- */
-
-template {
- display: none;
-}
-
-/**
- * Add the correct display in IE 10.
- */
-
-[hidden] {
- display: none;
-}
-
\ No newline at end of file
diff --git a/assets/sass/_theme/_todo/bootstrap-breakpoints.scss b/assets/sass/_theme/dependencies/bootstrap-breakpoints.scss
similarity index 100%
rename from assets/sass/_theme/_todo/bootstrap-breakpoints.scss
rename to assets/sass/_theme/dependencies/bootstrap-breakpoints.scss
diff --git a/assets/sass/_theme/design-system/vendors/glightbox.sass b/assets/sass/_theme/dependencies/glightbox.sass
similarity index 100%
rename from assets/sass/_theme/design-system/vendors/glightbox.sass
rename to assets/sass/_theme/dependencies/glightbox.sass
diff --git a/assets/sass/_theme/dependencies/normalize.sass b/assets/sass/_theme/dependencies/normalize.sass
new file mode 100644
index 00000000..1adc2bcc
--- /dev/null
+++ b/assets/sass/_theme/dependencies/normalize.sass
@@ -0,0 +1,318 @@
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css
+
+/* Document
+ * ==========================================================================
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+
+html
+ line-height: 1.15
+
+ /* 1
+ -webkit-text-size-adjust: 100%
+
+ /* 2
+
+/* Sections
+ * ==========================================================================
+
+/**
+ ** Remove the margin in all browsers.
+
+body
+ margin: 0
+
+/**
+ ** Render the `main` element consistently in IE.
+
+main
+ display: block
+
+/**
+ ** Correct the font size and margin on `h1` elements within `section` and
+ ** `article` contexts in Chrome, Firefox, and Safari.
+
+h1
+ font-size: 2em
+ margin: 0.67em 0
+
+/* Grouping content
+ * ==========================================================================
+
+/**
+ ** 1. Add the correct box sizing in Firefox.
+ ** 2. Show the overflow in Edge and IE.
+
+hr
+ box-sizing: content-box
+
+ /* 1
+ height: 0
+
+ /* 1
+ overflow: visible
+
+ /* 2
+
+/**
+ ** 1. Correct the inheritance and scaling of font size in all browsers.
+ ** 2. Correct the odd `em` font sizing in all browsers.
+
+pre
+ font-family: monospace, monospace
+
+ /* 1
+ font-size: 1em
+
+ /* 2
+
+/* Text-level semantics
+ * ==========================================================================
+
+/**
+ ** Remove the gray background on active links in IE 10.
+
+a
+ background-color: transparent
+
+/**
+ ** 1. Remove the bottom border in Chrome 57-
+ ** 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+
+abbr[title]
+ border-bottom: none
+
+ /* 1
+ text-decoration: underline
+
+ /* 2
+ text-decoration: underline dotted
+
+ /* 2
+
+/**
+ ** Add the correct font weight in Chrome, Edge, and Safari.
+
+b, strong
+ font-weight: bolder
+
+/**
+ ** 1. Correct the inheritance and scaling of font size in all browsers.
+ ** 2. Correct the odd `em` font sizing in all browsers.
+
+code, kbd, samp
+ font-family: monospace, monospace
+
+ /* 1
+ font-size: 1em
+
+ /* 2
+
+/**
+ ** Add the correct font size in all browsers.
+
+small
+ font-size: 80%
+
+/**
+ ** Prevent `sub` and `sup` elements from affecting the line height in
+ ** all browsers.
+
+sub, sup
+ font-size: 75%
+ line-height: 0
+ position: relative
+ vertical-align: baseline
+
+sub
+ bottom: -0.25em
+
+sup
+ top: -0.5em
+
+/* Embedded content
+ * ==========================================================================
+
+/**
+ ** Remove the border on images inside links in IE 10.
+
+img
+ border-style: none
+
+/* Forms
+ * ==========================================================================
+
+/**
+ ** 1. Change the font styles in all browsers.
+ ** 2. Remove the margin in Firefox and Safari.
+
+button, input, optgroup, select, textarea
+ font-family: inherit
+
+ /* 1
+ font-size: 100%
+
+ /* 1
+ line-height: 1.15
+
+ /* 1
+ margin: 0
+
+ /* 2
+
+/**
+ ** Show the overflow in IE.
+ ** 1. Show the overflow in Edge.
+
+button, input
+ /* 1
+ overflow: visible
+
+/**
+ ** Remove the inheritance of text transform in Edge, Firefox, and IE.
+ ** 1. Remove the inheritance of text transform in Firefox.
+
+button, select
+ /* 1
+ text-transform: none
+
+/**
+ ** Correct the inability to style clickable types in iOS and Safari.
+
+button, [type="button"], [type="reset"], [type="submit"]
+ -webkit-appearance: button
+
+/**
+ ** Remove the inner border and padding in Firefox.
+
+button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner
+ border-style: none
+ padding: 0
+
+/**
+ ** Restore the focus styles unset by the previous rule.
+
+button:-moz-focusring, [type="button"]:-moz-focusring, [type="reset"]:-moz-focusring, [type="submit"]:-moz-focusring
+ outline: 1px dotted ButtonText
+
+/**
+ ** Correct the padding in Firefox.
+
+fieldset
+ padding: 0.35em 0.75em 0.625em
+
+/**
+ ** 1. Correct the text wrapping in Edge and IE.
+ ** 2. Correct the color inheritance from `fieldset` elements in IE.
+ ** 3. Remove the padding so developers are not caught out when they zero out
+ ** `fieldset` elements in all browsers.
+
+legend
+ box-sizing: border-box
+
+ /* 1
+ color: inherit
+
+ /* 2
+ display: table
+
+ /* 1
+ max-width: 100%
+
+ /* 1
+ padding: 0
+
+ /* 3
+ white-space: normal
+
+ /* 1
+
+/**
+ ** Add the correct vertical alignment in Chrome, Firefox, and Opera.
+
+progress
+ vertical-align: baseline
+
+/**
+ ** Remove the default vertical scrollbar in IE 10+.
+
+textarea
+ overflow: auto
+
+/**
+ ** 1. Add the correct box sizing in IE 10.
+ ** 2. Remove the padding in IE 10.
+
+[type="checkbox"], [type="radio"]
+ box-sizing: border-box
+
+ /* 1
+ padding: 0
+
+ /* 2
+
+/**
+ ** Correct the cursor style of increment and decrement buttons in Chrome.
+
+[type="number"]
+ &::-webkit-inner-spin-button, &::-webkit-outer-spin-button
+ height: auto
+
+/**
+ ** 1. Correct the odd appearance in Chrome and Safari.
+ ** 2. Correct the outline style in Safari.
+
+[type="search"]
+ -webkit-appearance: textfield
+
+ /* 1
+ outline-offset: -2px
+
+ /* 2
+
+ &::-webkit-search-decoration
+ -webkit-appearance: none
+
+/**
+ ** Remove the inner padding in Chrome and Safari on macOS.
+
+/**
+ ** 1. Correct the inability to style clickable types in iOS and Safari.
+ ** 2. Change font properties to `inherit` in Safari.
+
+\::-webkit-file-upload-button
+ -webkit-appearance: button
+
+ /* 1
+ font: inherit
+
+ /* 2
+
+/* Interactive
+ * ==========================================================================
+
+/*
+ ** Add the correct display in Edge, IE 10+, and Firefox.
+
+details
+ display: block
+
+/*
+ ** Add the correct display in all browsers.
+
+summary
+ display: list-item
+
+/* Misc
+ * ==========================================================================
+
+/**
+ ** Add the correct display in IE 10+.
+
+template, [hidden]
+ display: none
+
+/**
+ ** Add the correct display in IE 10.
\ No newline at end of file
diff --git a/assets/sass/_theme/design-system/vendors/splide.sass b/assets/sass/_theme/dependencies/splide.sass
similarity index 100%
rename from assets/sass/_theme/design-system/vendors/splide.sass
rename to assets/sass/_theme/dependencies/splide.sass
diff --git a/assets/sass/_theme/design-system/reset.sass b/assets/sass/_theme/design-system/reset.sass
deleted file mode 100644
index 36f5598e..00000000
--- a/assets/sass/_theme/design-system/reset.sass
+++ /dev/null
@@ -1,46 +0,0 @@
-// // http://meyerweb.com/eric/tools/css/reset/
-// // v2.0 | 20110126
-// // License: none (public domain)
-
-// html, body, div, span, applet, object, iframe,
-// h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-// a, abbr, acronym, address, big, cite, code,
-// del, dfn, em, img, ins, kbd, q, s, samp,
-// small, strike, strong, sub, sup, tt, var,
-// b, u, i, center,
-// dl, dt, dd, ol, ul, li,
-// fieldset, form, label, legend,
-// table, caption, tbody, tfoot, thead, tr, th, td,
-// article, aside, canvas, details, embed,
-// figure, figcaption, footer, header, hgroup,
-// menu, nav, output, ruby, section, summary,
-// time, mark, audio, video
-// border: 0
-// font: inherit
-// margin: 0
-// padding: 0
-// vertical-align: baseline
-
-// // HTML5 display-role reset for older browsers
-// article, aside, details, figcaption, figure,
-// footer, header, hgroup, menu, nav, section
-// display: block
-
-// body
-// line-height: 1
-
-// ol, ul
-// list-style: none
-
-// blockquote, q
-// quotes: none
-
-// blockquote:before, blockquote:after,
-// q:before, q:after
-// content: ''
-// content: none
-
-// table
-// border-collapse: collapse
-// border-spacing: 0
-
diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass
index fa65178f..71220f34 100644
--- a/assets/sass/_theme/design-system/typography.sass
+++ b/assets/sass/_theme/design-system/typography.sass
@@ -1,3 +1,21 @@
+// https://developers.osuny.org/docs/theme/architecture/typographie/
+
+body
+ font-family: $body-font-family
+ -moz-osx-font-smoothing: grayscale
+ -webkit-font-smoothing: antialiased
+ font-size: $body-size
+ font-variant-ligatures: common-ligatures
+ text-rendering: optimizelegibility
+ line-height: $line-height-base
+ @include media-breakpoint-up(md)
+ font-size: $body-size-md
+
+// Experimental, not implemented yet
+p, h1, h2, h3, h4, h5, h6, li, a, th, td, span
+ text-edge: cap alphabetic
+ leading-trim: both
+
%heading
font-family: $heading-font-family
margin-top: 0
@@ -73,18 +91,6 @@ h2, .h2
@include media-breakpoint-up(md)
font-size: $lead-size-md
-
-body
- font-family: $body-font-family
- -moz-osx-font-smoothing: grayscale
- -webkit-font-smoothing: antialiased
- font-size: $body-size
- font-variant-ligatures: common-ligatures
- text-rendering: optimizelegibility
- line-height: $line-height-base
- @include media-breakpoint-up(md)
- font-size: $body-size-md
-
p, .p,
li, .li
font-size: $body-size
diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass
index 60118fab..73557b3b 100644
--- a/assets/sass/_theme/hugo-osuny.sass
+++ b/assets/sass/_theme/hugo-osuny.sass
@@ -1,18 +1,16 @@
-// @import "normalize.css/normalize.css" // TODO: fix normalize npm issue
-@import "_todo/normalize"
-// @import "normalize-scss//normalize"
-@import "_todo/bootstrap-breakpoints"
+// Settings
+@import "utils"
+@import "configuration"
+// Dependencies and tweaks of dependencies
+@import "dependencies/normalize"
+@import "dependencies/bootstrap-breakpoints"
@import "glightbox/dist/css/glightbox"
@import "@splidejs/splide/dist/css/splide-core.min"
-
-@import "utils"
-@import "configuration"
+@import "dependencies/glightbox"
+@import "dependencies/splide"
// Design System
-@import "design-system/reset"
-@import "design-system/vendors/glightbox"
-@import "design-system/vendors/splide"
@import "design-system/layout"
@import "design-system/a11y"
@import "design-system/breadcrumb"
--
GitLab