aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-04-15 15:31:03 +0200
committerChocobozzz <me@florianbigard.com>2021-04-15 15:31:03 +0200
commit205e4f56f3da1f787f1bc2cdfcc39948a99a16b1 (patch)
tree5bb1b37b2ec1a55f61247b83e1a8593c06804e2a /client
parentf6500729850549e632399155d0f3b69822e28b16 (diff)
downloadPeerTube-205e4f56f3da1f787f1bc2cdfcc39948a99a16b1.tar.gz
PeerTube-205e4f56f3da1f787f1bc2cdfcc39948a99a16b1.tar.zst
PeerTube-205e4f56f3da1f787f1bc2cdfcc39948a99a16b1.zip
Refactor feed component
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss16
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comments.component.scss4
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.scss5
-rw-r--r--client/src/app/shared/shared-main/feeds/feed.component.scss14
-rw-r--r--client/src/app/shared/shared-video-miniature/abstract-video-list.html1
-rw-r--r--client/src/app/shared/shared-video-miniature/abstract-video-list.scss24
-rw-r--r--client/src/sass/include/_mixins.scss2
7 files changed, 19 insertions, 47 deletions
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss
index d208944fe..c9262da09 100644
--- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss
+++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss
@@ -1,17 +1,9 @@
1@import 'mixins'; 1@import 'mixins';
2 2
3h1 { 3my-feed {
4 my-feed { 4 margin-left: 5px;
5 margin-left: 5px; 5 display: inline-block;
6 display: inline-block; 6 width: 15px;
7
8 ::ng-deep {
9 my-global-icon {
10 width: 15px !important;
11 top: 0 !important;
12 }
13 }
14 }
15} 7}
16 8
17my-global-icon { 9my-global-icon {
diff --git a/client/src/app/+videos/+video-watch/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
index df42fae73..e6778e1a9 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
@@ -27,7 +27,11 @@
27 margin-left: 5px; 27 margin-left: 5px;
28 opacity: 0; 28 opacity: 0;
29 transition: ease-in .2s opacity; 29 transition: ease-in .2s opacity;
30 width: 12px;
31 position: relative;
32 top: -3px;
30 } 33 }
34
31 &:hover my-feed { 35 &:hover my-feed {
32 opacity: 1; 36 opacity: 1;
33 } 37 }
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index 8f70652ee..e8ad10a11 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
@@ -206,11 +206,6 @@ $video-info-margin-left: 44px;
206 } 206 }
207 } 207 }
208 208
209 my-feed {
210 margin-left: 5px;
211 margin-top: 1px;
212 }
213
214 .video-actions-rates { 209 .video-actions-rates {
215 margin: 0 0 10px 0; 210 margin: 0 0 10px 0;
216 align-items: start; 211 align-items: start;
diff --git a/client/src/app/shared/shared-main/feeds/feed.component.scss b/client/src/app/shared/shared-main/feeds/feed.component.scss
index 333d59440..b655ee708 100644
--- a/client/src/app/shared/shared-main/feeds/feed.component.scss
+++ b/client/src/app/shared/shared-main/feeds/feed.component.scss
@@ -2,19 +2,17 @@
2@import '_mixins'; 2@import '_mixins';
3 3
4.feed { 4.feed {
5 width: min-content; 5 width: 100%;
6 6
7 a { 7 a {
8 color: black; 8 color: black;
9 display: block; 9 display: block;
10 } 10 }
11}
11 12
12 my-global-icon { 13my-global-icon {
13 cursor: pointer; 14 cursor: pointer;
14 width: 12px; 15 width: 100%;
15 position: relative;
16 top: -2px;
17 16
18 @include apply-svg-color(pvar(--mainForegroundColor)) 17 @include apply-svg-color(pvar(--mainForegroundColor))
19 }
20} 18}
diff --git a/client/src/app/shared/shared-video-miniature/abstract-video-list.html b/client/src/app/shared/shared-video-miniature/abstract-video-list.html
index ee5df28be..9ffeac5e8 100644
--- a/client/src/app/shared/shared-video-miniature/abstract-video-list.html
+++ b/client/src/app/shared/shared-video-miniature/abstract-video-list.html
@@ -4,6 +4,7 @@
4 4
5 <div class="action-block"> 5 <div class="action-block">
6 <my-feed *ngIf="syndicationItems" [syndicationItems]="syndicationItems"></my-feed> 6 <my-feed *ngIf="syndicationItems" [syndicationItems]="syndicationItems"></my-feed>
7
7 <ng-container *ngFor="let action of actions"> 8 <ng-container *ngFor="let action of actions">
8 <a *ngIf="action.routerLink" class="ml-2" [routerLink]="action.routerLink" routerLinkActive="active"> 9 <a *ngIf="action.routerLink" class="ml-2" [routerLink]="action.routerLink" routerLinkActive="active">
9 <ng-container *ngTemplateOutlet="actionContent; context:{ $implicit: action }"></ng-container> 10 <ng-container *ngTemplateOutlet="actionContent; context:{ $implicit: action }"></ng-container>
diff --git a/client/src/app/shared/shared-video-miniature/abstract-video-list.scss b/client/src/app/shared/shared-video-miniature/abstract-video-list.scss
index 6570b63d0..467ca1d2c 100644
--- a/client/src/app/shared/shared-video-miniature/abstract-video-list.scss
+++ b/client/src/app/shared/shared-video-miniature/abstract-video-list.scss
@@ -15,18 +15,9 @@ $iconSize: 16px;
15 justify-content: space-between; 15 justify-content: space-between;
16 align-items: center; 16 align-items: center;
17 17
18 .action-block { 18 my-feed {
19 ::ng-deep my-feed { 19 display: inline-block;
20 my-global-icon { 20 width: calc(#{$iconSize} - 2px);
21 width: calc(#{$iconSize} - 2px);
22 }
23 }
24
25 a button {
26 @include peertube-button;
27 @include grey-button;
28 @include button-with-icon($iconSize, 3px, -1px);
29 }
30 } 21 }
31 22
32 .moderation-block { 23 .moderation-block {
@@ -34,21 +25,12 @@ $iconSize: 16px;
34 my-global-icon { 25 my-global-icon {
35 position: relative; 26 position: relative;
36 width: $iconSize; 27 width: $iconSize;
37 top: -2px;
38 } 28 }
39 29
40 margin-left: .4rem; 30 margin-left: .4rem;
41 display: flex; 31 display: flex;
42 justify-content: flex-end; 32 justify-content: flex-end;
43 align-items: center; 33 align-items: center;
44
45 .dropdown-item {
46 padding: 0;
47
48 ::ng-deep my-peertube-checkbox label {
49 padding: 3px 15px;
50 }
51 }
52 } 34 }
53} 35}
54 36
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 73606f940..e03201cef 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -914,7 +914,7 @@
914 padding-bottom: 15px; 914 padding-bottom: 15px;
915 margin-bottom: $sub-menu-margin-bottom; 915 margin-bottom: $sub-menu-margin-bottom;
916 916
917 my-global-icon { 917 > my-global-icon {
918 margin-right: 10px; 918 margin-right: 10px;
919 vertical-align: bottom; 919 vertical-align: bottom;
920 width: 24px; 920 width: 24px;