diff options
author | Mathieu Brunot <mathieu.brunot@monogramm.io> | 2020-11-30 16:45:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-30 16:45:22 +0100 |
commit | a742b4b0e215f49928f7389d09de1023414fbeff (patch) | |
tree | a6662eff745b80a59e16e337a706973742f3684b | |
parent | 617f4f5cb2ac44df481851ff4165a79820b6b146 (diff) | |
download | PeerTube-a742b4b0e215f49928f7389d09de1023414fbeff.tar.gz PeerTube-a742b4b0e215f49928f7389d09de1023414fbeff.tar.zst PeerTube-a742b4b0e215f49928f7389d09de1023414fbeff.zip |
Fix themes colors by using SCSS variables (#3376)
* :lipstick: Use foreground var for code
* :lipstick: Use submenu var color
* :lipstick: Use foreground var color for menu
* :bug: Fix var used in menu
-rw-r--r-- | client/src/app/menu/menu.component.scss | 8 | ||||
-rw-r--r-- | client/src/sass/application.scss | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 8a8094fbb..e79ecb5c7 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -164,7 +164,7 @@ menu { | |||
164 | &:hover, | 164 | &:hover, |
165 | &:focus-visible { | 165 | &:focus-visible { |
166 | my-global-icon { | 166 | my-global-icon { |
167 | @include apply-svg-color(var(--mainBackgroundColor)); | 167 | @include apply-svg-color(var(--menuForegroundColor)); |
168 | } | 168 | } |
169 | } | 169 | } |
170 | 170 | ||
@@ -269,7 +269,7 @@ menu { | |||
269 | a, span[role=button] { | 269 | a, span[role=button] { |
270 | display: inline-block; | 270 | display: inline-block; |
271 | text-decoration: none; | 271 | text-decoration: none; |
272 | color: pvar(--mainBackgroundColor); | 272 | color: pvar(--menuForegroundColor); |
273 | opacity: $footer-links-base-opacity; | 273 | opacity: $footer-links-base-opacity; |
274 | white-space: nowrap; | 274 | white-space: nowrap; |
275 | font-size: 90%; | 275 | font-size: 90%; |
@@ -284,7 +284,7 @@ menu { | |||
284 | height: 1.4rem; | 284 | height: 1.4rem; |
285 | 285 | ||
286 | my-global-icon { | 286 | my-global-icon { |
287 | @include apply-svg-color(pvar(--mainBackgroundColor)); | 287 | @include apply-svg-color(pvar(--menuForegroundColor)); |
288 | 288 | ||
289 | display: flex; | 289 | display: flex; |
290 | width: auto; | 290 | width: auto; |
@@ -298,7 +298,7 @@ menu { | |||
298 | .footer-copyleft small a { | 298 | .footer-copyleft small a { |
299 | @include disable-default-a-behaviour; | 299 | @include disable-default-a-behaviour; |
300 | 300 | ||
301 | color: pvar(--mainBackgroundColor); | 301 | color: pvar(--menuForegroundColor); |
302 | opacity: $footer-links-base-opacity - .2; | 302 | opacity: $footer-links-base-opacity - .2; |
303 | } | 303 | } |
304 | } | 304 | } |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 25db91670..ece8411af 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -105,6 +105,7 @@ label { | |||
105 | 105 | ||
106 | code { | 106 | code { |
107 | background-color: pvar(--greyBackgroundColor); | 107 | background-color: pvar(--greyBackgroundColor); |
108 | color: pvar(--greyForegroundColor); | ||
108 | border-radius: 3px; | 109 | border-radius: 3px; |
109 | padding: .2em .4em; | 110 | padding: .2em .4em; |
110 | margin: auto .4em; | 111 | margin: auto .4em; |
@@ -261,7 +262,7 @@ code { | |||
261 | opacity: 0.6; | 262 | opacity: 0.6; |
262 | 263 | ||
263 | &.active { | 264 | &.active { |
264 | background-color: #f0f0f0; | 265 | background-color: pvar(--submenuColor); |
265 | } | 266 | } |
266 | 267 | ||
267 | &.active, &:hover, &:active, &:focus { | 268 | &.active, &:hover, &:active, &:focus { |