diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-04 11:04:08 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-04 11:04:08 +0100 |
commit | d2cc03aaad62fa6cf1c64622229bcc83f24fccb6 (patch) | |
tree | 75f99b2bd38b3a9a632293575ad5601a90fadb7f /client/src/app | |
parent | d178b5c1f8eabb0face854d48e708f0ac72e7d2e (diff) | |
download | PeerTube-d2cc03aaad62fa6cf1c64622229bcc83f24fccb6.tar.gz PeerTube-d2cc03aaad62fa6cf1c64622229bcc83f24fccb6.tar.zst PeerTube-d2cc03aaad62fa6cf1c64622229bcc83f24fccb6.zip |
Design account videos
Diffstat (limited to 'client/src/app')
6 files changed, 63 insertions, 9 deletions
diff --git a/client/src/app/account/account-videos/account-videos.component.html b/client/src/app/account/account-videos/account-videos.component.html index 6c8ac4508..94b976869 100644 --- a/client/src/app/account/account-videos/account-videos.component.html +++ b/client/src/app/account/account-videos/account-videos.component.html | |||
@@ -3,7 +3,17 @@ | |||
3 | [infiniteScrollDistance]="0.5" | 3 | [infiniteScrollDistance]="0.5" |
4 | (scrolled)="onNearOfBottom()" | 4 | (scrolled)="onNearOfBottom()" |
5 | > | 5 | > |
6 | <div *ngFor="let video of videos"> | 6 | <div class="video" *ngFor="let video of videos"> |
7 | <my-video-thumbnail [video]="video"></my-video-thumbnail> | 7 | <my-video-thumbnail [video]="video"></my-video-thumbnail> |
8 | |||
9 | <div class="video-info"> | ||
10 | <div class="video-info-name">{{ video.name }}</div> | ||
11 | <span class="video-info-date-views">{{ video.createdAt | fromNow }} - {{ video.views | numberFormatter }} views</span> | ||
12 | </div> | ||
13 | |||
14 | <a class="edit-button" [routerLink]="[ '/videos', video.id, '/edit' ]"> | ||
15 | <span class="icon icon-edit"></span> | ||
16 | Edit | ||
17 | </a> | ||
8 | </div> | 18 | </div> |
9 | </div> | 19 | </div> |
diff --git a/client/src/app/account/account-videos/account-videos.component.scss b/client/src/app/account/account-videos/account-videos.component.scss index e69de29bb..b26933d22 100644 --- a/client/src/app/account/account-videos/account-videos.component.scss +++ b/client/src/app/account/account-videos/account-videos.component.scss | |||
@@ -0,0 +1,44 @@ | |||
1 | .video { | ||
2 | display: flex; | ||
3 | height: 130px; | ||
4 | padding-bottom: 20px; | ||
5 | margin-bottom: 20px; | ||
6 | border-bottom: 1px solid #C6C6C6; | ||
7 | |||
8 | my-video-thumbnail { | ||
9 | margin-right: 10px; | ||
10 | } | ||
11 | |||
12 | .video-info { | ||
13 | flex-grow: 1; | ||
14 | |||
15 | .video-info-name { | ||
16 | font-size: 16px; | ||
17 | font-weight: $font-semibold; | ||
18 | } | ||
19 | |||
20 | .video-info-date-views { | ||
21 | font-size: 13px; | ||
22 | } | ||
23 | } | ||
24 | |||
25 | .edit-button { | ||
26 | @include peertube-button-link; | ||
27 | |||
28 | font-size: 15px; | ||
29 | font-weight: $font-semibold; | ||
30 | color: #585858; | ||
31 | background-color: #E5E5E5; | ||
32 | |||
33 | .icon.icon-edit { | ||
34 | display: inline-block; | ||
35 | background: url('../../../assets/images/account/edit.svg') no-repeat; | ||
36 | background-size: contain; | ||
37 | width: 21px; | ||
38 | height: 21px; | ||
39 | vertical-align: middle; | ||
40 | position: relative; | ||
41 | top: -2px; | ||
42 | } | ||
43 | } | ||
44 | } | ||
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss index 1baffa5c8..97c5d461a 100644 --- a/client/src/app/app.component.scss +++ b/client/src/app/app.component.scss | |||
@@ -42,7 +42,7 @@ | |||
42 | background-size: contain; | 42 | background-size: contain; |
43 | 43 | ||
44 | &.icon-menu { | 44 | &.icon-menu { |
45 | background-image: url('../assets/header/menu.svg'); | 45 | background-image: url('../assets/images/header/menu.svg'); |
46 | margin: 0 18px 0 24px; | 46 | margin: 0 18px 0 24px; |
47 | } | 47 | } |
48 | } | 48 | } |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | .icon.icon-logo { | 59 | .icon.icon-logo { |
60 | display: inline-block; | 60 | display: inline-block; |
61 | background: url('../assets/logo.svg') no-repeat; | 61 | background: url('../assets/images/logo.svg') no-repeat; |
62 | width: 20px; | 62 | width: 20px; |
63 | height: 24px; | 63 | height: 24px; |
64 | } | 64 | } |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 5d6fd61c6..c93c59622 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -116,7 +116,7 @@ menu { | |||
116 | &.icon-videos-trending { | 116 | &.icon-videos-trending { |
117 | position: relative; | 117 | position: relative; |
118 | top: -2px; | 118 | top: -2px; |
119 | background-image: url('../../assets/menu/trending.svg'); | 119 | background-image: url('../../assets/images/menu/trending.svg'); |
120 | } | 120 | } |
121 | 121 | ||
122 | &.icon-videos-recently-added { | 122 | &.icon-videos-recently-added { |
@@ -124,14 +124,14 @@ menu { | |||
124 | height: 23px; | 124 | height: 23px; |
125 | position: relative; | 125 | position: relative; |
126 | top: -1px; | 126 | top: -1px; |
127 | background-image: url('../../assets/menu/recently-added.svg'); | 127 | background-image: url('../../assets/images/menu/recently-added.svg'); |
128 | } | 128 | } |
129 | 129 | ||
130 | &.icon-administration { | 130 | &.icon-administration { |
131 | width: 23px; | 131 | width: 23px; |
132 | height: 23px; | 132 | height: 23px; |
133 | 133 | ||
134 | background-image: url('../../assets/menu/administration.svg'); | 134 | background-image: url('../../assets/images/menu/administration.svg'); |
135 | } | 135 | } |
136 | } | 136 | } |
137 | } | 137 | } |
diff --git a/client/src/app/shared/search/search.component.scss b/client/src/app/shared/search/search.component.scss index 191d3d597..7ba8ef26c 100644 --- a/client/src/app/shared/search/search.component.scss +++ b/client/src/app/shared/search/search.component.scss | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | .icon.icon-search { | 11 | .icon.icon-search { |
12 | display: inline-block; | 12 | display: inline-block; |
13 | background: url('../../../assets/header/search.svg') no-repeat; | 13 | background: url('../../../assets/images/header/search.svg') no-repeat; |
14 | background-size: contain; | 14 | background-size: contain; |
15 | width: 25px; | 15 | width: 25px; |
16 | height: 21px; | 16 | height: 21px; |
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | .icon.icon-upload { | 30 | .icon.icon-upload { |
31 | display: inline-block; | 31 | display: inline-block; |
32 | background: url('../../../assets/header/upload.svg') no-repeat; | 32 | background: url('../../../assets/images/header/upload.svg') no-repeat; |
33 | background-size: contain; | 33 | background-size: contain; |
34 | width: 22px; | 34 | width: 22px; |
35 | height: 24px; | 35 | height: 24px; |
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts index 83990d8b8..220362ef0 100644 --- a/client/src/app/shared/users/user.model.ts +++ b/client/src/app/shared/users/user.model.ts | |||
@@ -54,6 +54,6 @@ export class User implements UserServerModel { | |||
54 | getAvatarPath () { | 54 | getAvatarPath () { |
55 | if (this.account && this.account.avatar) return this.account.avatar.path | 55 | if (this.account && this.account.avatar) return this.account.avatar.path |
56 | 56 | ||
57 | return '/assets/default-avatar.png' | 57 | return '/assets/images/default-avatar.png' |
58 | } | 58 | } |
59 | } | 59 | } |