diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-08-03 18:06:49 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-08-06 15:08:58 +0200 |
commit | 4504f09f6e85f09b0489debb547a17209d7176ea (patch) | |
tree | 1e2fdcdd3a0982f6e873205f69bdf90de7f4a883 /client/src/app/shared | |
parent | 71ab65d02f359000f9ca6a00f163d66d56a33955 (diff) | |
download | PeerTube-4504f09f6e85f09b0489debb547a17209d7176ea.tar.gz PeerTube-4504f09f6e85f09b0489debb547a17209d7176ea.tar.zst PeerTube-4504f09f6e85f09b0489debb547a17209d7176ea.zip |
deal with refresh token in embed
Diffstat (limited to 'client/src/app/shared')
3 files changed, 86 insertions, 90 deletions
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss index 7ed7c9e87..5da624963 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss +++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss | |||
@@ -1,98 +1,9 @@ | |||
1 | @import 'variables'; | ||
2 | @import 'mixins'; | ||
3 | @import 'miniature'; | ||
4 | |||
5 | .table-video-link { | ||
6 | @include disable-outline; | ||
7 | |||
8 | position: relative; | ||
9 | top: 3px; | ||
10 | } | ||
11 | |||
12 | .table-comment-link, | ||
13 | .table-account-link { | ||
14 | @include disable-outline; | ||
15 | |||
16 | color: var(--mainForegroundColor); | ||
17 | |||
18 | ::ng-deep p:last-child { | ||
19 | margin: 0; | ||
20 | } | ||
21 | } | ||
22 | |||
23 | .table-account-link { | ||
24 | display: flex; | ||
25 | flex-direction: column; | ||
26 | } | ||
27 | |||
28 | .comment-flagged-account, | 1 | .comment-flagged-account, |
29 | .account-flagged-handle { | 2 | .account-flagged-handle { |
30 | font-size: 11px; | 3 | font-size: 11px; |
31 | color: var(--greyForegroundColor); | 4 | color: var(--greyForegroundColor); |
32 | } | 5 | } |
33 | 6 | ||
34 | .table-video { | ||
35 | display: inline-flex; | ||
36 | |||
37 | .table-video-image { | ||
38 | @include miniature-thumbnail; | ||
39 | |||
40 | $image-height: 45px; | ||
41 | |||
42 | height: $image-height; | ||
43 | width: #{(16/9) * $image-height}; | ||
44 | margin-right: 0.5rem; | ||
45 | border-radius: 2px; | ||
46 | border: none; | ||
47 | background: transparent; | ||
48 | display: inline-flex; | ||
49 | justify-content: center; | ||
50 | align-items: center; | ||
51 | position: relative; | ||
52 | |||
53 | img { | ||
54 | height: 100%; | ||
55 | width: 100%; | ||
56 | border-radius: 2px; | ||
57 | } | ||
58 | |||
59 | span { | ||
60 | color: pvar(--inputPlaceholderColor); | ||
61 | } | ||
62 | |||
63 | .table-video-image-label { | ||
64 | @include static-thumbnail-overlay; | ||
65 | position: absolute; | ||
66 | border-radius: 3px; | ||
67 | font-size: 10px; | ||
68 | padding: 0 3px; | ||
69 | line-height: 1.3; | ||
70 | bottom: 2px; | ||
71 | right: 2px; | ||
72 | } | ||
73 | } | ||
74 | |||
75 | .table-video-text { | ||
76 | display: inline-flex; | ||
77 | flex-direction: column; | ||
78 | justify-content: center; | ||
79 | font-size: 90%; | ||
80 | color: pvar(--mainForegroundColor); | ||
81 | line-height: 1rem; | ||
82 | |||
83 | div .glyphicon { | ||
84 | font-size: 80%; | ||
85 | color: gray; | ||
86 | margin-left: 0.1rem; | ||
87 | } | ||
88 | |||
89 | div + div { | ||
90 | color: var(--greyForegroundColor); | ||
91 | font-size: 11px; | ||
92 | } | ||
93 | } | ||
94 | } | ||
95 | |||
96 | .abuse-states .glyphicon-comment { | 7 | .abuse-states .glyphicon-comment { |
97 | margin-left: 0.5rem; | 8 | margin-left: 0.5rem; |
98 | } | 9 | } |
diff --git a/client/src/app/shared/shared-moderation/moderation.scss b/client/src/app/shared/shared-moderation/moderation.scss index c9f0d0c42..c57872bae 100644 --- a/client/src/app/shared/shared-moderation/moderation.scss +++ b/client/src/app/shared/shared-moderation/moderation.scss | |||
@@ -65,3 +65,88 @@ my-action-dropdown.show { | |||
65 | display: block !important; | 65 | display: block !important; |
66 | } | 66 | } |
67 | } | 67 | } |
68 | |||
69 | .table-video-link { | ||
70 | @include disable-outline; | ||
71 | |||
72 | position: relative; | ||
73 | top: 3px; | ||
74 | } | ||
75 | |||
76 | .table-comment-link, | ||
77 | .table-account-link { | ||
78 | @include disable-outline; | ||
79 | |||
80 | color: var(--mainForegroundColor); | ||
81 | |||
82 | ::ng-deep p:last-child { | ||
83 | margin: 0; | ||
84 | } | ||
85 | } | ||
86 | |||
87 | .table-account-link { | ||
88 | display: flex; | ||
89 | flex-direction: column; | ||
90 | } | ||
91 | |||
92 | .table-video { | ||
93 | display: inline-flex; | ||
94 | |||
95 | .table-video-image { | ||
96 | @include miniature-thumbnail; | ||
97 | |||
98 | $image-height: 45px; | ||
99 | |||
100 | height: $image-height; | ||
101 | width: #{(16/9) * $image-height}; | ||
102 | margin-right: 0.5rem; | ||
103 | border-radius: 2px; | ||
104 | border: none; | ||
105 | background: transparent; | ||
106 | display: inline-flex; | ||
107 | justify-content: center; | ||
108 | align-items: center; | ||
109 | position: relative; | ||
110 | |||
111 | img { | ||
112 | height: 100%; | ||
113 | width: 100%; | ||
114 | border-radius: 2px; | ||
115 | } | ||
116 | |||
117 | span { | ||
118 | color: pvar(--inputPlaceholderColor); | ||
119 | } | ||
120 | |||
121 | .table-video-image-label { | ||
122 | @include static-thumbnail-overlay; | ||
123 | position: absolute; | ||
124 | border-radius: 3px; | ||
125 | font-size: 10px; | ||
126 | padding: 0 3px; | ||
127 | line-height: 1.3; | ||
128 | bottom: 2px; | ||
129 | right: 2px; | ||
130 | } | ||
131 | } | ||
132 | |||
133 | .table-video-text { | ||
134 | display: inline-flex; | ||
135 | flex-direction: column; | ||
136 | justify-content: center; | ||
137 | font-size: 90%; | ||
138 | color: pvar(--mainForegroundColor); | ||
139 | line-height: 1rem; | ||
140 | |||
141 | div .glyphicon { | ||
142 | font-size: 80%; | ||
143 | color: gray; | ||
144 | margin-left: 0.1rem; | ||
145 | } | ||
146 | |||
147 | div + div { | ||
148 | color: var(--greyForegroundColor); | ||
149 | font-size: 11px; | ||
150 | } | ||
151 | } | ||
152 | } | ||
diff --git a/client/src/app/shared/shared-search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts index 96b954c99..15c4a7012 100644 --- a/client/src/app/shared/shared-search/search.service.ts +++ b/client/src/app/shared/shared-search/search.service.ts | |||
@@ -3,7 +3,7 @@ import { catchError, map, switchMap } from 'rxjs/operators' | |||
3 | import { HttpClient, HttpParams } from '@angular/common/http' | 3 | import { HttpClient, HttpParams } from '@angular/common/http' |
4 | import { Injectable } from '@angular/core' | 4 | import { Injectable } from '@angular/core' |
5 | import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core' | 5 | import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core' |
6 | import { peertubeLocalStorage } from '@app/helpers' | 6 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' |
7 | import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' | 7 | import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' |
8 | import { ResultList, SearchTargetType, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models' | 8 | import { ResultList, SearchTargetType, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models' |
9 | import { environment } from '../../../environments/environment' | 9 | import { environment } from '../../../environments/environment' |