diff options
author | Chocobozzz <me@florianbigard.com> | 2020-05-22 11:21:55 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-05-22 11:21:55 +0200 |
commit | c123027fd962a14433a325f85d2734b94a4df3ae (patch) | |
tree | bebd875b58d4aed53a4e64123b5cd7b2239eb19c /client/src/sass | |
parent | 5f57df54627c61817226768bb360a8a93ea2c0b9 (diff) | |
download | PeerTube-c123027fd962a14433a325f85d2734b94a4df3ae.tar.gz PeerTube-c123027fd962a14433a325f85d2734b94a4df3ae.tar.zst PeerTube-c123027fd962a14433a325f85d2734b94a4df3ae.zip |
Fix grey color theme
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_miniature.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 10 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 22e1151c8..16e7ea5ca 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -31,6 +31,8 @@ body { | |||
31 | --mainForegroundColor: #{$fg-color}; | 31 | --mainForegroundColor: #{$fg-color}; |
32 | --secondaryColor: #{$secondary-color}; | 32 | --secondaryColor: #{$secondary-color}; |
33 | 33 | ||
34 | --greyForegroundColor: #{$grey-foreground-color}; | ||
35 | |||
34 | --menuBackgroundColor: #{$menu-background}; | 36 | --menuBackgroundColor: #{$menu-background}; |
35 | --menuForegroundColor: #{$menu-color}; | 37 | --menuForegroundColor: #{$menu-color}; |
36 | --submenuColor: #{$sub-menu-color}; | 38 | --submenuColor: #{$sub-menu-color}; |
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss index c937a0f72..d0ee1e2f0 100644 --- a/client/src/sass/include/_miniature.scss +++ b/client/src/sass/include/_miniature.scss | |||
@@ -187,7 +187,7 @@ $play-overlay-width: 18px; | |||
187 | } | 187 | } |
188 | 188 | ||
189 | .followers { | 189 | .followers { |
190 | color: $grey-foreground-color; | 190 | color: var(--greyForegroundColor); |
191 | font-weight: normal; | 191 | font-weight: normal; |
192 | font-size: 14px; | 192 | font-size: 14px; |
193 | margin-left: 10px; | 193 | margin-left: 10px; |
@@ -203,7 +203,7 @@ $play-overlay-width: 18px; | |||
203 | display: inline-block; | 203 | display: inline-block; |
204 | font-size: 16px; | 204 | font-size: 16px; |
205 | text-transform: uppercase; | 205 | text-transform: uppercase; |
206 | color: $grey-foreground-color; | 206 | color: var(--greyForegroundColor); |
207 | margin-bottom: 10px; | 207 | margin-bottom: 10px; |
208 | font-weight: $font-semibold; | 208 | font-weight: $font-semibold; |
209 | text-decoration: none; | 209 | text-decoration: none; |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 99ca25f9c..80a090159 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -156,7 +156,7 @@ | |||
156 | @mixin tertiary-button { | 156 | @mixin tertiary-button { |
157 | @include button-focus($grey-button-outline-color); | 157 | @include button-focus($grey-button-outline-color); |
158 | 158 | ||
159 | color: $grey-foreground-color; | 159 | color: var(--greyForegroundColor); |
160 | background-color: transparent; | 160 | background-color: transparent; |
161 | 161 | ||
162 | &[disabled], &.disabled { | 162 | &[disabled], &.disabled { |
@@ -173,11 +173,11 @@ | |||
173 | 173 | ||
174 | &, &:active, &:focus { | 174 | &, &:active, &:focus { |
175 | background-color: $grey-background-color; | 175 | background-color: $grey-background-color; |
176 | color: $grey-foreground-color; | 176 | color: var(--greyForegroundColor); |
177 | } | 177 | } |
178 | 178 | ||
179 | &:hover, &:active, &:focus, &[disabled], &.disabled { | 179 | &:hover, &:active, &:focus, &[disabled], &.disabled { |
180 | color: $grey-foreground-color; | 180 | color: var(--greyForegroundColor); |
181 | background-color: $grey-background-hover-color; | 181 | background-color: $grey-background-hover-color; |
182 | } | 182 | } |
183 | 183 | ||
@@ -186,7 +186,7 @@ | |||
186 | } | 186 | } |
187 | 187 | ||
188 | my-global-icon { | 188 | my-global-icon { |
189 | @include apply-svg-color($grey-foreground-color) | 189 | @include apply-svg-color(var(--greyForegroundColor)) |
190 | } | 190 | } |
191 | } | 191 | } |
192 | 192 | ||
@@ -769,7 +769,7 @@ | |||
769 | vertical-align: middle !important; | 769 | vertical-align: middle !important; |
770 | 770 | ||
771 | path { | 771 | path { |
772 | fill: $grey-foreground-color !important; | 772 | fill: var(--greyForegroundColor) !important; |
773 | } | 773 | } |
774 | } | 774 | } |
775 | 775 | ||
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 58955802c..11561e268 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -91,6 +91,8 @@ $variables: ( | |||
91 | --mainForegroundColor: var(--mainForegroundColor), | 91 | --mainForegroundColor: var(--mainForegroundColor), |
92 | --secondaryColor: var(--secondaryColor), | 92 | --secondaryColor: var(--secondaryColor), |
93 | 93 | ||
94 | --greyForegroundColor: var(--greyForegroundColor), | ||
95 | |||
94 | --menuBackgroundColor: var(--menuBackgroundColor), | 96 | --menuBackgroundColor: var(--menuBackgroundColor), |
95 | --menuForegroundColor: var(--menuForegroundColor), | 97 | --menuForegroundColor: var(--menuForegroundColor), |
96 | --submenuColor: var(--submenuColor), | 98 | --submenuColor: var(--submenuColor), |