aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-03-11 13:50:53 +0100
committerRigel Kent <sendmemail@rigelk.eu>2020-03-11 13:51:24 +0100
commit680b54969230a1d6b3cb56aa357db80b9b23e4f6 (patch)
treeb038c2aa46191a2d1982f53a44eb4c4c8a6bc963
parent75264e371c9cc46d32b072c171e59fc00fde0fe1 (diff)
downloadPeerTube-680b54969230a1d6b3cb56aa357db80b9b23e4f6.tar.gz
PeerTube-680b54969230a1d6b3cb56aa357db80b9b23e4f6.tar.zst
PeerTube-680b54969230a1d6b3cb56aa357db80b9b23e4f6.zip
Migrate palette to HSL
-rw-r--r--client/src/app/+admin/system/logs/logs.component.scss2
-rw-r--r--client/src/sass/application.scss8
-rw-r--r--client/src/sass/include/_mixins.scss2
-rw-r--r--client/src/sass/include/_variables.scss11
4 files changed, 12 insertions, 11 deletions
diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss
index dae8b21c7..c4690ac9e 100644
--- a/client/src/app/+admin/system/logs/logs.component.scss
+++ b/client/src/app/+admin/system/logs/logs.component.scss
@@ -28,7 +28,7 @@
28 } 28 }
29 29
30 .warn { 30 .warn {
31 color: $orange-color; 31 color: var(--mainColor);
32 } 32 }
33 33
34 .error { 34 .error {
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index a9475e484..f76a82243 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -23,12 +23,12 @@ body {
23 /*** theme ***/ 23 /*** theme ***/
24 // now beware node-sass requires interpolation 24 // now beware node-sass requires interpolation
25 // for css custom properties #{$var} 25 // for css custom properties #{$var}
26 --mainColor: #{$orange-color}; 26 --mainColor: #{$main-color};
27 --mainColorLighter: #{$orange-color-lighter}; 27 --mainColorLighter: #{$main-color-lighter};
28 --mainHoverColor: #{$orange-hover-color}; 28 --mainHoverColor: #{$main-hover-color};
29 --mainBackgroundColor: #{$bg-color}; 29 --mainBackgroundColor: #{$bg-color};
30 --mainForegroundColor: #{$fg-color}; 30 --mainForegroundColor: #{$fg-color};
31 --secondaryColor: #{$cyan-color}; 31 --secondaryColor: #{$secondary-color};
32 32
33 --menuBackgroundColor: #{$menu-background}; 33 --menuBackgroundColor: #{$menu-background};
34 --menuForegroundColor: #{$menu-color}; 34 --menuForegroundColor: #{$menu-color};
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 0a500b6f3..5163ea056 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -398,7 +398,7 @@
398 398
399 &:checked + span { 399 &:checked + span {
400 border-color: transparent; 400 border-color: transparent;
401 background: $orange-color; 401 background: var(--mainColor);
402 animation: jelly 0.6s ease; 402 animation: jelly 0.6s ease;
403 403
404 &:after { 404 &:after {
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 91229cee0..3c9fa5939 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -13,11 +13,12 @@ $grey-background-hover-color: #EFEFEF;
13$grey-foreground-color: #585858; 13$grey-foreground-color: #585858;
14$grey-foreground-hover-color: #303030; 14$grey-foreground-hover-color: #303030;
15 15
16$orange-color: #F1680D; 16// Palette
17$orange-color-lighter: rgb(233, 159, 110); 17$main-color: hsl(24, 90%, 50%);
18$orange-hover-color: #F97D46; 18$main-hover-color: lighten($main-color, 5%);
19 19$main-color-lighter: lighten($main-color, 10%);
20$cyan-color: hsl(187, 77%, 34%); 20$secondary-color: hsl(187, 77, 34);
21//
21 22
22$support-button: inherit; 23$support-button: inherit;
23$support-button-heart: #e83e8c; 24$support-button-heart: #e83e8c;