From d79f3d1e0bfc8331dd8fdb1d203f7c66d8231a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com> Date: Wed, 18 Sep 2024 14:59:30 +0200 Subject: [PATCH] wip: fix colors --- src/components/Navbar/navBar.scss | 6 +++++- src/styles/base/_typography.scss | 14 +++----------- src/styles/index.scss | 4 +++- src/targets/browser/index.ejs | 1 + src/targets/public/index.ejs | 1 + 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/Navbar/navBar.scss b/src/components/Navbar/navBar.scss index e875e8ebb..e5343a790 100644 --- a/src/components/Navbar/navBar.scss +++ b/src/components/Navbar/navBar.scss @@ -112,7 +112,11 @@ @media #{$tablet} { .o-sidebar { height: 56px; - overflow-y: hidden; + } + + .c-nav { + margin-top: 4px; + margin-bottom: 0; } .c-nav-item { diff --git a/src/styles/base/_typography.scss b/src/styles/base/_typography.scss index a0a743fb8..18a7a9be7 100644 --- a/src/styles/base/_typography.scss +++ b/src/styles/base/_typography.scss @@ -36,7 +36,9 @@ p { text-align: center; letter-spacing: 0.15px; color: $grey-bright; - text-shadow: 0px -1px 0px #060609, 0px 1px 0px rgba(255, 255, 255, 0.07); + text-shadow: + 0px -1px 0px #060609, + 0px 1px 0px rgba(255, 255, 255, 0.07); } @each $name, $size in $text-size { @@ -131,13 +133,3 @@ p { font-size: 0.75rem; } } - -/* Cozy bar */ -.cozybar { - font-family: $text-font; - font-style: normal; - font-weight: bold; - font-size: 1.3125rem; - line-height: 120%; - color: $grey-bright; -} diff --git a/src/styles/index.scss b/src/styles/index.scss index 68a19b095..5a3db87bc 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -54,8 +54,10 @@ --waterColorRadialGradient: #{$water-color-radial-gradient}; } +// Workaround since cozy-ui 111.9.0 .app-content { - overflow: hidden !important; + background-color: $default-background; + display: initial !important; } .application { diff --git a/src/targets/browser/index.ejs b/src/targets/browser/index.ejs index ee85e8ba0..b2711492a 100644 --- a/src/targets/browser/index.ejs +++ b/src/targets/browser/index.ejs @@ -21,6 +21,7 @@ <!-- PWA Colors --> <meta name="theme-color" content="#343641" /> <meta name="background-color" content="#121212" /> + <meta name="color-scheme" content="only dark" /> <% _.forEach(htmlWebpackPlugin.files.css, function(file) { %> <link rel="stylesheet" href="<%- file %>"> diff --git a/src/targets/public/index.ejs b/src/targets/public/index.ejs index 6a02d8ede..359ee7568 100644 --- a/src/targets/public/index.ejs +++ b/src/targets/public/index.ejs @@ -17,6 +17,7 @@ <!-- PWA Colors --> <meta name="theme-color" content="#343641" /> <meta name="background-color" content="#121212" /> + <meta name="color-scheme" content="only dark" /> <% _.forEach(htmlWebpackPlugin.files.css, function(file) { %> <link rel="stylesheet" href="<%- file %>"> -- GitLab