aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/sass')
-rw-r--r--client/src/sass/application.scss24
-rw-r--r--client/src/sass/include/_mixins.scss13
-rw-r--r--client/src/sass/include/_variables.scss2
-rw-r--r--client/src/sass/player/_player-variables.scss2
-rw-r--r--client/src/sass/player/bezels.scss8
-rw-r--r--client/src/sass/player/peertube-skin.scss9
-rw-r--r--client/src/sass/primeng-custom.scss28
7 files changed, 36 insertions, 50 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 5dacdd73b..fa2452231 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -32,7 +32,7 @@ body {
32 --menuForegroundColor: #{$menu-color}; 32 --menuForegroundColor: #{$menu-color};
33 --submenuColor: #{$sub-menu-color}; 33 --submenuColor: #{$sub-menu-color};
34 34
35 --inputColor: #{$input-background-color}; 35 --inputBackgroundColor: #{$input-background-color};
36 --inputPlaceholderColor: #{$input-placeholder-color}; 36 --inputPlaceholderColor: #{$input-placeholder-color};
37 37
38 --actionButtonColor: #{$grey-foreground-color}; 38 --actionButtonColor: #{$grey-foreground-color};
@@ -61,7 +61,7 @@ strong {
61 61
62input.readonly { 62input.readonly {
63 /* Force blank on readonly inputs */ 63 /* Force blank on readonly inputs */
64 background-color: var(--inputColor) !important; 64 background-color: var(--inputBackgroundColor) !important;
65} 65}
66 66
67input, textarea { 67input, textarea {
@@ -202,26 +202,6 @@ label {
202 to { transform: scale(1) rotate(360deg);} 202 to { transform: scale(1) rotate(360deg);}
203} 203}
204 204
205.orange-button {
206 @include peertube-button;
207 @include orange-button;
208}
209
210.orange-button-link {
211 @include peertube-button-link;
212 @include orange-button;
213}
214
215.grey-button {
216 @include peertube-button;
217 @include grey-button;
218}
219
220.grey-button-link {
221 @include peertube-button-link;
222 @include grey-button;
223}
224
225// In tables, don't have a hover different background 205// In tables, don't have a hover different background
226table { 206table {
227 .action-button-edit, .action-button-delete { 207 .action-button-edit, .action-button-delete {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 136eddd3a..317781e0e 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -77,11 +77,17 @@
77 } 77 }
78} 78}
79 79
80@mixin button-focus-visible-shadow($color) {
81 &.focus-visible {
82 box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px $color;
83 }
84}
85
80@mixin peertube-input-text($width) { 86@mixin peertube-input-text($width) {
81 display: inline-block; 87 display: inline-block;
82 height: $button-height; 88 height: $button-height;
83 width: $width; 89 width: $width;
84 background: var(--inputColor); 90 background: var(--inputBackgroundColor);
85 border: 1px solid #C6C6C6; 91 border: 1px solid #C6C6C6;
86 border-radius: 3px; 92 border-radius: 3px;
87 padding-left: 15px; 93 padding-left: 15px;
@@ -118,6 +124,8 @@
118} 124}
119 125
120@mixin orange-button { 126@mixin orange-button {
127 @include button-focus-visible-shadow(var(--mainHoverColor));
128
121 &, &:active, &:focus { 129 &, &:active, &:focus {
122 color: #fff; 130 color: #fff;
123 background-color: var(--mainColor); 131 background-color: var(--mainColor);
@@ -169,7 +177,6 @@
169 text-align: center; 177 text-align: center;
170 padding: 0 17px 0 13px; 178 padding: 0 17px 0 13px;
171 cursor: pointer; 179 cursor: pointer;
172 outline: 0;
173} 180}
174 181
175@mixin peertube-button-link { 182@mixin peertube-button-link {
@@ -254,7 +261,7 @@
254 width: $width; 261 width: $width;
255 border-radius: 3px; 262 border-radius: 3px;
256 overflow: hidden; 263 overflow: hidden;
257 background: var(--inputColor); 264 background: var(--inputBackgroundColor);
258 position: relative; 265 position: relative;
259 font-size: 15px; 266 font-size: 15px;
260 267
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 5b5ac9adc..e087a2548 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -81,7 +81,7 @@ $variables: (
81 --menuForegroundColor: var(--menuForegroundColor), 81 --menuForegroundColor: var(--menuForegroundColor),
82 --submenuColor: var(--submenuColor), 82 --submenuColor: var(--submenuColor),
83 83
84 --inputColor: var(--inputColor), 84 --inputBackgroundColor: var(--inputBackgroundColor),
85 --inputPlaceholderColor: var(--inputPlaceholderColor), 85 --inputPlaceholderColor: var(--inputPlaceholderColor),
86 86
87 --actionButtonColor: var(--actionButtonColor), 87 --actionButtonColor: var(--actionButtonColor),
diff --git a/client/src/sass/player/_player-variables.scss b/client/src/sass/player/_player-variables.scss
index 0c2359ac7..935a60b49 100644
--- a/client/src/sass/player/_player-variables.scss
+++ b/client/src/sass/player/_player-variables.scss
@@ -1,7 +1,7 @@
1$primary-foreground-color: #fff; 1$primary-foreground-color: #fff;
2$primary-foreground-opacity: 0.9; 2$primary-foreground-opacity: 0.9;
3$primary-foreground-opacity-hover: 1; 3$primary-foreground-opacity-hover: 1;
4$primary-background-color: #000; 4$primary-background-color: rgba(0, 0, 0, 0.8);
5 5
6$font-size: 13px; 6$font-size: 13px;
7$control-bar-height: 34px; 7$control-bar-height: 34px;
diff --git a/client/src/sass/player/bezels.scss b/client/src/sass/player/bezels.scss
index ff3448511..853a030a3 100644
--- a/client/src/sass/player/bezels.scss
+++ b/client/src/sass/player/bezels.scss
@@ -32,11 +32,3 @@
32 fill: #fff; 32 fill: #fff;
33 } 33 }
34} 34}
35
36.video-js {
37
38 .vjs-bezel-content {
39
40 }
41
42}
diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss
index 41e2a535c..f80106428 100644
--- a/client/src/sass/player/peertube-skin.scss
+++ b/client/src/sass/player/peertube-skin.scss
@@ -21,6 +21,12 @@ body {
21 21
22 .vjs-dock-text { 22 .vjs-dock-text {
23 padding-right: 10px; 23 padding-right: 10px;
24 background: linear-gradient(to bottom, rgba(0, 0, 0, .6) 0, rgba(0, 0, 0, 0.2) 70%, rgba(0, 0, 0, 0) 100%);
25 }
26
27 .vjs-dock-title,
28 .vjs-dock-description {
29 text-shadow: 0 0 2px rgba(0, 0, 0, .5);
24 } 30 }
25 31
26 .vjs-dock-description { 32 .vjs-dock-description {
@@ -55,7 +61,7 @@ body {
55 $big-play-width: 1.2em; 61 $big-play-width: 1.2em;
56 $big-play-height: 1.2em; 62 $big-play-height: 1.2em;
57 63
58 border: 4px solid #fff; 64 border: 2px solid #fff;
59 border-radius: 100%; 65 border-radius: 100%;
60 66
61 left: 50%; 67 left: 50%;
@@ -185,7 +191,6 @@ body {
185 191
186 .vjs-play-progress { 192 .vjs-play-progress {
187 background: var(--embedForegroundColor); 193 background: var(--embedForegroundColor);
188 transition: all .2s ease 0s;
189 194
190 // Not display the circle if the progress is not hovered 195 // Not display the circle if the progress is not hovered
191 &::before { 196 &::before {
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 0d51818c3..753fdf5c9 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -389,25 +389,27 @@ p-toast {
389 389
390 .ui-toast-message { 390 .ui-toast-message {
391 font-family: $main-fonts; 391 font-family: $main-fonts;
392 392 background-color: var(--mainBackgroundColor) !important;
393 &.ui-toast-message-success { 393 border-radius: 5px;
394 color: #fff !important; 394 box-sizing: border-box;
395 background-color: #8BC34A !important; 395 border: 1px solid #EBEEF5 !important;
396 box-shadow: 0 2px 12px 0 rgba(0, 0 , 0, .1);
397 overflow: hidden;
398
399 &.ui-toast-message-success .glyphicon {
400 color: #8BC34A !important;
396 } 401 }
397 402
398 &.ui-toast-message-error { 403 &.ui-toast-message-error .glyphicon {
399 color: #fff !important; 404 color: #F44336 !important;
400 background-color: #F44336 !important;
401 } 405 }
402 406
403 &.ui-toast-message-info { 407 &.ui-toast-message-warn .glyphicon {
404 color: #fff !important; 408 color: #F1680D !important;
405 background-color: #03A9F4 !important;
406 } 409 }
407 410
408 &.ui-toast-message-info { 411 &.ui-toast-message-info .glyphicon {
409 color: #fff !important; 412 color: #03A9F4 !important;
410 background-color: #03A9F4 !important;
411 } 413 }
412 414
413 .notification-block { 415 .notification-block {