From 3bf07dd8c27aa6ef40111c6f055e8975b3f514f4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 20 May 2020 11:39:31 +0200 Subject: Explicit theme colors for inputs and textarea --- client/src/sass/include/_mixins.scss | 4 ++++ client/src/sass/include/_variables.scss | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'client/src/sass/include') diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index f157ded5e..87b7edaad 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -90,6 +90,7 @@ display: inline-block; height: $button-height; width: $width; + color: var(--inputForegroundColor); background: var(--inputBackgroundColor); border: 1px solid #C6C6C6; border-radius: 3px; @@ -121,6 +122,8 @@ @mixin peertube-textarea ($width, $height) { @include peertube-input-text($width); + color: var(--textareaForegroundColor); + background-color: var(--textareaBackgroundColor); height: $height; padding: 5px 15px; font-size: 15px; @@ -280,6 +283,7 @@ margin: 0; width: $width; border-radius: 3px; + color: var(--inputForegroundColor); background: var(--inputBackgroundColor); position: relative; font-size: 15px; diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 46f1e99f7..9b441dcfe 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -63,9 +63,11 @@ $video-thumbnail-ratio: $video-thumbnail-width / $video-thumbnail-height; $theater-bottom-space: 115px; +$input-foreground-color: $fg-color; $input-background-color: $bg-color; $input-placeholder-color: #898989; +$textarea-foreground-color: $fg-color; $textarea-background-color: $grey-background-hover-color; $sub-menu-margin-bottom: 30px; @@ -92,9 +94,11 @@ $variables: ( --menuForegroundColor: var(--menuForegroundColor), --submenuColor: var(--submenuColor), + --inputForegroundColor: var(--inputForegroundColor), --inputBackgroundColor: var(--inputBackgroundColor), --inputPlaceholderColor: var(--inputPlaceholderColor), + --textareaForegroundColor: var(--textareaForegroundColor), --textareaBackgroundColor: var(--textareaBackgroundColor), --actionButtonColor: var(--actionButtonColor), -- cgit v1.2.3 From f33dc6ab2db1c733f09dcb039b8bf46c69854753 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 20 May 2020 13:52:12 +0200 Subject: Fix input/textarea themes --- client/src/sass/include/_mixins.scss | 2 +- client/src/sass/include/_variables.scss | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'client/src/sass/include') diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 87b7edaad..99ca25f9c 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -91,7 +91,7 @@ height: $button-height; width: $width; color: var(--inputForegroundColor); - background: var(--inputBackgroundColor); + background-color: var(--inputBackgroundColor); border: 1px solid #C6C6C6; border-radius: 3px; padding-left: 15px; diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 9b441dcfe..cdac8ae6f 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -68,7 +68,8 @@ $input-background-color: $bg-color; $input-placeholder-color: #898989; $textarea-foreground-color: $fg-color; -$textarea-background-color: $grey-background-hover-color; +$textarea-background-color: $bg-color; +$markdown-textarea-background-color: $grey-background-hover-color; $sub-menu-margin-bottom: 30px; $sub-menu-margin-bottom-small-view: 10px; @@ -100,6 +101,7 @@ $variables: ( --textareaForegroundColor: var(--textareaForegroundColor), --textareaBackgroundColor: var(--textareaBackgroundColor), + --markdownTextareaBackgroundColor: var(--markdownTextareaBackgroundColor), --actionButtonColor: var(--actionButtonColor), --supportButtonColor: var(--supportButtonColor), -- cgit v1.2.3