From 8e20aa0c233a31a4739066a2d2ef872017e99eba Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 27 Nov 2024 08:45:59 +0100 Subject: [PATCH] Style fixes Signed-off-by: Chocobozzz --- ...deo-caption-edit-modal-content.component.scss | 2 +- client/src/app/menu/menu.component.scss | 4 ++++ .../app/modal/admin-welcome-modal.component.scss | 4 ++++ .../menu/horizontal-menu.component.scss | 16 ++++++++-------- .../video-thumbnail.component.ts | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.scss b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.scss index 5c0afaaba..31d4e8c60 100644 --- a/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.scss +++ b/client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.scss @@ -23,6 +23,6 @@ } my-timestamp-input { - width: 115px; + width: 130px; display: inline-block; } diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 7cad4928c..5b7303ea8 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -284,4 +284,8 @@ my-button[theme=secondary] ::ng-deep my-global-icon { .toggle-menu-container { display: none; } + + .block-title { + max-width: 90%; + } } diff --git a/client/src/app/modal/admin-welcome-modal.component.scss b/client/src/app/modal/admin-welcome-modal.component.scss index 2dd63902b..afcd2406f 100644 --- a/client/src/app/modal/admin-welcome-modal.component.scss +++ b/client/src/app/modal/admin-welcome-modal.component.scss @@ -6,6 +6,10 @@ align-items: center; justify-content: center; margin-top: 50px; + + @include on-small-main-col { + flex-wrap: wrap; + } } .mascot-fw { diff --git a/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss b/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss index 499276f27..953f73944 100644 --- a/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss +++ b/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss @@ -35,7 +35,7 @@ h1 { } @mixin child-active { - color: pvar(--fg-350); + color: pvar(--fg-400); font-weight: $font-bold; background-color: pvar(--bg-secondary-400); text-decoration: none; @@ -57,7 +57,6 @@ h1 { .parent-container .entry, .entry.in-modal { - color: pvar(--fg-100); display: inline-block; font-weight: $font-bold; white-space: nowrap; @@ -65,14 +64,14 @@ h1 { @include font-size(22px); @include disable-default-a-behaviour; - &:hover, - &:active, - &:focus { + &:hover { color: pvar(--fg); } } .parent-container .entry { + color: pvar(--fg-100); + @include margin-right(2rem); &.active, @@ -84,8 +83,11 @@ h1 { } .entry.in-modal { + color: pvar(--fg); + padding: 9px 12px; width: 100%; + border-radius: 5px; &.active, &.child-active { @@ -130,9 +132,7 @@ h1 { @include child-active; } - &:hover, - &:active, - &:focus { + &:hover { color: pvar(--fg); } } diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts index 4146a803d..61a47e06d 100644 --- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts +++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts @@ -73,7 +73,7 @@ export class VideoThumbnailComponent { const currentTime = this.video.userHistory.currentTime - return (currentTime / this.video.duration) * 100 + return Math.round((currentTime / this.video.duration)) * 100 } getDurationOverlayLabel () {