Merge pull request #2163 from crazyserver/MOBILE-3215

MOBILE-3215 style: Add styles to improve bma handling
main
Juan Leyva 2019-11-22 10:57:37 +01:00 committed by GitHub
commit f1a86b2a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 3 deletions

View File

@ -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">

View File

@ -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);
}
}

View File

@ -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;