diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-21 09:25:02 +0100 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2019-12-21 09:25:02 +0100 |
commit | 5def76ebba937594c77070dba14aff8f168ced24 (patch) | |
tree | 79371616329666272936a151d2c27eccd9f5d35b /client/src/app/videos/+video-watch | |
parent | 3921166d78540a08d329793c9c2f952135c6fd67 (diff) | |
download | PeerTube-5def76ebba937594c77070dba14aff8f168ced24.tar.gz PeerTube-5def76ebba937594c77070dba14aff8f168ced24.tar.zst PeerTube-5def76ebba937594c77070dba14aff8f168ced24.zip |
Add autoplay tooltip, use of flex-wrap in video-info and other-videos
Diffstat (limited to 'client/src/app/videos/+video-watch')
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.html | 2 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.scss | 11 |
2 files changed, 8 insertions, 5 deletions
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 e87f59c98..25029623e 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -109,7 +109,7 @@ | |||
109 | </div> | 109 | </div> |
110 | 110 | ||
111 | <my-video-actions-dropdown | 111 | <my-video-actions-dropdown |
112 | placement="top auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" | 112 | placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" |
113 | (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()" | 113 | (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()" |
114 | ></my-video-actions-dropdown> | 114 | ></my-video-actions-dropdown> |
115 | </div> | 115 | </div> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index f9ff83c34..5da5a60dd 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -147,14 +147,13 @@ $video-info-margin-left: 44px; | |||
147 | } | 147 | } |
148 | 148 | ||
149 | .video-info-first-row-bottom { | 149 | .video-info-first-row-bottom { |
150 | display: grid; | 150 | display: flex; |
151 | grid-template-columns: 1fr auto; | 151 | flex-wrap: wrap; |
152 | align-items: center; | 152 | align-items: center; |
153 | width: 100%; | 153 | width: 100%; |
154 | } | 154 | } |
155 | 155 | ||
156 | .video-info-date-views { | 156 | .video-info-date-views { |
157 | flex-grow: 1; | ||
158 | align-self: start; | 157 | align-self: start; |
159 | margin-bottom: 10px; | 158 | margin-bottom: 10px; |
160 | margin-right: 10px; | 159 | margin-right: 10px; |
@@ -210,8 +209,8 @@ $video-info-margin-left: 44px; | |||
210 | .video-actions-rates { | 209 | .video-actions-rates { |
211 | margin: 0 0 10px 0; | 210 | margin: 0 0 10px 0; |
212 | align-items: start; | 211 | align-items: start; |
213 | align-self: end; | ||
214 | width: max-content; | 212 | width: max-content; |
213 | margin-left: auto; | ||
215 | 214 | ||
216 | .video-actions { | 215 | .video-actions { |
217 | height: 40px; // Align with the title | 216 | height: 40px; // Align with the title |
@@ -397,6 +396,10 @@ $video-info-margin-left: 44px; | |||
397 | padding-left: 15px; | 396 | padding-left: 15px; |
398 | min-width: $video-miniature-width; | 397 | min-width: $video-miniature-width; |
399 | 398 | ||
399 | @media screen and (min-width: 1800px - (3* $video-miniature-width)) { | ||
400 | width: min-content; | ||
401 | } | ||
402 | |||
400 | .title-page { | 403 | .title-page { |
401 | margin: 0 !important; | 404 | margin: 0 !important; |
402 | } | 405 | } |