aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/sass')
-rw-r--r--client/src/sass/application.scss8
-rw-r--r--client/src/sass/bootstrap.scss11
-rw-r--r--client/src/sass/classes.scss4
-rw-r--r--client/src/sass/include/_mixins.scss8
-rw-r--r--client/src/sass/include/_variables.scss4
-rw-r--r--client/src/sass/ng-select.scss5
6 files changed, 33 insertions, 7 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 9f64f7426..81bbfa43a 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -28,13 +28,18 @@ body {
28 --mainColor: #{$main-color}; 28 --mainColor: #{$main-color};
29 --mainColorLighter: #{$main-color-lighter}; 29 --mainColorLighter: #{$main-color-lighter};
30 --mainColorLightest: #{$main-color-lightest}; 30 --mainColorLightest: #{$main-color-lightest};
31
31 --mainHoverColor: #{$main-hover-color}; 32 --mainHoverColor: #{$main-hover-color};
33 --mainBackgroundHoverColor: #{$main-background-hover-color};
34
32 --mainBackgroundColor: #{$bg-color}; 35 --mainBackgroundColor: #{$bg-color};
33 --mainForegroundColor: #{$fg-color}; 36 --mainForegroundColor: #{$fg-color};
37
34 --secondaryColor: #{$secondary-color}; 38 --secondaryColor: #{$secondary-color};
35 39
36 --greyForegroundColor: #{$grey-foreground-color}; 40 --greyForegroundColor: #{$grey-foreground-color};
37 --greyBackgroundColor: #{$grey-background-color}; 41 --greyBackgroundColor: #{$grey-background-color};
42 --greySecondaryBackgroundColor: #{$grey-background-hover-color};
38 43
39 --menuBackgroundColor: #{$menu-background}; 44 --menuBackgroundColor: #{$menu-background};
40 --menuForegroundColor: #{$menu-color}; 45 --menuForegroundColor: #{$menu-color};
@@ -51,6 +56,7 @@ body {
51 --markdownTextareaBackgroundColor: #{$markdown-textarea-background-color}; 56 --markdownTextareaBackgroundColor: #{$markdown-textarea-background-color};
52 57
53 --actionButtonColor: #{$grey-foreground-color}; 58 --actionButtonColor: #{$grey-foreground-color};
59
54 --supportButtonBackgroundColor: #{transparent}; 60 --supportButtonBackgroundColor: #{transparent};
55 --supportButtonColor: #{pvar(--actionButtonColor)}; 61 --supportButtonColor: #{pvar(--actionButtonColor)};
56 --supportButtonHeartColor: #{$support-button-heart}; 62 --supportButtonHeartColor: #{$support-button-heart};
@@ -312,7 +318,7 @@ table {
312} 318}
313 319
314.form-group-description { 320.form-group-description {
315 @extend .text-muted; 321 @extend .muted !optional;
316 322
317 font-size: 90%; 323 font-size: 90%;
318 margin-top: 10px; 324 margin-top: 10px;
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 432e23e92..d6af7f485 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -89,6 +89,9 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
89 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); 89 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
90 font-size: 15px; 90 font-size: 15px;
91 91
92 color: pvar(--mainForegroundColor);
93 background-color: pvar(--mainBackgroundColor);
94
92 .dropdown-header { 95 .dropdown-header {
93 @include padding-left(1rem); 96 @include padding-left(1rem);
94 } 97 }
@@ -96,14 +99,19 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
96 .dropdown-item { 99 .dropdown-item {
97 padding: 3px 15px; 100 padding: 3px 15px;
98 101
102 color: pvar(--mainForegroundColor);
103 background-color: pvar(--mainBackgroundColor);
104
99 &.active { 105 &.active {
100 color: pvar(--mainBackgroundColor) !important; 106 color: pvar(--mainBackgroundColor) !important;
101 background-color: pvar(--mainHoverColor); 107 background-color: pvar(--mainHoverColor);
102 opacity: 0.9; 108 opacity: 0.9;
103 } 109 }
104 110
105 &:active { 111 a:active,
112 &:hover {
106 color: pvar(--mainForegroundColor) !important; 113 color: pvar(--mainForegroundColor) !important;
114 background-color: pvar(--mainBackgroundHoverColor);
107 } 115 }
108 116
109 &::after { 117 &::after {
@@ -117,7 +125,6 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
117 125
118 a { 126 a {
119 @include disable-default-a-behaviour; 127 @include disable-default-a-behaviour;
120 color: #000 !important;
121 } 128 }
122} 129}
123 130
diff --git a/client/src/sass/classes.scss b/client/src/sass/classes.scss
index 1cd7a6058..90cdcf3ed 100644
--- a/client/src/sass/classes.scss
+++ b/client/src/sass/classes.scss
@@ -28,3 +28,7 @@
28.peertube-radio-container { 28.peertube-radio-container {
29 @include peertube-radio-container; 29 @include peertube-radio-container;
30} 30}
31
32.muted {
33 color: pvar(--greyForegroundColor) !important;
34}
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 291bff6db..8de23e64d 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -124,8 +124,8 @@
124@mixin peertube-textarea ($width, $height) { 124@mixin peertube-textarea ($width, $height) {
125 @include peertube-input-text($width); 125 @include peertube-input-text($width);
126 126
127 color: pvar(--textareaForegroundColor); 127 color: pvar(--textareaForegroundColor) !important;
128 background-color: pvar(--textareaBackgroundColor); 128 background-color: pvar(--textareaBackgroundColor) !important;
129 height: $height; 129 height: $height;
130 padding: 5px 15px; 130 padding: 5px 15px;
131 font-size: 15px; 131 font-size: 15px;
@@ -207,7 +207,7 @@
207@mixin grey-button { 207@mixin grey-button {
208 @include button-focus($grey-button-outline-color); 208 @include button-focus($grey-button-outline-color);
209 209
210 background-color: $grey-background-color; 210 background-color: pvar(--greyBackgroundColor);
211 color: pvar(--greyForegroundColor); 211 color: pvar(--greyForegroundColor);
212 212
213 &:hover, 213 &:hover,
@@ -216,7 +216,7 @@
216 &[disabled], 216 &[disabled],
217 &.disabled { 217 &.disabled {
218 color: pvar(--greyForegroundColor); 218 color: pvar(--greyForegroundColor);
219 background-color: $grey-background-hover-color; 219 background-color: pvar(--greySecondaryBackgroundColor);
220 } 220 }
221 221
222 &[disabled], 222 &[disabled],
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index f68f4e18d..fd1b137dc 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -18,7 +18,9 @@ $grey-button-outline-color: scale-color($grey-foreground-color, $alpha: -95%);
18$main-color: hsl(24, 90%, 50%); 18$main-color: hsl(24, 90%, 50%);
19$main-color-lighter: lighten($main-color, 10%); 19$main-color-lighter: lighten($main-color, 10%);
20$main-color-lightest: lighten($main-color, 40%); 20$main-color-lightest: lighten($main-color, 40%);
21
21$main-hover-color: lighten($main-color, 5%); 22$main-hover-color: lighten($main-color, 5%);
23$main-background-hover-color: #e9ecef;
22 24
23$secondary-color: hsl(187, 77%, 34%); 25$secondary-color: hsl(187, 77%, 34%);
24 26
@@ -109,6 +111,7 @@ $variables: (
109 --mainColorLightest: var(--mainColorLightest), 111 --mainColorLightest: var(--mainColorLightest),
110 112
111 --mainHoverColor: var(--mainHoverColor), 113 --mainHoverColor: var(--mainHoverColor),
114 --mainBackgroundHoverColor: var(--mainBackgroundHoverColor),
112 115
113 --mainBackgroundColor: var(--mainBackgroundColor), 116 --mainBackgroundColor: var(--mainBackgroundColor),
114 --mainForegroundColor: var(--mainForegroundColor), 117 --mainForegroundColor: var(--mainForegroundColor),
@@ -117,6 +120,7 @@ $variables: (
117 120
118 --greyForegroundColor: var(--greyForegroundColor), 121 --greyForegroundColor: var(--greyForegroundColor),
119 --greyBackgroundColor: var(--greyBackgroundColor), 122 --greyBackgroundColor: var(--greyBackgroundColor),
123 --greySecondaryBackgroundColor: var(--greySecondaryBackgroundColor),
120 124
121 --menuBackgroundColor: var(--menuBackgroundColor), 125 --menuBackgroundColor: var(--menuBackgroundColor),
122 --menuForegroundColor: var(--menuForegroundColor), 126 --menuForegroundColor: var(--menuForegroundColor),
diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index df0e0aaf4..f4c908da3 100644
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -27,6 +27,11 @@ $ng-select-value-font-size: 15px;
27 } 27 }
28 } 28 }
29 29
30 .ng-dropdown-panel .ng-dropdown-panel-items .ng-option {
31 color: pvar(--mainForegroundColor);
32 background-color: pvar(--mainBackgroundColor);
33 }
34
30 .ng-select-container { 35 .ng-select-container {
31 background-color: pvar(--inputBackgroundColor); 36 background-color: pvar(--inputBackgroundColor);
32 } 37 }