From efa8618efa42d6dbe7e3e4d4303e681685ed8c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 3 Sep 2018 13:29:20 +0200
Subject: [PATCH] MOBILE-2567 chat: Add margin bottom when keyboard is open

---
 src/addon/messages/pages/discussion/discussion.html      | 2 +-
 src/addon/mod/chat/pages/chat/chat.html                  | 2 +-
 src/app/app.scss                                         | 4 +++-
 src/components/tabs/tabs.scss                            | 1 +
 src/core/emulator/pages/capture-media/capture-media.html | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index 1c7b2e325..89bd5a6be 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -12,7 +12,7 @@
         </a>
     </core-navbar-buttons>
 </ion-header>
-<ion-content>
+<ion-content class="has-footer">
     <core-loading [hideUntil]="loaded">
         <!-- Load previous messages. -->
         <ion-infinite-scroll [enabled]="canLoadMore" (ionInfinite)="loadPrevious($event)" position="top">
diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index fbdf3bce1..c440dce08 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -8,7 +8,7 @@
         </ion-buttons>
     </ion-navbar>
 </ion-header>
-<ion-content>
+<ion-content  class="has-footer">
     <core-loading [hideUntil]="loaded">
         <div aria-live="polite">
             <div *ngFor="let message of messages; index as index; last as last">
diff --git a/src/app/app.scss b/src/app/app.scss
index 59e4bfb88..5df6a8ce9 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -919,8 +919,10 @@ ion-app.app-root {
 }
 
 body.keyboard-is-open {
-  .scroll-content, .fixed-content {
+  ion-content:not(.has-footer) {
+    > .scroll-content, > .fixed-content {
       margin-bottom: 0 !important;
+    }
   }
 
   core-ion-tabs .tabbar {
diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
index 92429699d..b39c0f89e 100644
--- a/src/components/tabs/tabs.scss
+++ b/src/components/tabs/tabs.scss
@@ -26,6 +26,7 @@ ion-app.app-root .core-tabs-bar {
             word-wrap: break-word;
             display: block;
             width: 100%;
+            line-height: 1.2em;
         }
 
         &[aria-selected=true] {
diff --git a/src/core/emulator/pages/capture-media/capture-media.html b/src/core/emulator/pages/capture-media/capture-media.html
index 8ea643e22..60e2c6dd2 100644
--- a/src/core/emulator/pages/capture-media/capture-media.html
+++ b/src/core/emulator/pages/capture-media/capture-media.html
@@ -11,7 +11,7 @@
         </ion-buttons>
     </ion-navbar>
 </ion-header>
-<ion-content>
+<ion-content  class="has-footer">
     <core-loading [hideUntil]="readyToCapture">
         <div class="core-av-wrapper">
             <!-- Video stream for image and video. -->