From 17bb716bc49b30cc8f22e32f73b9b53ab9ae560d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:16:08 +0100 Subject: [PATCH] Fix some styles Video edit tags, dropdown actions font ... --- client/src/app/header/header.component.scss | 1 + .../app/shared/buttons/button.component.scss | 1 - .../shared/video-edit.component.scss | 13 ++--- client/src/sass/include/_mixins.scss | 1 + client/src/sass/primeng-custom.scss | 55 +++++++++++-------- 5 files changed, 41 insertions(+), 30 deletions(-) diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index cdc457b96..cea415d9b 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -6,6 +6,7 @@ padding-left: 10px; margin-right: 15px; padding-right: 40px; // For the search icon + font-size: 14px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss index be41669cd..04199a2a9 100644 --- a/client/src/app/shared/buttons/button.component.scss +++ b/client/src/app/shared/buttons/button.component.scss @@ -5,7 +5,6 @@ @include peertube-button-link; @include button-with-icon(21px, 0, -2px); - font-size: 15px; font-weight: $font-semibold; color: $grey-foreground-color; background-color: $grey-background-color; diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index cc32fb254..bb775cb0a 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss @@ -23,10 +23,6 @@ my-peertube-checkbox { display: block; } - input, select { - font-size: 15px - } - .label-tags + span { font-size: 15px; } @@ -167,10 +163,10 @@ p-calendar { } tag { - background-color: var(--inputColor) !important; + background-color: $grey-background-color !important; + color: #000 !important; border-radius: 3px !important; font-size: 15px !important; - color: var(--mainForegroundColor) !important; height: 30px !important; line-height: 30px !important; margin: 0 5px 0 0 !important; @@ -193,7 +189,10 @@ p-calendar { top: -1px; height: auto !important; vertical-align: middle !important; - fill: $grey-foreground-color !important; + + path { + fill: $grey-foreground-color !important; + } } &:hover { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 1da240db8..8749649d3 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -76,6 +76,7 @@ border-radius: 3px; padding-left: 15px; padding-right: 15px; + font-size: 15px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 6057b1db0..7ba011180 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -263,33 +263,40 @@ p-calendar .ui-datepicker { } } +.ui-chkbox { -.ui-chkbox-box { - &.ui-state-active { - border-color: var(--mainColor) !important; - background-color: var(--mainColor) !important; + &, .ui-chkbox-box { + width: 18px !important; + height: 18px !important; } - .ui-chkbox-icon { - position: relative; - overflow: visible !important; - - &:after { - content: ''; - position: absolute; - top: 1px; - left: 7px; - width: 5px; - height: 13px; - opacity: 0; - transform: rotate(45deg) scale(0); - border-right: 2px solid var(--mainBackgroundColor); - border-bottom: 2px solid var(--mainBackgroundColor); + .ui-chkbox-box { + &.ui-state-active { + border-color: var(--mainColor) !important; + background-color: var(--mainColor) !important; } - &.pi-check:after { - opacity: 1; - transform: rotate(45deg) scale(1); + .ui-chkbox-icon { + position: relative; + overflow: visible !important; + + &:after { + content: ''; + position: absolute; + top: 1px; + left: 6px; + width: 5px; + height: 12px; + opacity: 0; + transform: rotate(45deg) scale(0); + border-right: 2px solid var(--mainBackgroundColor); + border-bottom: 2px solid var(--mainBackgroundColor); + } + + &.pi-check:after { + opacity: 1; + transform: rotate(45deg) scale(1); + } } } } @@ -354,3 +361,7 @@ p-toast { } } } + +.ui-widget { + font-family: $main-fonts !important; +} -- 2.41.0