diff options
10 files changed, 25 insertions, 25 deletions
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss index 80f23ba6f..d7213df1d 100644 --- a/client/src/app/+accounts/accounts.component.scss +++ b/client/src/app/+accounts/accounts.component.scss | |||
@@ -50,7 +50,7 @@ my-user-moderation-dropdown, | |||
50 | grid-template-columns: 1fr min-content; | 50 | grid-template-columns: 1fr min-content; |
51 | grid-template-rows: auto auto; | 51 | grid-template-rows: auto auto; |
52 | 52 | ||
53 | background-color: pvar(--submenuColor); | 53 | background-color: pvar(--submenuBackgroundColor); |
54 | margin-bottom: 45px; | 54 | margin-bottom: 45px; |
55 | padding-top: var(--myGlobalTopPadding); | 55 | padding-top: var(--myGlobalTopPadding); |
56 | font-size: var(--myFontSize); | 56 | font-size: var(--myFontSize); |
@@ -111,7 +111,7 @@ my-user-moderation-dropdown, | |||
111 | .description:not(.expanded) { | 111 | .description:not(.expanded) { |
112 | max-height: 70px; | 112 | max-height: 70px; |
113 | 113 | ||
114 | @include fade-text(30px, pvar(--submenuColor)); | 114 | @include fade-text(30px, pvar(--submenuBackgroundColor)); |
115 | } | 115 | } |
116 | 116 | ||
117 | .show-more { | 117 | .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 83030b7e0..f59a01b74 100644 --- 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 @@ | |||
3 | 3 | ||
4 | .plugin { | 4 | .plugin { |
5 | margin: 15px 0; | 5 | margin: 15px 0; |
6 | background-color: pvar(--submenuColor); | 6 | background-color: pvar(--submenuBackgroundColor); |
7 | } | 7 | } |
8 | 8 | ||
9 | .first-row { | 9 | .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 de7e1993f..90434fcf1 100644 --- 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 @@ | |||
3 | @import '_miniature'; | 3 | @import '_miniature'; |
4 | 4 | ||
5 | .playlist-info { | 5 | .playlist-info { |
6 | background-color: pvar(--submenuColor); | 6 | background-color: pvar(--submenuBackgroundColor); |
7 | margin-left: -$not-expanded-horizontal-margins; | 7 | margin-left: -$not-expanded-horizontal-margins; |
8 | margin-top: -$sub-menu-margin-bottom; | 8 | margin-top: -$sub-menu-margin-bottom; |
9 | 9 | ||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | /* fix ellipsis dots background color */ | 17 | /* fix ellipsis dots background color */ |
18 | ::ng-deep .miniature-name::after { | 18 | ::ng-deep .miniature-name::after { |
19 | background-color: pvar(--submenuColor) !important; | 19 | background-color: pvar(--submenuBackgroundColor) !important; |
20 | } | 20 | } |
21 | } | 21 | } |
22 | 22 | ||
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 1fef74994..dd87641fc 100644 --- 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 @@ | |||
3 | 3 | ||
4 | .first-step-block { | 4 | .first-step-block { |
5 | .torrent-or-magnet { | 5 | .torrent-or-magnet { |
6 | @include divider($color: pvar(--inputPlaceholderColor), $background: pvar(--submenuColor)); | 6 | @include divider($color: pvar(--inputPlaceholderColor), $background: pvar(--submenuBackgroundColor)); |
7 | 7 | ||
8 | &[data-content] { | 8 | &[data-content] { |
9 | margin: 1.5rem 0; | 9 | margin: 1.5rem 0; |
10 | } | 10 | } |
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 5db9e823d..1ebee946b 100644 --- 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; | |||
67 | &.active { | 67 | &.active { |
68 | border-color: $border-color; | 68 | border-color: $border-color; |
69 | border-bottom-color: transparent; | 69 | border-bottom-color: transparent; |
70 | background-color: pvar(--submenuColor) !important; | 70 | background-color: pvar(--submenuBackgroundColor) !important; |
71 | 71 | ||
72 | span { | 72 | span { |
73 | border-bottom-color: pvar(--mainColor); | 73 | border-bottom-color: pvar(--mainColor); |
@@ -84,7 +84,7 @@ $nav-link-height: 40px; | |||
84 | border: $border-width $border-type $border-color; | 84 | border: $border-width $border-type $border-color; |
85 | border-top: transparent; | 85 | border-top: transparent; |
86 | 86 | ||
87 | background-color: pvar(--submenuColor); | 87 | background-color: pvar(--submenuBackgroundColor); |
88 | border-bottom-left-radius: 3px; | 88 | border-bottom-left-radius: 3px; |
89 | border-bottom-right-radius: 3px; | 89 | border-bottom-right-radius: 3px; |
90 | width: 100%; | 90 | 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 275600d60..2f6b420e3 100644 --- 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 { | |||
31 | padding: 0; | 31 | padding: 0; |
32 | 32 | ||
33 | & + .collapse.show { | 33 | & + .collapse.show { |
34 | background-color: var(--submenuColor); | 34 | background-color: var(--submenuBackgroundColor); |
35 | } | 35 | } |
36 | } | 36 | } |
37 | } | 37 | } |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index f4c3d86a8..0cc394c8e 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -39,7 +39,7 @@ body { | |||
39 | --menuBackgroundColor: #{$menu-background}; | 39 | --menuBackgroundColor: #{$menu-background}; |
40 | --menuForegroundColor: #{$menu-color}; | 40 | --menuForegroundColor: #{$menu-color}; |
41 | 41 | ||
42 | --submenuColor: #{$sub-menu-color}; | 42 | --submenuBackgroundColor: #{$sub-menu-background-color}; |
43 | --channelBackgroundColor: #{$channel-background-color}; | 43 | --channelBackgroundColor: #{$channel-background-color}; |
44 | 44 | ||
45 | --inputForegroundColor: #{$input-foreground-color}; | 45 | --inputForegroundColor: #{$input-foreground-color}; |
@@ -156,7 +156,7 @@ my-input-toggle-hidden ::ng-deep input { | |||
156 | } | 156 | } |
157 | 157 | ||
158 | .sub-menu { | 158 | .sub-menu { |
159 | background-color: pvar(--submenuColor); | 159 | background-color: pvar(--submenuBackgroundColor); |
160 | width: 100%; | 160 | width: 100%; |
161 | display: flex; | 161 | display: flex; |
162 | align-items: center; | 162 | align-items: center; |
@@ -267,7 +267,7 @@ my-input-toggle-hidden ::ng-deep input { | |||
267 | opacity: 0.6; | 267 | opacity: 0.6; |
268 | 268 | ||
269 | &.active { | 269 | &.active { |
270 | background-color: pvar(--submenuColor); | 270 | background-color: pvar(--submenuBackgroundColor); |
271 | } | 271 | } |
272 | 272 | ||
273 | &.active, &:hover, &:active, &:focus { | 273 | &.active, &:hover, &:active, &:focus { |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index affffc4cc..b3190a4e3 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -696,7 +696,7 @@ | |||
696 | padding: 0.75rem 1rem; | 696 | padding: 0.75rem 1rem; |
697 | margin-bottom: 1rem; | 697 | margin-bottom: 1rem; |
698 | list-style: none; | 698 | list-style: none; |
699 | background-color: pvar(--submenuColor); | 699 | background-color: pvar(--submenuBackgroundColor); |
700 | border-radius: 0.25rem; | 700 | border-radius: 0.25rem; |
701 | 701 | ||
702 | .breadcrumb-item { | 702 | .breadcrumb-item { |
@@ -751,7 +751,7 @@ | |||
751 | & > a, | 751 | & > a, |
752 | & > div { | 752 | & > div { |
753 | padding: 20px; | 753 | padding: 20px; |
754 | background: pvar(--submenuColor); | 754 | background: pvar(--submenuBackgroundColor); |
755 | border-radius: 4px; | 755 | border-radius: 4px; |
756 | box-sizing: border-box; | 756 | box-sizing: border-box; |
757 | height: 100%; | 757 | height: 100%; |
@@ -773,7 +773,7 @@ | |||
773 | } | 773 | } |
774 | } | 774 | } |
775 | 775 | ||
776 | @mixin divider($color: pvar(--submenuColor), $background: pvar(--mainBackgroundColor)) { | 776 | @mixin divider($color: pvar(--submenuBackgroundColor), $background: pvar(--mainBackgroundColor)) { |
777 | width: 95%; | 777 | width: 95%; |
778 | border-top: .05rem solid $color; | 778 | border-top: .05rem solid $color; |
779 | height: .05rem; | 779 | height: .05rem; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 724a897fa..532eaf650 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -48,7 +48,7 @@ $menu-bottom-color: #C6C6C6; | |||
48 | $menu-width: 240px; | 48 | $menu-width: 240px; |
49 | $menu-lateral-padding: 26px; | 49 | $menu-lateral-padding: 26px; |
50 | 50 | ||
51 | $sub-menu-color: #F7F7F7; | 51 | $sub-menu-background-color: #F7F7F7; |
52 | $sub-menu-height: 81px; | 52 | $sub-menu-height: 81px; |
53 | 53 | ||
54 | $channel-background-color: #f6ede8; | 54 | $channel-background-color: #f6ede8; |
@@ -103,7 +103,7 @@ $variables: ( | |||
103 | --menuBackgroundColor: var(--menuBackgroundColor), | 103 | --menuBackgroundColor: var(--menuBackgroundColor), |
104 | --menuForegroundColor: var(--menuForegroundColor), | 104 | --menuForegroundColor: var(--menuForegroundColor), |
105 | 105 | ||
106 | --submenuColor: var(--submenuColor), | 106 | --submenuBackgroundColor: var(--submenuBackgroundColor), |
107 | --channelBackgroundColor: var(--channelBackgroundColor), | 107 | --channelBackgroundColor: var(--channelBackgroundColor), |
108 | 108 | ||
109 | --inputForegroundColor: var(--inputForegroundColor), | 109 | --inputForegroundColor: var(--inputForegroundColor), |
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index afa577819..e71fb99a7 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss | |||
@@ -547,7 +547,7 @@ p-table { | |||
547 | height: 46px; | 547 | height: 46px; |
548 | 548 | ||
549 | &.p-highlight { | 549 | &.p-highlight { |
550 | background-color: pvar(--submenuColor) !important; | 550 | background-color: pvar(--submenuBackgroundColor) !important; |
551 | 551 | ||
552 | td, td > a { | 552 | td, td > a { |
553 | color: pvar(--mainForegroundColor) !important; | 553 | color: pvar(--mainForegroundColor) !important; |
@@ -558,7 +558,7 @@ p-table { | |||
558 | .p-datatable-tbody { | 558 | .p-datatable-tbody { |
559 | tr { | 559 | tr { |
560 | &:hover { | 560 | &:hover { |
561 | background-color: pvar(--submenuColor) !important; | 561 | background-color: pvar(--submenuBackgroundColor) !important; |
562 | } | 562 | } |
563 | 563 | ||
564 | td { | 564 | td { |
@@ -590,16 +590,16 @@ p-table { | |||
590 | th { | 590 | th { |
591 | border: none !important; | 591 | border: none !important; |
592 | border-bottom: 1px solid !important; | 592 | border-bottom: 1px solid !important; |
593 | border-color: pvar(--submenuColor) !important; | 593 | border-color: pvar(--submenuBackgroundColor) !important; |
594 | text-align: left !important; | 594 | text-align: left !important; |
595 | padding: 5px 0 5px 15px !important; | 595 | padding: 5px 0 5px 15px !important; |
596 | font-weight: $font-semibold !important; | 596 | font-weight: $font-semibold !important; |
597 | color: pvar(--mainForegroundColor) !important; | 597 | color: pvar(--mainForegroundColor) !important; |
598 | 598 | ||
599 | &.p-sortable-column:hover { | 599 | &.p-sortable-column:hover { |
600 | background-color: pvar(--submenuColor) !important; | 600 | background-color: pvar(--submenuBackgroundColor) !important; |
601 | border: 1px solid !important; | 601 | border: 1px solid !important; |
602 | border-color: pvar(--submenuColor) !important; | 602 | border-color: pvar(--submenuBackgroundColor) !important; |
603 | border-width: 0 1px !important; | 603 | border-width: 0 1px !important; |
604 | 604 | ||
605 | &:first-child { | 605 | &:first-child { |
@@ -608,7 +608,7 @@ p-table { | |||
608 | } | 608 | } |
609 | 609 | ||
610 | &.p-highlight { | 610 | &.p-highlight { |
611 | background-color: pvar(--submenuColor) !important; | 611 | background-color: pvar(--submenuBackgroundColor) !important; |
612 | 612 | ||
613 | .pi { | 613 | .pi { |
614 | @extend .glyphicon; | 614 | @extend .glyphicon; |
@@ -654,7 +654,7 @@ p-table { | |||
654 | position: relative; | 654 | position: relative; |
655 | border: none; | 655 | border: none; |
656 | border-top: 1px solid !important; | 656 | border-top: 1px solid !important; |
657 | border-color: pvar(--submenuColor) !important; | 657 | border-color: pvar(--submenuBackgroundColor) !important; |
658 | height: 40px; | 658 | height: 40px; |
659 | display: flex; | 659 | display: flex; |
660 | justify-content: center; | 660 | justify-content: center; |