From 4afcdcfad88fbc75acd7f689cca3378421c681d1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 28 Jan 2019 09:55:09 +0100
Subject: Fix menu overflow on mobile screens

---
 client/src/app/menu/menu.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client/src/app')

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 24b1a4db3..f30b89413 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -16,7 +16,7 @@ menu {
   height: 100%;
   white-space: nowrap;
   text-overflow: ellipsis;
-  overflow: hidden;
+  overflow: auto;
   color: var(--menuForegroundColor);
   display: flex;
   flex-direction: column;
-- 
cgit v1.2.3


From 2c0070c8f31e6a28b1d52ee6e9965e21471abd5b Mon Sep 17 00:00:00 2001
From: Josh Morel <morel.josh@hotmail.com>
Date: Mon, 28 Jan 2019 07:01:01 -0500
Subject: fix undefined change ownership icons

---
 .../my-account-ownership/my-account-ownership.component.html          | 4 ++--
 client/src/app/shared/icons/global-icon.component.ts                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'client/src/app')

diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
index 379fd8bb1..5709e9f54 100644
--- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
+++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
@@ -40,10 +40,10 @@
       <td class="action-cell">
         <ng-container *ngIf="videoChangeOwnership.status === 'WAITING'">
           <my-button i18n label="Accept"
-                     icon="icon-tick"
+                     icon="tick"
                      (click)="openAcceptModal(videoChangeOwnership)"></my-button>
           <my-button i18n label="Refuse"
-                     icon="icon-cross"
+                     icon="cross"
                      (click)="refuse(videoChangeOwnership)">Refuse</my-button>
         </ng-container>
       </td>
diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts
index 5b9377e3e..e8ada0324 100644
--- a/client/src/app/shared/icons/global-icon.component.ts
+++ b/client/src/app/shared/icons/global-icon.component.ts
@@ -19,6 +19,7 @@ const icons = {
   'delete': require('../../../assets/images/global/delete.html'),
   'cross': require('../../../assets/images/global/cross.html'),
   'validate': require('../../../assets/images/global/validate.html'),
+  'tick': require('../../../assets/images/global/tick.html'),
   'dislike': require('../../../assets/images/video/dislike.html'),
   'heart': require('../../../assets/images/video/heart.html'),
   'like': require('../../../assets/images/video/like.html'),
-- 
cgit v1.2.3