diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-20 20:14:58 +0100 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-20 21:15:28 +0100 |
commit | 3921166d78540a08d329793c9c2f952135c6fd67 (patch) | |
tree | 0f036d15013a0a25e63135fdba595c3b535dc291 /client | |
parent | 223b24e618146f85b20b5bf365bc18d14a5964cd (diff) | |
download | PeerTube-3921166d78540a08d329793c9c2f952135c6fd67.tar.gz PeerTube-3921166d78540a08d329793c9c2f952135c6fd67.tar.zst PeerTube-3921166d78540a08d329793c9c2f952135c6fd67.zip |
(css) vertical-center modals, bullet as separator
Diffstat (limited to 'client')
4 files changed, 25 insertions, 4 deletions
diff --git a/client/src/app/shared/buttons/action-dropdown.component.ts b/client/src/app/shared/buttons/action-dropdown.component.ts index a4200f70f..5330ca220 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.ts +++ b/client/src/app/shared/buttons/action-dropdown.component.ts | |||
@@ -23,7 +23,7 @@ export class ActionDropdownComponent<T> { | |||
23 | @Input() actions: DropdownAction<T>[] | DropdownAction<T>[][] = [] | 23 | @Input() actions: DropdownAction<T>[] | DropdownAction<T>[][] = [] |
24 | @Input() entry: T | 24 | @Input() entry: T |
25 | 25 | ||
26 | @Input() placement = 'bottom-left' | 26 | @Input() placement = 'bottom-left auto' |
27 | 27 | ||
28 | @Input() buttonSize: DropdownButtonSize = 'normal' | 28 | @Input() buttonSize: DropdownButtonSize = 'normal' |
29 | @Input() buttonDirection: DropdownDirection = 'horizontal' | 29 | @Input() buttonDirection: DropdownDirection = 'horizontal' |
diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html index c4b713073..23a7dbb1e 100644 --- a/client/src/app/shared/video/video-miniature.component.html +++ b/client/src/app/shared/video/video-miniature.component.html | |||
@@ -20,7 +20,7 @@ | |||
20 | <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle> | 20 | <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle> |
21 | 21 | ||
22 | <span class="views"> | 22 | <span class="views"> |
23 | <ng-container *ngIf="displayOptions.date && displayOptions.views"> - </ng-container> | 23 | <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container> |
24 | <ng-container i18n *ngIf="displayOptions.views">{{ video.views | myNumberFormatter }} views</ng-container> | 24 | <ng-container i18n *ngIf="displayOptions.views">{{ video.views | myNumberFormatter }} views</ng-container> |
25 | </span> | 25 | </span> |
26 | </span> | 26 | </span> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 9e69033e1..e87f59c98 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -43,7 +43,7 @@ | |||
43 | <h1 class="video-info-name">{{ video.name }}</h1> | 43 | <h1 class="video-info-name">{{ video.name }}</h1> |
44 | 44 | ||
45 | <div i18n class="video-info-date-views"> | 45 | <div i18n class="video-info-date-views"> |
46 | Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> - {{ video.views | myNumberFormatter }} views</span> | 46 | Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> • {{ video.views | myNumberFormatter }} views</span> |
47 | </div> | 47 | </div> |
48 | </div> | 48 | </div> |
49 | 49 | ||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | <div class="video-info-first-row-bottom"> | 55 | <div class="video-info-first-row-bottom"> |
56 | <div i18n class="d-none d-md-block video-info-date-views"> | 56 | <div i18n class="d-none d-md-block video-info-date-views"> |
57 | Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> - {{ video.views | myNumberFormatter }} views</span> | 57 | Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> • {{ video.views | myNumberFormatter }} views</span> |
58 | </div> | 58 | </div> |
59 | 59 | ||
60 | <div class="video-actions-rates"> | 60 | <div class="video-actions-rates"> |
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 2944dd9e2..2f691de70 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -37,7 +37,28 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
37 | } | 37 | } |
38 | } | 38 | } |
39 | 39 | ||
40 | |||
41 | @media screen and (min-width: 768px) { | ||
42 | .modal:before { | ||
43 | display: inline-block; | ||
44 | vertical-align: middle; | ||
45 | content: " "; | ||
46 | height: 100%; | ||
47 | } | ||
48 | |||
49 | .modal-dialog { | ||
50 | display: inline-block; | ||
51 | text-align: left; | ||
52 | vertical-align: middle; | ||
53 | min-width: 500px; | ||
54 | width: 40vw; | ||
55 | max-width: 900px; | ||
56 | } | ||
57 | } | ||
58 | |||
40 | .modal { | 59 | .modal { |
60 | text-align: center; | ||
61 | |||
41 | .modal-content { | 62 | .modal-content { |
42 | background-color: var(--mainBackgroundColor); | 63 | background-color: var(--mainBackgroundColor); |
43 | } | 64 | } |