diff options
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/include/_account-channel-page.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_actor.scss | 4 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 2 | ||||
-rw-r--r-- | client/src/sass/player/dock.scss | 8 |
5 files changed, 9 insertions, 11 deletions
diff --git a/client/src/sass/include/_account-channel-page.scss b/client/src/sass/include/_account-channel-page.scss index b135bbb6d..06384b98d 100644 --- a/client/src/sass/include/_account-channel-page.scss +++ b/client/src/sass/include/_account-channel-page.scss | |||
@@ -26,10 +26,6 @@ | |||
26 | grid-column: 1; | 26 | grid-column: 1; |
27 | margin-bottom: 30px; | 27 | margin-bottom: 30px; |
28 | 28 | ||
29 | .main-avatar { | ||
30 | @include actor-avatar-size(120px); | ||
31 | } | ||
32 | |||
33 | > div { | 29 | > div { |
34 | @include margin-left($img-margin); | 30 | @include margin-left($img-margin); |
35 | 31 | ||
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss index f9e44b8ad..aa2331efe 100644 --- a/client/src/sass/include/_actor.scss +++ b/client/src/sass/include/_actor.scss | |||
@@ -1,12 +1,10 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | @mixin actor-row ($avatar-size: 80px, $avatar-margin-right: 10px, $min-height: 130px, $separator: true) { | 4 | @mixin actor-row ($avatar-margin-right: 10px, $min-height: 130px, $separator: true) { |
5 | @include row-blocks($min-height: $min-height, $separator: $separator); | 5 | @include row-blocks($min-height: $min-height, $separator: $separator); |
6 | 6 | ||
7 | > my-actor-avatar { | 7 | > my-actor-avatar { |
8 | @include actor-avatar-size($avatar-size); | ||
9 | |||
10 | @include margin-right($avatar-margin-right); | 8 | @include margin-right($avatar-margin-right); |
11 | } | 9 | } |
12 | 10 | ||
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index c8ec3b4d1..291bff6db 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -887,7 +887,7 @@ | |||
887 | height: $avatar-height; | 887 | height: $avatar-height; |
888 | 888 | ||
889 | my-actor-avatar { | 889 | my-actor-avatar { |
890 | @include actor-avatar-size($avatar-height); | 890 | display: inline-block; |
891 | } | 891 | } |
892 | 892 | ||
893 | div { | 893 | div { |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index e1d3716dd..f68f4e18d 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -167,12 +167,12 @@ $zindex: ( | |||
167 | popover : 13000, | 167 | popover : 13000, |
168 | tooltip : 14000, | 168 | tooltip : 14000, |
169 | loadbar : 15000, | 169 | loadbar : 15000, |
170 | modal : 16000, | ||
171 | dropdown : 17000, | 170 | dropdown : 17000, |
172 | help-popover : 17000, | 171 | help-popover : 17000, |
173 | privacymsg : 17500, | 172 | privacymsg : 17500, |
174 | header : 17500, | 173 | header : 17500, |
175 | notification : 18000, | 174 | notification : 18000, |
175 | modal : 19000, | ||
176 | hotkeys : 19000 | 176 | hotkeys : 19000 |
177 | ); | 177 | ); |
178 | 178 | ||
diff --git a/client/src/sass/player/dock.scss b/client/src/sass/player/dock.scss index 79600ac93..4fa1ebd54 100644 --- a/client/src/sass/player/dock.scss +++ b/client/src/sass/player/dock.scss | |||
@@ -8,12 +8,16 @@ | |||
8 | @include padding-right(60px); | 8 | @include padding-right(60px); |
9 | 9 | ||
10 | padding: $dock-padding; | 10 | padding: $dock-padding; |
11 | background: linear-gradient(to bottom, rgba(0, 0, 0, .6) 0, rgba(0, 0, 0, 0.2) 70%, rgba(0, 0, 0, 0) 100%); | 11 | background: linear-gradient(to bottom, rgba(20, 20, 20, .7) 0, rgba(20, 20, 20, 0)); |
12 | } | ||
13 | |||
14 | .vjs-dock-title { | ||
15 | font-weight: $font-semibold; | ||
12 | } | 16 | } |
13 | 17 | ||
14 | .vjs-dock-title, | 18 | .vjs-dock-title, |
15 | .vjs-dock-description { | 19 | .vjs-dock-description { |
16 | text-shadow: 0 0 2px rgba(0, 0, 0, .5); | 20 | text-shadow: 0 1px 3px rgba(0, 0, 0, .5); |
17 | } | 21 | } |
18 | 22 | ||
19 | .vjs-dock-description { | 23 | .vjs-dock-description { |