diff options
author | Alex <alex@adnab.me> | 2022-12-22 12:45:04 +0000 |
---|---|---|
committer | Alex <alex@adnab.me> | 2022-12-22 12:45:04 +0000 |
commit | 4831ac27871e44064dc55946c5ae10b8cda32b37 (patch) | |
tree | fd886ef1ded44fe457ab12241692d0ac89d52f0e /sass | |
parent | 73d4b846ec6976acd0abf53f28144823183fdfbd (diff) | |
parent | ec051a85db1ac5c3d05dda1954f9786cc67c0d52 (diff) | |
download | guide.deuxfleurs.fr-4831ac27871e44064dc55946c5ae10b8cda32b37.tar.gz guide.deuxfleurs.fr-4831ac27871e44064dc55946c5ae10b8cda32b37.zip |
Merge pull request 'Améliorations du CSS responsive et navigation sur mobile' (#17) from navigation-mobile into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/guide.deuxfleurs.fr/pulls/17
Diffstat (limited to 'sass')
-rw-r--r-- | sass/_markdown.scss | 4 | ||||
-rw-r--r-- | sass/_text.scss | 12 | ||||
-rw-r--r-- | sass/juice.scss | 138 |
3 files changed, 140 insertions, 14 deletions
diff --git a/sass/_markdown.scss b/sass/_markdown.scss index 73caeb5..5cc6e69 100644 --- a/sass/_markdown.scss +++ b/sass/_markdown.scss @@ -74,6 +74,10 @@ width: auto; } +.content img[alt$="#"] { + margin: .5rem; +} + .content img[alt$=">"] { float: right; margin-left: 1rem; diff --git a/sass/_text.scss b/sass/_text.scss index 329017b..eb52d51 100644 --- a/sass/_text.scss +++ b/sass/_text.scss @@ -1,14 +1,16 @@ .heading-text { font-family: "Fira Sans", sans-serif; - font-size: 32px; + font-size: 2em; font-weight: 600; + line-height: 1.2em; padding: 10px 0 25px 0; color: var(--secondary-text-color); } h1, .title-text { font-family: "Fira Sans", sans-serif; - font-size: 25px; + font-size: 1.8em; + line-height: 1.2em; font-weight: 500; color: var(--secondary-text-color); border-left: var(--primary-color) 8px solid; @@ -17,7 +19,7 @@ h1, .title-text { h2, .title-text { font-family: "Fira Sans", sans-serif; - font-size: 25px; + font-size: 1.5em; font-weight: 500; color: var(--secondary-text-color); border-left: #aaa 8px solid; @@ -26,14 +28,14 @@ h2, .title-text { h3, .subtitle-text { font-family: "Fira Sans", sans-serif; - font-size: 20px; + font-size: 1.3em; font-weight: 500; color: var(--secondary-text-color); } .text { font-family: "Fira Sans", sans-serif; - font-size: 18px; + font-size: 16px; font-weight: 400; line-height: 26px; letter-spacing: 0.2px; diff --git a/sass/juice.scss b/sass/juice.scss index 04136a1..7866bb4 100644 --- a/sass/juice.scss +++ b/sass/juice.scss @@ -38,9 +38,20 @@ header { justify-content: space-between; } +header ul { + margin: 0px; + padding: 0px; + list-style: none; +} + +header ul li { + display: inline; + +} + .logo { font-family: Georgia, DejaVu Serif, Norasi, serif; - font-size: 32px; + font-size: 28px; color: var(--primary-text-color); font-weight: 500; display: flex; @@ -56,7 +67,6 @@ header { .nav-item { margin: 0 10px; text-decoration: none; - font-size: 18px; font-weight: bold; color: var(--primary-text-color); @@ -83,11 +93,16 @@ header { } } + main { display: flex; - padding: 50px 100px; + padding: 50px 50px; flex-grow: 1; + .toc-homepage .toc-sticky { + display: none; + } + .toc { max-width: 260px; min-width: 240px; @@ -123,7 +138,6 @@ main { padding: 0 30px 5px; color: #424242; } - } .toc-sticky { @@ -157,11 +171,20 @@ footer { } @media screen and (min-width: 1280px) { + main { + padding: 50px 100px; + } + .logo { + font-size: 32px; + } .content { max-width: 60%; min-width: 800px; overflow: hidden; } + .text { + font-size: 18px; + } } @media screen and (max-width: 768px) { @@ -172,6 +195,10 @@ footer { justify-content: center; } + header nav { + display: none; + } + .logo { font-size: 28px; margin: 10px; @@ -184,7 +211,7 @@ footer { .nav-item { margin: 0 5px; - font-size: 14px; + font-size: 1em; } .hero { @@ -192,15 +219,108 @@ footer { } main { - padding: 30px; + display: block; + padding: 0px; + } + + main .content { + margin: 15px; } .content { padding: 0; + display: block; } +} - .explore-more, .toc { - display: none; - } +/* + Disposition spécifique du menu pour mobile; menu déroulable pour mobile + Code inspiré de: https://alvarotrigo.com/blog/hamburger-menu-css/ +*/ + +#menu-toggle { + display: none; +} +.menu-button-container { + display: none; } + +.menu-button::before { + content: ''; + transform: translate(0, -8px); +} + +.menu-button::after { + content: ''; + transform: translate(0, 8px); +} + +#menu-toggle:checked + .menu-button-container .menu-button::before { + margin-top: 0px; + transform: rotate(45deg); +} + +#menu-toggle:checked + .menu-button-container .menu-button { + background: transparent; +} + +#menu-toggle:checked + .menu-button-container .menu-button::after { + margin-top: 0px; + transform: rotate(-45deg); +} + +@media (max-width: 768px) { + main .toc { + margin: 0px; + width: 100%; + max-width: none; + border: 0px; + } + + main .toc-sticky { + border: 0px; + padding: 10px 0px; + } + + main .toc-homepage .toc-sticky { + display: block; + } + + .menu-button-container { + display: block; + } + + .toc-menu-title { + font-weight: 600; + margin-left: 64px; + } + + .toc-section { + margin-top: 16px; + } + + .menu-button { + top: 28px; + left:24px; + } + + .menu-button, + .menu-button::before, + .menu-button::after { + display: block; + background-color: #777; + position: absolute; + height: 4px; + width: 30px; + transition: transform 400ms ease; + border-radius: 2px; + } + + #menu-toggle ~ .toc-item { + display: none; + } + #menu-toggle:checked ~ .toc-item { + display: block; + } +}
\ No newline at end of file |