diff options
Diffstat (limited to 'client/src/app/shared')
6 files changed, 16 insertions, 7 deletions
diff --git a/client/src/app/shared/buttons/action-dropdown.component.html b/client/src/app/shared/buttons/action-dropdown.component.html index 114b1d71f..6999474d6 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.html +++ b/client/src/app/shared/buttons/action-dropdown.component.html | |||
@@ -3,7 +3,7 @@ | |||
3 | class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange' }" | 3 | class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange' }" |
4 | ngbDropdownToggle role="button" | 4 | ngbDropdownToggle role="button" |
5 | > | 5 | > |
6 | <my-global-icon *ngIf="!label" class="more-icon" iconName="more"></my-global-icon> | 6 | <my-global-icon *ngIf="!label" class="more-icon" iconName="more-horizontal"></my-global-icon> |
7 | <span *ngIf="label" class="dropdown-toggle">{{ label }}</span> | 7 | <span *ngIf="label" class="dropdown-toggle">{{ label }}</span> |
8 | </div> | 8 | </div> |
9 | 9 | ||
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts index 3fda7ee4d..093e88033 100644 --- a/client/src/app/shared/images/global-icon.component.ts +++ b/client/src/app/shared/images/global-icon.component.ts | |||
@@ -23,7 +23,8 @@ const icons = { | |||
23 | 'dislike': require('../../../assets/images/video/dislike.html'), | 23 | 'dislike': require('../../../assets/images/video/dislike.html'), |
24 | 'heart': require('../../../assets/images/video/heart.html'), | 24 | 'heart': require('../../../assets/images/video/heart.html'), |
25 | 'like': require('../../../assets/images/video/like.html'), | 25 | 'like': require('../../../assets/images/video/like.html'), |
26 | 'more': require('../../../assets/images/video/more.html'), | 26 | 'more-horizontal': require('../../../assets/images/global/more-horizontal.html'), |
27 | 'more-vertical': require('../../../assets/images/global/more-vertical.html'), | ||
27 | 'share': require('../../../assets/images/video/share.html'), | 28 | 'share': require('../../../assets/images/video/share.html'), |
28 | 'upload': require('../../../assets/images/video/upload.html'), | 29 | 'upload': require('../../../assets/images/video/upload.html'), |
29 | 'playlist-add': require('../../../assets/images/video/playlist-add.html') | 30 | 'playlist-add': require('../../../assets/images/video/playlist-add.html') |
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.html b/client/src/app/shared/video-playlist/video-add-to-playlist.component.html index ed3cd8dc5..f85e50d6d 100644 --- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.html +++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.html | |||
@@ -2,10 +2,10 @@ | |||
2 | <div class="first-row"> | 2 | <div class="first-row"> |
3 | <div i18n class="title">Save to</div> | 3 | <div i18n class="title">Save to</div> |
4 | 4 | ||
5 | <div i18n class="options" (click)="displayOptions = !displayOptions"> | 5 | <div class="options" (click)="displayOptions = !displayOptions"> |
6 | <my-global-icon iconName="cog"></my-global-icon> | 6 | <my-global-icon iconName="cog"></my-global-icon> |
7 | 7 | ||
8 | Options | 8 | <span i18n>Options</span> |
9 | </div> | 9 | </div> |
10 | </div> | 10 | </div> |
11 | 11 | ||
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss index 68dcda1eb..bc0d55912 100644 --- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss +++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss | |||
@@ -18,6 +18,8 @@ | |||
18 | } | 18 | } |
19 | 19 | ||
20 | .options { | 20 | .options { |
21 | display: flex; | ||
22 | align-items: center; | ||
21 | font-size: 14px; | 23 | font-size: 14px; |
22 | cursor: pointer; | 24 | cursor: pointer; |
23 | 25 | ||
@@ -25,7 +27,8 @@ | |||
25 | @include apply-svg-color(#333); | 27 | @include apply-svg-color(#333); |
26 | 28 | ||
27 | width: 16px; | 29 | width: 16px; |
28 | height: 16px; | 30 | height: 23px; |
31 | margin-right: 3px; | ||
29 | } | 32 | } |
30 | } | 33 | } |
31 | } | 34 | } |
diff --git a/client/src/app/shared/video-playlist/video-playlist-miniature.component.scss b/client/src/app/shared/video-playlist/video-playlist-miniature.component.scss index f8cd47f73..72158eb10 100644 --- a/client/src/app/shared/video-playlist/video-playlist-miniature.component.scss +++ b/client/src/app/shared/video-playlist/video-playlist-miniature.component.scss | |||
@@ -29,7 +29,8 @@ | |||
29 | padding: 0 10px; | 29 | padding: 0 10px; |
30 | display: flex; | 30 | display: flex; |
31 | align-items: center; | 31 | align-items: center; |
32 | font-size: 15px; | 32 | font-size: 14px; |
33 | font-weight: $font-semibold; | ||
33 | } | 34 | } |
34 | } | 35 | } |
35 | 36 | ||
diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index c936a8207..95b5e3671 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { User } from '../' | 1 | import { User } from '../' |
2 | import { Video as VideoServerModel, VideoPrivacy, VideoState } from '../../../../../shared' | 2 | import { PlaylistElement, Video as VideoServerModel, VideoPrivacy, VideoState } from '../../../../../shared' |
3 | import { Avatar } from '../../../../../shared/models/avatars/avatar.model' | 3 | import { Avatar } from '../../../../../shared/models/avatars/avatar.model' |
4 | import { VideoConstant } from '../../../../../shared/models/videos/video-constant.model' | 4 | import { VideoConstant } from '../../../../../shared/models/videos/video-constant.model' |
5 | import { durationToString, getAbsoluteAPIUrl } from '../misc/utils' | 5 | import { durationToString, getAbsoluteAPIUrl } from '../misc/utils' |
@@ -47,6 +47,8 @@ export class Video implements VideoServerModel { | |||
47 | blacklisted?: boolean | 47 | blacklisted?: boolean |
48 | blacklistedReason?: string | 48 | blacklistedReason?: string |
49 | 49 | ||
50 | playlistElement?: PlaylistElement | ||
51 | |||
50 | account: { | 52 | account: { |
51 | id: number | 53 | id: number |
52 | uuid: string | 54 | uuid: string |
@@ -125,6 +127,8 @@ export class Video implements VideoServerModel { | |||
125 | this.blacklistedReason = hash.blacklistedReason | 127 | this.blacklistedReason = hash.blacklistedReason |
126 | 128 | ||
127 | this.userHistory = hash.userHistory | 129 | this.userHistory = hash.userHistory |
130 | |||
131 | this.playlistElement = hash.playlistElement | ||
128 | } | 132 | } |
129 | 133 | ||
130 | isVideoNSFWForUser (user: User, serverConfig: ServerConfig) { | 134 | isVideoNSFWForUser (user: User, serverConfig: ServerConfig) { |