From b788e69131dccc1be147244e5b4d9e64deb2dc76 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 15 Mar 2022 14:12:37 +0100
Subject: Some fixes for themes

---
 client/src/sass/application.scss        |  8 +++++++-
 client/src/sass/bootstrap.scss          | 11 +++++++++--
 client/src/sass/classes.scss            |  4 ++++
 client/src/sass/include/_mixins.scss    |  8 ++++----
 client/src/sass/include/_variables.scss |  4 ++++
 client/src/sass/ng-select.scss          |  5 +++++
 6 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'client/src/sass')

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 9f64f7426..81bbfa43a 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -28,13 +28,18 @@ body {
   --mainColor: #{$main-color};
   --mainColorLighter: #{$main-color-lighter};
   --mainColorLightest: #{$main-color-lightest};
+
   --mainHoverColor: #{$main-hover-color};
+  --mainBackgroundHoverColor: #{$main-background-hover-color};
+
   --mainBackgroundColor: #{$bg-color};
   --mainForegroundColor: #{$fg-color};
+
   --secondaryColor: #{$secondary-color};
 
   --greyForegroundColor: #{$grey-foreground-color};
   --greyBackgroundColor: #{$grey-background-color};
+  --greySecondaryBackgroundColor: #{$grey-background-hover-color};
 
   --menuBackgroundColor: #{$menu-background};
   --menuForegroundColor: #{$menu-color};
@@ -51,6 +56,7 @@ body {
   --markdownTextareaBackgroundColor: #{$markdown-textarea-background-color};
 
   --actionButtonColor: #{$grey-foreground-color};
+
   --supportButtonBackgroundColor: #{transparent};
   --supportButtonColor: #{pvar(--actionButtonColor)};
   --supportButtonHeartColor: #{$support-button-heart};
@@ -312,7 +318,7 @@ table {
 }
 
 .form-group-description {
-  @extend .text-muted;
+  @extend .muted !optional;
 
   font-size: 90%;
   margin-top: 10px;
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 432e23e92..d6af7f485 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -89,6 +89,9 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
   font-size: 15px;
 
+  color: pvar(--mainForegroundColor);
+  background-color: pvar(--mainBackgroundColor);
+
   .dropdown-header {
     @include padding-left(1rem);
   }
@@ -96,14 +99,19 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   .dropdown-item {
     padding: 3px 15px;
 
+    color: pvar(--mainForegroundColor);
+    background-color: pvar(--mainBackgroundColor);
+
     &.active {
       color: pvar(--mainBackgroundColor) !important;
       background-color: pvar(--mainHoverColor);
       opacity: 0.9;
     }
 
-    &:active {
+    a:active,
+    &:hover {
       color: pvar(--mainForegroundColor) !important;
+      background-color: pvar(--mainBackgroundHoverColor);
     }
 
     &::after {
@@ -117,7 +125,6 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
   a {
     @include disable-default-a-behaviour;
-    color: #000 !important;
   }
 }
 
diff --git a/client/src/sass/classes.scss b/client/src/sass/classes.scss
index 1cd7a6058..90cdcf3ed 100644
--- a/client/src/sass/classes.scss
+++ b/client/src/sass/classes.scss
@@ -28,3 +28,7 @@
 .peertube-radio-container {
   @include peertube-radio-container;
 }
+
+.muted {
+  color: pvar(--greyForegroundColor) !important;
+}
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 291bff6db..8de23e64d 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -124,8 +124,8 @@
 @mixin peertube-textarea ($width, $height) {
   @include peertube-input-text($width);
 
-  color: pvar(--textareaForegroundColor);
-  background-color: pvar(--textareaBackgroundColor);
+  color: pvar(--textareaForegroundColor) !important;
+  background-color: pvar(--textareaBackgroundColor) !important;
   height: $height;
   padding: 5px 15px;
   font-size: 15px;
@@ -207,7 +207,7 @@
 @mixin grey-button {
   @include button-focus($grey-button-outline-color);
 
-  background-color: $grey-background-color;
+  background-color: pvar(--greyBackgroundColor);
   color: pvar(--greyForegroundColor);
 
   &:hover,
@@ -216,7 +216,7 @@
   &[disabled],
   &.disabled {
     color: pvar(--greyForegroundColor);
-    background-color: $grey-background-hover-color;
+    background-color: pvar(--greySecondaryBackgroundColor);
   }
 
   &[disabled],
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index f68f4e18d..fd1b137dc 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -18,7 +18,9 @@ $grey-button-outline-color: scale-color($grey-foreground-color, $alpha: -95%);
 $main-color: hsl(24, 90%, 50%);
 $main-color-lighter: lighten($main-color, 10%);
 $main-color-lightest: lighten($main-color, 40%);
+
 $main-hover-color: lighten($main-color, 5%);
+$main-background-hover-color: #e9ecef;
 
 $secondary-color: hsl(187, 77%, 34%);
 
@@ -109,6 +111,7 @@ $variables: (
   --mainColorLightest: var(--mainColorLightest),
 
   --mainHoverColor: var(--mainHoverColor),
+  --mainBackgroundHoverColor: var(--mainBackgroundHoverColor),
 
   --mainBackgroundColor: var(--mainBackgroundColor),
   --mainForegroundColor: var(--mainForegroundColor),
@@ -117,6 +120,7 @@ $variables: (
 
   --greyForegroundColor: var(--greyForegroundColor),
   --greyBackgroundColor: var(--greyBackgroundColor),
+  --greySecondaryBackgroundColor: var(--greySecondaryBackgroundColor),
 
   --menuBackgroundColor: var(--menuBackgroundColor),
   --menuForegroundColor: var(--menuForegroundColor),
diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index df0e0aaf4..f4c908da3 100644
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -27,6 +27,11 @@ $ng-select-value-font-size: 15px;
     }
   }
 
+  .ng-dropdown-panel .ng-dropdown-panel-items .ng-option {
+    color: pvar(--mainForegroundColor);
+    background-color: pvar(--mainBackgroundColor);
+  }
+
   .ng-select-container {
     background-color: pvar(--inputBackgroundColor);
   }
-- 
cgit v1.2.3