borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Theme breaking: --submenuColor becomes --submenuBackgroundColor

Browse Source
This commit is contained in:
Chocobozzz 2021-03-31 09:07:25 +02:00
parent 733dbc535d
commit 218f730c7b
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/+accounts/accounts.component.scss
View File

@ -50,7 +50,7 @@ my-user-moderation-dropdown,
grid-template-columns: 1fr min-content; grid-template-columns: 1fr min-content;
grid-template-rows: auto auto; grid-template-rows: auto auto;
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
margin-bottom: 45px; margin-bottom: 45px;
padding-top: var(--myGlobalTopPadding); padding-top: var(--myGlobalTopPadding);
font-size: var(--myFontSize); font-size: var(--myFontSize);
@ -111,7 +111,7 @@ my-user-moderation-dropdown,
.description:not(.expanded) { .description:not(.expanded) {
max-height: 70px; max-height: 70px;
@include fade-text(30px, pvar(--submenuColor)); @include fade-text(30px, pvar(--submenuBackgroundColor));
} }
.show-more { .show-more {

2
client/src/app/+admin/plugins/shared/plugin-list.component.scss
View File

@ -3,7 +3,7 @@
.plugin { .plugin {
margin: 15px 0; margin: 15px 0;
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
} }
.first-row { .first-row {

4
client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.scss
View File

@ -3,7 +3,7 @@
@import '_miniature'; @import '_miniature';
.playlist-info { .playlist-info {
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
margin-left: -$not-expanded-horizontal-margins; margin-left: -$not-expanded-horizontal-margins;
margin-top: -$sub-menu-margin-bottom; margin-top: -$sub-menu-margin-bottom;
@ -16,7 +16,7 @@
/* fix ellipsis dots background color */ /* fix ellipsis dots background color */
::ng-deep .miniature-name::after { ::ng-deep .miniature-name::after {
background-color: pvar(--submenuColor) !important; background-color: pvar(--submenuBackgroundColor) !important;
} }
} }

4
client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
View File

@ -3,8 +3,8 @@
.first-step-block { .first-step-block {
.torrent-or-magnet { .torrent-or-magnet {
@include divider($color: pvar(--inputPlaceholderColor), $background: pvar(--submenuColor)); @include divider($color: pvar(--inputPlaceholderColor), $background: pvar(--submenuBackgroundColor));
&[data-content] { &[data-content] {
margin: 1.5rem 0; margin: 1.5rem 0;
} }

4
client/src/app/+videos/+video-edit/video-add.component.scss
View File

@ -67,7 +67,7 @@ $nav-link-height: 40px;
&.active { &.active {
border-color: $border-color; border-color: $border-color;
border-bottom-color: transparent; border-bottom-color: transparent;
background-color: pvar(--submenuColor) !important; background-color: pvar(--submenuBackgroundColor) !important;
span { span {
border-bottom-color: pvar(--mainColor); border-bottom-color: pvar(--mainColor);
@ -84,7 +84,7 @@ $nav-link-height: 40px;
border: $border-width $border-type $border-color; border: $border-width $border-type $border-color;
border-top: transparent; border-top: transparent;
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
width: 100%; width: 100%;

2
client/src/app/shared/shared-instance/instance-about-accordion.component.scss
View File

@ -31,7 +31,7 @@ ngb-accordion ::ng-deep {
padding: 0; padding: 0;
& + .collapse.show { & + .collapse.show {
background-color: var(--submenuColor); background-color: var(--submenuBackgroundColor);
} }
} }
} }

6
client/src/sass/application.scss
View File

@ -39,7 +39,7 @@ body {
--menuBackgroundColor: #{$menu-background}; --menuBackgroundColor: #{$menu-background};
--menuForegroundColor: #{$menu-color}; --menuForegroundColor: #{$menu-color};
--submenuColor: #{$sub-menu-color}; --submenuBackgroundColor: #{$sub-menu-background-color};
--channelBackgroundColor: #{$channel-background-color}; --channelBackgroundColor: #{$channel-background-color};
--inputForegroundColor: #{$input-foreground-color}; --inputForegroundColor: #{$input-foreground-color};
@ -156,7 +156,7 @@ my-input-toggle-hidden ::ng-deep input {
} }
.sub-menu { .sub-menu {
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -267,7 +267,7 @@ my-input-toggle-hidden ::ng-deep input {
opacity: 0.6; opacity: 0.6;
&.active { &.active {
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
} }
&.active, &:hover, &:active, &:focus { &.active, &:hover, &:active, &:focus {

6
client/src/sass/include/_mixins.scss
View File

@ -696,7 +696,7 @@
padding: 0.75rem 1rem; padding: 0.75rem 1rem;
margin-bottom: 1rem; margin-bottom: 1rem;
list-style: none; list-style: none;
background-color: pvar(--submenuColor); background-color: pvar(--submenuBackgroundColor);
border-radius: 0.25rem; border-radius: 0.25rem;
.breadcrumb-item { .breadcrumb-item {
@ -751,7 +751,7 @@
& > a, & > a,
& > div { & > div {
padding: 20px; padding: 20px;
background: pvar(--submenuColor); background: pvar(--submenuBackgroundColor);
border-radius: 4px; border-radius: 4px;
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
@ -773,7 +773,7 @@
} }
} }
@mixin divider($color: pvar(--submenuColor), $background: pvar(--mainBackgroundColor)) { @mixin divider($color: pvar(--submenuBackgroundColor), $background: pvar(--mainBackgroundColor)) {
width: 95%; width: 95%;
border-top: .05rem solid $color; border-top: .05rem solid $color;
height: .05rem; height: .05rem;

4
client/src/sass/include/_variables.scss
View File

@ -48,7 +48,7 @@ $menu-bottom-color: #C6C6C6;
$menu-width: 240px; $menu-width: 240px;
$menu-lateral-padding: 26px; $menu-lateral-padding: 26px;
$sub-menu-color: #F7F7F7; $sub-menu-background-color: #F7F7F7;
$sub-menu-height: 81px; $sub-menu-height: 81px;
$channel-background-color: #f6ede8; $channel-background-color: #f6ede8;
@ -103,7 +103,7 @@ $variables: (
--menuBackgroundColor: var(--menuBackgroundColor), --menuBackgroundColor: var(--menuBackgroundColor),
--menuForegroundColor: var(--menuForegroundColor), --menuForegroundColor: var(--menuForegroundColor),
--submenuColor: var(--submenuColor), --submenuBackgroundColor: var(--submenuBackgroundColor),
--channelBackgroundColor: var(--channelBackgroundColor), --channelBackgroundColor: var(--channelBackgroundColor),
--inputForegroundColor: var(--inputForegroundColor), --inputForegroundColor: var(--inputForegroundColor),

14
client/src/sass/primeng-custom.scss
View File

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