diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-29 19:10:13 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-29 19:10:13 +0100 |
commit | c5911fd347c76e8bdc05ea9f3ee9efed4a58c236 (patch) | |
tree | b8d287daca6c45305090cbec9da97d1155f275bd /client/src/app/videos | |
parent | 8b0d42ee372de6589796be26b83e5bffb1b69cdf (diff) | |
download | PeerTube-c5911fd347c76e8bdc05ea9f3ee9efed4a58c236.tar.gz PeerTube-c5911fd347c76e8bdc05ea9f3ee9efed4a58c236.tar.zst PeerTube-c5911fd347c76e8bdc05ea9f3ee9efed4a58c236.zip |
Begin to add avatar to actors
Diffstat (limited to 'client/src/app/videos')
3 files changed, 6 insertions, 32 deletions
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index 81e3a0d19..0fefcee28 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss | |||
@@ -144,8 +144,3 @@ | |||
144 | } | 144 | } |
145 | } | 145 | } |
146 | } | 146 | } |
147 | |||
148 | .little-information { | ||
149 | font-size: 0.8em; | ||
150 | font-style: italic; | ||
151 | } | ||
diff --git a/client/src/app/videos/+video-edit/video-add.component.scss b/client/src/app/videos/+video-edit/video-add.component.scss index 891f38819..4bb509009 100644 --- a/client/src/app/videos/+video-edit/video-add.component.scss +++ b/client/src/app/videos/+video-edit/video-add.component.scss | |||
@@ -34,30 +34,9 @@ | |||
34 | } | 34 | } |
35 | 35 | ||
36 | .button-file { | 36 | .button-file { |
37 | position: relative; | 37 | @include peertube-button-file(190px); |
38 | overflow: hidden; | ||
39 | display: inline-block; | ||
40 | margin-bottom: 45px; | ||
41 | width: 190px; | ||
42 | |||
43 | @include peertube-button; | ||
44 | @include orange-button; | ||
45 | 38 | ||
46 | input[type=file] { | 39 | margin-bottom: 45px; |
47 | position: absolute; | ||
48 | top: 0; | ||
49 | right: 0; | ||
50 | min-width: 100%; | ||
51 | min-height: 100%; | ||
52 | font-size: 100px; | ||
53 | text-align: right; | ||
54 | filter: alpha(opacity=0); | ||
55 | opacity: 0; | ||
56 | outline: none; | ||
57 | background: white; | ||
58 | cursor: inherit; | ||
59 | display: block; | ||
60 | } | ||
61 | } | 40 | } |
62 | } | 41 | } |
63 | } | 42 | } |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 4afd6160c..0f44d3dd7 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -148,7 +148,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
148 | this.router.navigate(['/videos/list']) | 148 | this.router.navigate(['/videos/list']) |
149 | }, | 149 | }, |
150 | 150 | ||
151 | error => this.notificationsService.error('Error', error.text) | 151 | error => this.notificationsService.error('Error', error.message) |
152 | ) | 152 | ) |
153 | } | 153 | } |
154 | ) | 154 | ) |
@@ -185,7 +185,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
185 | 185 | ||
186 | error => { | 186 | error => { |
187 | this.descriptionLoading = false | 187 | this.descriptionLoading = false |
188 | this.notificationsService.error('Error', error.text) | 188 | this.notificationsService.error('Error', error.message) |
189 | } | 189 | } |
190 | ) | 190 | ) |
191 | } | 191 | } |
@@ -217,7 +217,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
217 | } | 217 | } |
218 | 218 | ||
219 | getAvatarPath () { | 219 | getAvatarPath () { |
220 | return Account.GET_ACCOUNT_AVATAR_PATH(this.video.account) | 220 | return Account.GET_ACCOUNT_AVATAR_URL(this.video.account) |
221 | } | 221 | } |
222 | 222 | ||
223 | getVideoTags () { | 223 | getVideoTags () { |
@@ -247,7 +247,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
247 | this.router.navigate([ '/videos/list' ]) | 247 | this.router.navigate([ '/videos/list' ]) |
248 | }, | 248 | }, |
249 | 249 | ||
250 | error => this.notificationsService.error('Error', error.text) | 250 | error => this.notificationsService.error('Error', error.message) |
251 | ) | 251 | ) |
252 | } | 252 | } |
253 | ) | 253 | ) |