From 7fc441cc4ec7b9e7a8bcd660bdee5d19fee8512c Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Wed, 4 Dec 2019 09:29:20 +0100
Subject: (css) improve video-watch title display on small screens

---
 .../videos/+video-watch/video-watch.component.html | 106 ++++++++++++---------
 .../videos/+video-watch/video-watch.component.scss |  14 ++-
 2 files changed, 72 insertions(+), 48 deletions(-)

(limited to 'client/src')

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 58b2382f0..c57b00032 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -39,70 +39,82 @@
     <div class="video-info">
       <div class="video-info-first-row">
         <div>
-          <div class="d-block d-md-none"> <!-- only shown on medium devices, has its conterpart for larger viewports below -->
+          <div class="d-block d-md-none"> <!-- only shown on medium devices, has its counterpart for larger viewports below -->
             <h1 class="video-info-name">{{ video.name }}</h1>
+
             <div i18n class="video-info-date-views">
               Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> - {{ video.views | myNumberFormatter }} views</span>
             </div>
           </div>
 
-          <div class="d-flex justify-content-between align-items-md-end">
+          <div class="d-flex justify-content-between flex-direction-column">
             <div class="d-none d-md-block">
               <h1 class="video-info-name">{{ video.name }}</h1>
+            </div>
 
-              <div i18n class="video-info-date-views">
+            <div class="video-info-first-row-bottom">
+              <div i18n class="d-none d-md-block video-info-date-views">
                 Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> - {{ video.views | myNumberFormatter }} views</span>
               </div>
-            </div>
-
-            <div class="video-actions-rates">
-              <div class="video-actions fullWidth justify-content-end">
-                <div
-                  [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
-                  class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
-                  i18n-title title="Like this video"
-                >
-                  <my-global-icon iconName="like"></my-global-icon>
-                  <span *ngIf="video.likes" class="count">{{ video.likes }}</span>
-                </div>
-
-                <div
-                  [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
-                  class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
-                  i18n-title title="Dislike this video"
-                >
-                  <my-global-icon iconName="dislike"></my-global-icon>
-                  <span *ngIf="video.dislikes" class="count">{{ video.dislikes }}</span>
-                </div>
 
-                <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
-                  <my-global-icon iconName="support"></my-global-icon>
-                  <span class="icon-text" i18n>Support</span>
-                </div>
+              <div class="video-actions-rates">
+                <div class="video-actions fullWidth justify-content-end">
+                  <div
+                    [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
+                    class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
+                    i18n-title title="Like this video"
+                  >
+                    <my-global-icon iconName="like"></my-global-icon>
+                    <span *ngIf="video.likes" class="count">{{ video.likes }}</span>
+                  </div>
 
-                <div (click)="showShareModal()" class="action-button" role="button">
-                  <my-global-icon iconName="share"></my-global-icon>
-                  <span class="icon-text" i18n>Share</span>
+                  <div
+                    [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
+                    class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
+                    i18n-title title="Dislike this video"
+                  >
+                    <my-global-icon iconName="dislike"></my-global-icon>
+                    <span *ngIf="video.dislikes" class="count">{{ video.dislikes }}</span>
+                  </div>
+  
+                  <div *ngIf="video.support" (click)="showSupportModal()" class="action-button">
+                    <my-global-icon iconName="heart"></my-global-icon>
+                    <span class="icon-text" i18n>Support</span>
+                  </div>
+  
+                  <div (click)="showShareModal()" class="action-button" role="button">
+                    <my-global-icon iconName="share"></my-global-icon>
+                    <span class="icon-text" i18n>Share</span>
+                  </div>
+  
+                  <div
+                    class="action-dropdown" ngbDropdown placement="top" role="button" autoClose="outside"
+                     *ngIf="isUserLoggedIn()" (openChange)="addContent.openChange($event)"
+                  >
+                    <div class="action-button action-button-save" ngbDropdownToggle role="button">
+                      <my-global-icon iconName="playlist-add"></my-global-icon>
+                      <span class="icon-text" i18n>Save</span>
+                    </div>
+  
+                    <div ngbDropdownMenu>
+                      <my-video-add-to-playlist #addContent [video]="video"></my-video-add-to-playlist>
+                    </div>
+                  </div>
+  
+                  <my-video-actions-dropdown
+                    placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video"
+                    (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
+                  ></my-video-actions-dropdown>
                 </div>
-
+  
                 <div
-                  class="action-dropdown" ngbDropdown placement="top" role="button" autoClose="outside"
-                   *ngIf="isUserLoggedIn()" (openChange)="addContent.openChange($event)"
+                  class="video-info-likes-dislikes-bar"
+                  *ngIf="video.likes !== 0 || video.dislikes !== 0"
+                  [ngbTooltip]="likesBarTooltipText"
+                  placement="bottom"
                 >
-                  <div class="action-button action-button-save" ngbDropdownToggle role="button">
-                    <my-global-icon iconName="playlist-add"></my-global-icon>
-                    <span class="icon-text" i18n>Save</span>
-                  </div>
-
-                  <div ngbDropdownMenu>
-                    <my-video-add-to-playlist #addContent [video]="video"></my-video-add-to-playlist>
-                  </div>
+                  <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
                 </div>
-
-                <my-video-actions-dropdown
-                  placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video"
-                  (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
-                ></my-video-actions-dropdown>
               </div>
 
               <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 86b44d5da..7b134a4dc 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -108,6 +108,10 @@ $player-factor: 1.7; // 16/9
   border-radius: 0;
 }
 
+.flex-direction-column {
+  flex-direction: column;
+}
+
 #video-not-found {
   height: 300px;
   line-height: 300px;
@@ -142,6 +146,13 @@ $player-factor: 1.7; // 16/9
         flex-grow: 1;
       }
 
+      .video-info-first-row-bottom {
+        display: grid;
+        grid-template-columns: 1fr auto;
+        align-items: center;
+        width: 100%;
+      }
+
       .video-info-date-views {
         flex-grow: 1;
         margin-bottom: 10px;
@@ -209,8 +220,9 @@ $player-factor: 1.7; // 16/9
       }
 
       .video-actions-rates {
-        margin: 20px 0 10px 0;
+        margin: 0 0 10px 0;
         align-items: start;
+        width: max-content;
 
         .video-actions {
           height: 40px; // Align with the title
-- 
cgit v1.2.3