aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/app/account/account-videos/account-videos.component.html12
-rw-r--r--client/src/app/account/account-videos/account-videos.component.scss44
-rw-r--r--client/src/app/app.component.scss4
-rw-r--r--client/src/app/menu/menu.component.scss6
-rw-r--r--client/src/app/shared/search/search.component.scss4
-rw-r--r--client/src/app/shared/users/user.model.ts2
-rw-r--r--client/src/assets/images/account/edit.svg15
-rw-r--r--client/src/assets/images/default-avatar.png (renamed from client/src/assets/default-avatar.png)bin1674 -> 1674 bytes
-rw-r--r--client/src/assets/images/favicon.png (renamed from client/src/assets/favicon.png)bin2335 -> 2335 bytes
-rw-r--r--client/src/assets/images/header/menu.svg (renamed from client/src/assets/header/menu.svg)0
-rw-r--r--client/src/assets/images/header/search.svg (renamed from client/src/assets/header/search.svg)0
-rw-r--r--client/src/assets/images/header/upload.svg (renamed from client/src/assets/header/upload.svg)0
-rw-r--r--client/src/assets/images/logo.svg (renamed from client/src/assets/logo.svg)0
-rw-r--r--client/src/assets/images/menu/administration.svg (renamed from client/src/assets/menu/administration.svg)0
-rw-r--r--client/src/assets/images/menu/recently-added.svg (renamed from client/src/assets/menu/recently-added.svg)0
-rw-r--r--client/src/assets/images/menu/trending.svg (renamed from client/src/assets/menu/trending.svg)0
16 files changed, 78 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}
diff --git a/client/src/assets/images/account/edit.svg b/client/src/assets/images/account/edit.svg
new file mode 100644
index 000000000..23ece68f1
--- /dev/null
+++ b/client/src/assets/images/account/edit.svg
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
4 <title>edit</title>
5 <desc>Created with Sketch.</desc>
6 <defs></defs>
7 <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8 <g id="Artboard-4" transform="translate(-48.000000, -203.000000)" stroke="#585858" stroke-width="2">
9 <g id="41" transform="translate(48.000000, 203.000000)">
10 <path d="M3,21.0000003 L3,17 L15.8898356,4.11016442 C17.0598483,2.9401517 18.9638992,2.94723715 20.1306896,4.11402752 L19.9181432,3.90148112 C21.0902894,5.07362738 21.0882407,6.97202708 19.9174652,8.1377941 L7,21.0000003 L3,21.0000003 Z" id="Path-74" stroke-linecap="round" stroke-linejoin="round"></path>
11 <path d="M14.5,5.5 L18.5,9.5" id="Path-75"></path>
12 </g>
13 </g>
14 </g>
15</svg>
diff --git a/client/src/assets/default-avatar.png b/client/src/assets/images/default-avatar.png
index 4b7fd2c0a..4b7fd2c0a 100644
--- a/client/src/assets/default-avatar.png
+++ b/client/src/assets/images/default-avatar.png
Binary files differ
diff --git a/client/src/assets/favicon.png b/client/src/assets/images/favicon.png
index bb57ee6b0..bb57ee6b0 100644
--- a/client/src/assets/favicon.png
+++ b/client/src/assets/images/favicon.png
Binary files differ
diff --git a/client/src/assets/header/menu.svg b/client/src/assets/images/header/menu.svg
index 7101bf73b..7101bf73b 100644
--- a/client/src/assets/header/menu.svg
+++ b/client/src/assets/images/header/menu.svg
diff --git a/client/src/assets/header/search.svg b/client/src/assets/images/header/search.svg
index 489b59e9b..489b59e9b 100644
--- a/client/src/assets/header/search.svg
+++ b/client/src/assets/images/header/search.svg
diff --git a/client/src/assets/header/upload.svg b/client/src/assets/images/header/upload.svg
index 2b07caf76..2b07caf76 100644
--- a/client/src/assets/header/upload.svg
+++ b/client/src/assets/images/header/upload.svg
diff --git a/client/src/assets/logo.svg b/client/src/assets/images/logo.svg
index 8777acd5b..8777acd5b 100644
--- a/client/src/assets/logo.svg
+++ b/client/src/assets/images/logo.svg
diff --git a/client/src/assets/menu/administration.svg b/client/src/assets/images/menu/administration.svg
index b6da837d2..b6da837d2 100644
--- a/client/src/assets/menu/administration.svg
+++ b/client/src/assets/images/menu/administration.svg
diff --git a/client/src/assets/menu/recently-added.svg b/client/src/assets/images/menu/recently-added.svg
index 6473837f8..6473837f8 100644
--- a/client/src/assets/menu/recently-added.svg
+++ b/client/src/assets/images/menu/recently-added.svg
diff --git a/client/src/assets/menu/trending.svg b/client/src/assets/images/menu/trending.svg
index ffc65cc04..ffc65cc04 100644
--- a/client/src/assets/menu/trending.svg
+++ b/client/src/assets/images/menu/trending.svg