From 69fc9d2d842530bd838f1bdd76eda6792d9f54db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 12 Nov 2019 11:42:17 +0100
Subject: [PATCH] MOBILE-3215 style: Add styles to improve bma handling

---
 .../courses/pages/dashboard/dashboard.html    |  7 ++++--
 .../courses/pages/dashboard/dashboard.scss    | 24 +++++++++++++++++++
 src/theme/variables.scss                      |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index 401379077..4ad0dcd61 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -1,6 +1,9 @@
-    <ion-header>
+<ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></ion-title>
+        <ion-title>
+            <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+            <img src="assets/img/login_logo.png" class="core-header-logo" [alt]="siteName">
+        </ion-title>
 
         <ion-buttons end>
             <button *ngIf="searchEnabled" ion-button icon-only (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
diff --git a/src/core/courses/pages/dashboard/dashboard.scss b/src/core/courses/pages/dashboard/dashboard.scss
index 41e889542..c21def799 100644
--- a/src/core/courses/pages/dashboard/dashboard.scss
+++ b/src/core/courses/pages/dashboard/dashboard.scss
@@ -1,7 +1,31 @@
+$core-dashboard-logo: false !default;
+
 ion-app.app-root page-core-courses-dashboard {
+    @if $core-dashboard-logo {
+        .toolbar-title-md .core-header-logo {
+            max-height: $toolbar-md-height - 24;
+        }
+
+        .toolbar-title-ios .core-header-logo {
+            max-height: $toolbar-ios-height - 24;
+        }
+
+        .toolbar-title-wp .core-header-logo {
+            max-height: $toolbar-wp-height - 24;
+        }
+        .toolbar-title core-format-text {
+            display: none;
+        }
+    } @else {
+        .toolbar-title .core-header-logo {
+             display: none;
+        }
+    }
+
     ion-badge.core-course-download-courses-progress {
         display: block;
         @include float(start);
         @include margin(12px, 12px, null, 12px);
     }
 }
+
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ec639ba86..ebab93935 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -30,7 +30,6 @@ $red:             #cb3d4d;
 $orange:          #f98012; // Accent (never text).
 $yellow:          #fbad1a; // Accent (never text).
 $purple:          #8e24aa; // Accent (never text).
-$core-color:      $orange;
 
 // Branded apps customization
 // --------------------------------------------------
@@ -53,6 +52,7 @@ $orange-light:    lighten($orange, 10%) !default;
 $yellow-light:    mix($yellow, white, 20%) !default;
 $yellow-dark:     mix($yellow, black, 40%) !default;
 
+$core-color:          $orange !default;
 $core-color-light:    lighten($core-color, 10%) !default;
 $core-color-dark:     darken($core-color, 10%) !default;