Theme breaking: --submenuColor becomes --submenuBackgroundColor

diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss
index 80f23ba6fdbac7f0eb39fb2a8548ac06c40c7be3..d7213df1d1e79d21cf13671c273dcfd2c6ea25d1 100644 (file)
--- a/client/src/app/+accounts/accounts.component.scss
+++ b/client/src/app/+accounts/accounts.component.scss
@@ -50,7 +50,7 @@ my-user-moderation-dropdown,
   grid-template-columns: 1fr min-content;
   grid-template-rows: auto auto;
 
-  background-color: pvar(--submenuColor);
+  background-color: pvar(--submenuBackgroundColor);
   margin-bottom: 45px;
   padding-top: var(--myGlobalTopPadding);
   font-size: var(--myFontSize);
@@ -111,7 +111,7 @@ my-user-moderation-dropdown,
   .description:not(.expanded) {
     max-height: 70px;
 
-    @include fade-text(30px, pvar(--submenuColor));
+    @include fade-text(30px, pvar(--submenuBackgroundColor));
   }
 
   .show-more {

diff --git a/client/src/app/+admin/plugins/shared/plugin-list.component.scss b/client/src/app/+admin/plugins/shared/plugin-list.component.scss
index 83030b7e0444eea559126747e51585c58bba29b7..f59a01b74759ca21437ec6c5f4fe3ca9e13307c9 100644 (file)
--- a/client/src/app/+admin/plugins/shared/plugin-list.component.scss
+++ b/client/src/app/+admin/plugins/shared/plugin-list.component.scss
@@ -3,7 +3,7 @@
 
 .plugin {
   margin: 15px 0;
-  background-color: pvar(--submenuColor);
+  background-color: pvar(--submenuBackgroundColor);
 }
 
 .first-row {

diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
index de7e1993f7511c815c5a62e57f1864af00cf9328..90434fcf17114c75116732d7e0350dbacf9ab86e 100644 (file)
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
@@ -3,7 +3,7 @@
 @import '_miniature';
 
 .playlist-info {
-  background-color: pvar(--submenuColor);
+  background-color: pvar(--submenuBackgroundColor);
   margin-left: -$not-expanded-horizontal-margins;
   margin-top: -$sub-menu-margin-bottom;
 
@@ -16,7 +16,7 @@
 
   /* fix ellipsis dots background color */
   ::ng-deep .miniature-name::after {
-    background-color: pvar(--submenuColor) !important;
+    background-color: pvar(--submenuBackgroundColor) !important;
   }
 }
 

diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
index 1fef749947b675307712310de74e481cd8005b6b..dd87641fc007f8e2e466a219b31a028547ce985f 100644 (file)
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
@@ -3,8 +3,8 @@
 
 .first-step-block {
   .torrent-or-magnet {
-    @include divider($color: pvar(--inputPlaceholderColor), $background: pvar(--submenuColor));
-    
+    @include divider($color: pvar(--inputPlaceholderColor), $background: pvar(--submenuBackgroundColor));
+
     &[data-content] {
       margin: 1.5rem 0;
     }

diff --git a/client/src/app/+videos/+video-edit/video-add.component.scss b/client/src/app/+videos/+video-edit/video-add.component.scss
index 5db9e823dd25ac4191e5d59c2a1a2f9fd276cb5d..1ebee946b71d3e686edf9299a952089e2613a31a 100644 (file)
--- a/client/src/app/+videos/+video-edit/video-add.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add.component.scss
@@ -67,7 +67,7 @@ $nav-link-height: 40px;
     &.active {
       border-color: $border-color;
       border-bottom-color: transparent;
-      background-color: pvar(--submenuColor) !important;
+      background-color: pvar(--submenuBackgroundColor) !important;
 
       span {
         border-bottom-color: pvar(--mainColor);
@@ -84,7 +84,7 @@ $nav-link-height: 40px;
   border: $border-width $border-type $border-color;
   border-top: transparent;
 
-  background-color: pvar(--submenuColor);
+  background-color: pvar(--submenuBackgroundColor);
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   width: 100%;

diff --git a/client/src/app/shared/shared-instance/instance-about-accordion.component.scss b/client/src/app/shared/shared-instance/instance-about-accordion.component.scss
index 275600d60f3ca886e31ae6616f5001bc52f7b5a4..2f6b420e34352ec6ba8a0d518f54ac280c989be6 100644 (file)
--- a/client/src/app/shared/shared-instance/instance-about-accordion.component.scss
+++ b/client/src/app/shared/shared-instance/instance-about-accordion.component.scss
@@ -31,7 +31,7 @@ ngb-accordion ::ng-deep {
       padding: 0;
 
       & + .collapse.show {
-        background-color: var(--submenuColor);
+        background-color: var(--submenuBackgroundColor);
       }
     }
   }

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index f4c3d86a8bbbc93059f6c6589a64af1dffe9b821..0cc394c8e8f899f7e6e568994323c0f7bc7b701d 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -39,7 +39,7 @@ body {
   --menuBackgroundColor: #{$menu-background};
   --menuForegroundColor: #{$menu-color};
 
-  --submenuColor: #{$sub-menu-color};
+  --submenuBackgroundColor: #{$sub-menu-background-color};
   --channelBackgroundColor: #{$channel-background-color};
 
   --inputForegroundColor: #{$input-foreground-color};
@@ -156,7 +156,7 @@ my-input-toggle-hidden ::ng-deep input {
   }
 
   .sub-menu {
-    background-color: pvar(--submenuColor);
+    background-color: pvar(--submenuBackgroundColor);
     width: 100%;
     display: flex;
     align-items: center;
@@ -267,7 +267,7 @@ my-input-toggle-hidden ::ng-deep input {
     opacity: 0.6;
 
     &.active {
-      background-color: pvar(--submenuColor);
+      background-color: pvar(--submenuBackgroundColor);
     }
 
     &.active, &:hover, &:active, &:focus {

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index affffc4cc869a471c3356daa8b8651e0c9ace953..b3190a4e3d92490e6b171bc8cfc304ede9d9b6d2 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -696,7 +696,7 @@
   padding: 0.75rem 1rem;
   margin-bottom: 1rem;
   list-style: none;
-  background-color: pvar(--submenuColor);
+  background-color: pvar(--submenuBackgroundColor);
   border-radius: 0.25rem;
 
   .breadcrumb-item {
@@ -751,7 +751,7 @@
     & > a,
     & > div {
       padding: 20px;
-      background: pvar(--submenuColor);
+      background: pvar(--submenuBackgroundColor);
       border-radius: 4px;
       box-sizing: border-box;
       height: 100%;
@@ -773,7 +773,7 @@
   }
 }
 
-@mixin divider($color: pvar(--submenuColor), $background: pvar(--mainBackgroundColor)) {
+@mixin divider($color: pvar(--submenuBackgroundColor), $background: pvar(--mainBackgroundColor)) {
   width: 95%;
   border-top: .05rem solid $color;
   height: .05rem;

diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 724a897fa5e37cd49f882fe85662af250bc0c7b4..532eaf65048e6c50dff06290166a207dbc17d8ae 100644 (file)
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -48,7 +48,7 @@ $menu-bottom-color: #C6C6C6;
 $menu-width: 240px;
 $menu-lateral-padding: 26px;
 
-$sub-menu-color: #F7F7F7;
+$sub-menu-background-color: #F7F7F7;
 $sub-menu-height: 81px;
 
 $channel-background-color: #f6ede8;
@@ -103,7 +103,7 @@ $variables: (
   --menuBackgroundColor: var(--menuBackgroundColor),
   --menuForegroundColor: var(--menuForegroundColor),
 
-  --submenuColor: var(--submenuColor),
+  --submenuBackgroundColor: var(--submenuBackgroundColor),
   --channelBackgroundColor: var(--channelBackgroundColor),
 
   --inputForegroundColor: var(--inputForegroundColor),

diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index afa5778199bce3f5cccd85c01b235a40f207f713..e71fb99a72e60ec53bac198f262cfc9d8dec14ca 100644 (file)
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -547,7 +547,7 @@ p-table {
     height: 46px;
 
     &.p-highlight {
-      background-color: pvar(--submenuColor) !important;
+      background-color: pvar(--submenuBackgroundColor) !important;
 
       td, td > a {
         color: pvar(--mainForegroundColor) !important;
@@ -558,7 +558,7 @@ p-table {
   .p-datatable-tbody {
     tr {
       &:hover {
-        background-color: pvar(--submenuColor) !important;
+        background-color: pvar(--submenuBackgroundColor) !important;
       }
 
       td {
@@ -590,16 +590,16 @@ p-table {
   th {
     border: none !important;
     border-bottom: 1px solid !important;
-    border-color: pvar(--submenuColor) !important;
+    border-color: pvar(--submenuBackgroundColor) !important;
     text-align: left !important;
     padding: 5px 0 5px 15px !important;
     font-weight: $font-semibold !important;
     color: pvar(--mainForegroundColor) !important;
 
     &.p-sortable-column:hover {
-      background-color: pvar(--submenuColor) !important;
+      background-color: pvar(--submenuBackgroundColor) !important;
       border: 1px solid !important;
-      border-color: pvar(--submenuColor) !important;
+      border-color: pvar(--submenuBackgroundColor) !important;
       border-width: 0 1px !important;
 
       &:first-child {
@@ -608,7 +608,7 @@ p-table {
     }
 
     &.p-highlight {
-      background-color: pvar(--submenuColor) !important;
+      background-color: pvar(--submenuBackgroundColor) !important;
 
       .pi {
         @extend .glyphicon;
@@ -654,7 +654,7 @@ p-table {
       position: relative;
       border: none;
       border-top: 1px solid !important;
-      border-color: pvar(--submenuColor) !important;
+      border-color: pvar(--submenuBackgroundColor) !important;
       height: 40px;
       display: flex;
       justify-content: center;