From 6fa19efcd5fb6aacc0bb18dee43e5ece724c62ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 18 Jun 2018 16:26:40 +0200
Subject: [PATCH] MOBILE-2430 tabs: Fix status bar top padding

---
 src/app/app.ios.scss                                 | 12 ++++++++++++
 src/components/ion-tabs/ion-tabs.scss                |  2 +-
 .../course/components/format/core-course-format.html |  2 +-
 src/core/course/components/format/format.scss        |  5 +++++
 src/theme/variables.scss                             |  4 ++--
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/app/app.ios.scss b/src/app/app.ios.scss
index 58b921be0..084c5f5e1 100644
--- a/src/app/app.ios.scss
+++ b/src/app/app.ios.scss
@@ -41,6 +41,18 @@
     height: calc(100% - #{($navbar-ios-height)});
 }
 
+.platform-cordova.ios .core-avoid-header .menu-inner > ion-content {
+    top: $navbar-ios-height + $cordova-ios-statusbar-padding;
+    height: calc(100% - #{($navbar-ios-height + $cordova-ios-statusbar-padding)});
+}
+
+.platform-cordova.ios .core-avoid-header .core-avoid-header .menu-inner > ion-content,
+.platform-cordova.ios core-tab core-split-view .core-avoid-header .menu-inner > ion-content {
+    top: 0;
+    height: 100%;
+}
+
+
 // Highlights inside the input element.
 @if ($core-text-input-ios-show-highlight) {
   .card-ios, .list-ios {
diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss
index f08ca2a8a..1cb04e2f4 100644
--- a/src/components/ion-tabs/ion-tabs.scss
+++ b/src/components/ion-tabs/ion-tabs.scss
@@ -81,7 +81,7 @@ core-ion-tab.show-tab {
 }
 
 .ios {
-    @include core-ion-tabs-statusbar-padding($toolbar-ios-height + 15, $toolbar-ios-padding, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
+    @include core-ion-tabs-statusbar-padding($toolbar-ios-height, $toolbar-ios-padding, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
 }
 
 .md {
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 9471f649a..b90c2e218 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -2,7 +2,7 @@
 <core-dynamic-component [component]="courseFormatComponent" [data]="data">
     <!-- Course summary. By default we only display the course progress. -->
     <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-        <ion-list no-lines *ngIf="course.imageThumb || (course.progress != null && course.progress >= 0)">
+        <ion-list no-lines *ngIf="course.imageThumb || (course.progress != null && course.progress >= 0)" class="core-format-progress-list">
             <div *ngIf="course.imageThumb" class="core-course-thumb">
                 <img [src]="course.imageThumb" core-external-content alt=""/>
             </div>
diff --git a/src/core/course/components/format/format.scss b/src/core/course/components/format/format.scss
index e0fb24ce2..ac61d4803 100644
--- a/src/core/course/components/format/format.scss
+++ b/src/core/course/components/format/format.scss
@@ -6,6 +6,11 @@ ion-badge.core-course-download-section-progress {
 }
 
 core-course-format {
+
+    .core-format-progress-list {
+        margin-bottom: 0;
+    }
+
     .core-course-thumb {
         height: 150px;
         width: 100%;
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 047cbaf22..32c26f543 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -58,7 +58,7 @@ $core-course-image-background: #81ecec, #74b9ff, #a29bfe, #dfe6e9, #00b894, #098
 // To view all the possible Ionic variables, see:
 // http://ionicframework.com/docs/theming/overriding-ionic-variables/
 
-$toolbar-background: $orange;
+$toolbar-background: $core-color;
 $content-padding: 10px;
 
 
@@ -141,7 +141,7 @@ $loading-ios-spinner-color: $core-color;
 $spinner-ios-ios-color: $core-color;
 $tabs-ios-tab-color-inactive: $tabs-tab-color-inactive;
 $button-ios-outline-background-color: $white;
-
+$toolbar-ios-height: 44px + 15;
 
 // App Material Design Variables
 // --------------------------------------------------