diff options
Diffstat (limited to 'client/src')
7 files changed, 14 insertions, 18 deletions
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html index da35a9a2e..5eefc2450 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html | |||
@@ -37,7 +37,7 @@ | |||
37 | ></div> | 37 | ></div> |
38 | 38 | ||
39 | <div class="comment-actions"> | 39 | <div class="comment-actions"> |
40 | <div tabindex=0 (click)="onWantToReply()" class="comment-action-reply" i18n>Reply</div> | 40 | <button (click)="onWantToReply()" class="comment-action-reply border-0 p-0" i18n>Reply</button> |
41 | 41 | ||
42 | <my-user-moderation-dropdown | 42 | <my-user-moderation-dropdown |
43 | [prependActions]="prependModerationActions" tabindex=0 [buttonStyled]="false" | 43 | [prependActions]="prependModerationActions" tabindex=0 [buttonStyled]="false" |
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss index 638147dfe..5001ad168 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss | |||
@@ -8,6 +8,11 @@ | |||
8 | .view-replies { | 8 | .view-replies { |
9 | font-weight: $font-semibold; | 9 | font-weight: $font-semibold; |
10 | cursor: pointer; | 10 | cursor: pointer; |
11 | position: relative; | ||
12 | |||
13 | .chevron-down { | ||
14 | @include margin-left(0); | ||
15 | } | ||
11 | } | 16 | } |
12 | 17 | ||
13 | .title-block { | 18 | .title-block { |
@@ -37,12 +42,6 @@ | |||
37 | border: 0; | 42 | border: 0; |
38 | } | 43 | } |
39 | 44 | ||
40 | @media screen and (max-width: 600px) { | ||
41 | .view-replies { | ||
42 | @include margin-left(46px); | ||
43 | } | ||
44 | } | ||
45 | |||
46 | @media screen and (max-width: 450px) { | 45 | @media screen and (max-width: 450px) { |
47 | .view-replies { | 46 | .view-replies { |
48 | font-size: 14px; | 47 | font-size: 14px; |
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index cf6e96d07..ef7749ced 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss | |||
@@ -10,7 +10,8 @@ | |||
10 | @media screen and (max-width: $mobile-view) { | 10 | @media screen and (max-width: $mobile-view) { |
11 | @include margin-right(10px); | 11 | @include margin-right(10px); |
12 | 12 | ||
13 | padding: 0 10px; | 13 | padding-right: 10px; |
14 | padding-left: 10px; | ||
14 | 15 | ||
15 | .icon.icon-upload { | 16 | .icon.icon-upload { |
16 | @include margin-right(0); | 17 | @include margin-right(0); |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 4b1ed65ce..a51686601 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -252,6 +252,8 @@ my-actor-avatar { | |||
252 | 252 | ||
253 | > a, | 253 | > a, |
254 | > my-login-link { | 254 | > my-login-link { |
255 | @include ellipsis; | ||
256 | |||
255 | display: block; | 257 | display: block; |
256 | width: 100%; | 258 | width: 100%; |
257 | 259 | ||
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss index 90fcd81aa..ec2de2528 100644 --- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss +++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.scss | |||
@@ -25,7 +25,3 @@ | |||
25 | margin-bottom: 0; | 25 | margin-bottom: 0; |
26 | } | 26 | } |
27 | } | 27 | } |
28 | |||
29 | my-global-icon { | ||
30 | margin: 0 5px; | ||
31 | } | ||
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss b/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss index 93bdaba57..b054086e4 100644 --- a/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss +++ b/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss | |||
@@ -17,11 +17,11 @@ | |||
17 | 17 | ||
18 | .actor-img-edit-button { | 18 | .actor-img-edit-button { |
19 | @include peertube-button-file(30px); | 19 | @include peertube-button-file(30px); |
20 | @include button-with-icon; | ||
20 | @include orange-button; | 21 | @include orange-button; |
21 | 22 | ||
22 | display: flex; | 23 | display: flex; |
23 | justify-content: center; | 24 | justify-content: center; |
24 | padding: 0; | ||
25 | margin-top: 10px; | 25 | margin-top: 10px; |
26 | margin-bottom: 5px; | 26 | margin-bottom: 5px; |
27 | cursor: pointer; | 27 | cursor: pointer; |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 2d9f9011d..0df849167 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -250,12 +250,10 @@ | |||
250 | } | 250 | } |
251 | 251 | ||
252 | @mixin peertube-button { | 252 | @mixin peertube-button { |
253 | padding: 0 13px; | 253 | padding: 4px 13px; |
254 | 254 | ||
255 | border: 0; | 255 | border: 0; |
256 | font-weight: $font-semibold; | 256 | font-weight: $font-semibold; |
257 | min-height: $button-height; | ||
258 | line-height: $button-height; | ||
259 | 257 | ||
260 | // Because of primeng that redefines border-radius of all input[type="..."] | 258 | // Because of primeng that redefines border-radius of all input[type="..."] |
261 | border-radius: 3px !important; | 259 | border-radius: 3px !important; |
@@ -267,6 +265,7 @@ | |||
267 | 265 | ||
268 | my-global-icon + * { | 266 | my-global-icon + * { |
269 | @include margin-right(4px); | 267 | @include margin-right(4px); |
268 | @include margin-left(4px); | ||
270 | } | 269 | } |
271 | } | 270 | } |
272 | 271 | ||
@@ -318,7 +317,6 @@ | |||
318 | position: relative; | 317 | position: relative; |
319 | overflow: hidden; | 318 | overflow: hidden; |
320 | display: inline-block; | 319 | display: inline-block; |
321 | min-height: 30px; | ||
322 | 320 | ||
323 | input[type=file] { | 321 | input[type=file] { |
324 | position: absolute; | 322 | position: absolute; |
@@ -331,7 +329,7 @@ | |||
331 | filter: alpha(opacity=0); | 329 | filter: alpha(opacity=0); |
332 | opacity: 0; | 330 | opacity: 0; |
333 | outline: none; | 331 | outline: none; |
334 | background: #fff; | 332 | background: pvar(--mainBackgroundColor); |
335 | cursor: inherit; | 333 | cursor: inherit; |
336 | display: block; | 334 | display: block; |
337 | } | 335 | } |