diff options
author | Chocobozzz <me@florianbigard.com> | 2020-05-20 11:39:31 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-05-20 11:39:31 +0200 |
commit | 3bf07dd8c27aa6ef40111c6f055e8975b3f514f4 (patch) | |
tree | 5093de3984768910aa922d43f0b4806f6ecf1597 | |
parent | b66c5e58f13c790a8933117b0f8ba73ed37c1855 (diff) | |
download | PeerTube-3bf07dd8c27aa6ef40111c6f055e8975b3f514f4.tar.gz PeerTube-3bf07dd8c27aa6ef40111c6f055e8975b3f514f4.tar.zst PeerTube-3bf07dd8c27aa6ef40111c6f055e8975b3f514f4.zip |
Explicit theme colors for inputs and textarea
-rw-r--r-- | client/src/app/shared/forms/markdown-textarea.component.scss | 1 | ||||
-rw-r--r-- | client/src/sass/application.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 4 |
4 files changed, 10 insertions, 1 deletions
diff --git a/client/src/app/shared/forms/markdown-textarea.component.scss b/client/src/app/shared/forms/markdown-textarea.component.scss index 8e5739e45..5c6657538 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.scss +++ b/client/src/app/shared/forms/markdown-textarea.component.scss | |||
@@ -14,7 +14,6 @@ $input-border-radius: 3px; | |||
14 | textarea { | 14 | textarea { |
15 | @include peertube-textarea(100%, 150px); | 15 | @include peertube-textarea(100%, 150px); |
16 | 16 | ||
17 | background-color: var(--textareaBackgroundColor); | ||
18 | font-family: monospace; | 17 | font-family: monospace; |
19 | font-size: 13px; | 18 | font-size: 13px; |
20 | border-bottom: none; | 19 | border-bottom: none; |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index d637c94d9..039353077 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -35,9 +35,11 @@ body { | |||
35 | --menuForegroundColor: #{$menu-color}; | 35 | --menuForegroundColor: #{$menu-color}; |
36 | --submenuColor: #{$sub-menu-color}; | 36 | --submenuColor: #{$sub-menu-color}; |
37 | 37 | ||
38 | --inputForegroundColor: #{$input-foreground-color}; | ||
38 | --inputBackgroundColor: #{$input-background-color}; | 39 | --inputBackgroundColor: #{$input-background-color}; |
39 | --inputPlaceholderColor: #{$input-placeholder-color}; | 40 | --inputPlaceholderColor: #{$input-placeholder-color}; |
40 | 41 | ||
42 | --textareaForegroundColor: #{$textarea-foreground-color}; | ||
41 | --textareaBackgroundColor: #{$textarea-background-color}; | 43 | --textareaBackgroundColor: #{$textarea-background-color}; |
42 | 44 | ||
43 | --actionButtonColor: #{$grey-foreground-color}; | 45 | --actionButtonColor: #{$grey-foreground-color}; |
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 @@ | |||
90 | display: inline-block; | 90 | display: inline-block; |
91 | height: $button-height; | 91 | height: $button-height; |
92 | width: $width; | 92 | width: $width; |
93 | color: var(--inputForegroundColor); | ||
93 | background: var(--inputBackgroundColor); | 94 | background: var(--inputBackgroundColor); |
94 | border: 1px solid #C6C6C6; | 95 | border: 1px solid #C6C6C6; |
95 | border-radius: 3px; | 96 | border-radius: 3px; |
@@ -121,6 +122,8 @@ | |||
121 | @mixin peertube-textarea ($width, $height) { | 122 | @mixin peertube-textarea ($width, $height) { |
122 | @include peertube-input-text($width); | 123 | @include peertube-input-text($width); |
123 | 124 | ||
125 | color: var(--textareaForegroundColor); | ||
126 | background-color: var(--textareaBackgroundColor); | ||
124 | height: $height; | 127 | height: $height; |
125 | padding: 5px 15px; | 128 | padding: 5px 15px; |
126 | font-size: 15px; | 129 | font-size: 15px; |
@@ -280,6 +283,7 @@ | |||
280 | margin: 0; | 283 | margin: 0; |
281 | width: $width; | 284 | width: $width; |
282 | border-radius: 3px; | 285 | border-radius: 3px; |
286 | color: var(--inputForegroundColor); | ||
283 | background: var(--inputBackgroundColor); | 287 | background: var(--inputBackgroundColor); |
284 | position: relative; | 288 | position: relative; |
285 | font-size: 15px; | 289 | 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; | |||
63 | 63 | ||
64 | $theater-bottom-space: 115px; | 64 | $theater-bottom-space: 115px; |
65 | 65 | ||
66 | $input-foreground-color: $fg-color; | ||
66 | $input-background-color: $bg-color; | 67 | $input-background-color: $bg-color; |
67 | $input-placeholder-color: #898989; | 68 | $input-placeholder-color: #898989; |
68 | 69 | ||
70 | $textarea-foreground-color: $fg-color; | ||
69 | $textarea-background-color: $grey-background-hover-color; | 71 | $textarea-background-color: $grey-background-hover-color; |
70 | 72 | ||
71 | $sub-menu-margin-bottom: 30px; | 73 | $sub-menu-margin-bottom: 30px; |
@@ -92,9 +94,11 @@ $variables: ( | |||
92 | --menuForegroundColor: var(--menuForegroundColor), | 94 | --menuForegroundColor: var(--menuForegroundColor), |
93 | --submenuColor: var(--submenuColor), | 95 | --submenuColor: var(--submenuColor), |
94 | 96 | ||
97 | --inputForegroundColor: var(--inputForegroundColor), | ||
95 | --inputBackgroundColor: var(--inputBackgroundColor), | 98 | --inputBackgroundColor: var(--inputBackgroundColor), |
96 | --inputPlaceholderColor: var(--inputPlaceholderColor), | 99 | --inputPlaceholderColor: var(--inputPlaceholderColor), |
97 | 100 | ||
101 | --textareaForegroundColor: var(--textareaForegroundColor), | ||
98 | --textareaBackgroundColor: var(--textareaBackgroundColor), | 102 | --textareaBackgroundColor: var(--textareaBackgroundColor), |
99 | 103 | ||
100 | --actionButtonColor: var(--actionButtonColor), | 104 | --actionButtonColor: var(--actionButtonColor), |