EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1342 from crazyserver/MOBILE-2430 

Mobile 2430
main
Juan Leyva 2018-06-18 13:48:42 +02:00 committed by GitHub
parent 1c9c418632 770304d994
commit 6540abfb0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ion-tabs/ion-tabs.scss
View File

@ -81,7 +81,7 @@ core-ion-tab.show-tab {
}
.ios {
@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);
@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);
}
.md {

3
src/components/split-view/split-view.scss
View File

@ -39,4 +39,7 @@ core-split-view {
ion-header {
display: none;
}
ion-content.statusbar-padding:first-child .scroll-content {
padding-top: 0 !important;
}
}

2
src/core/course/components/format/core-course-format.html
View File

@ -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>
<ion-list no-lines *ngIf="course.imageThumb || (course.progress != null && course.progress >= 0)">
<div *ngIf="course.imageThumb" class="core-course-thumb">
<img [src]="course.imageThumb" core-external-content alt=""/>
</div>

4
src/lang/en.json
View File

@ -27,10 +27,14 @@
"commentsnotworking": "Comments cannot be retrieved",
"completion-alt-auto-fail": "Completed: {{$a}} (did not achieve pass grade)",
"completion-alt-auto-n": "Not completed: {{$a}}",
"completion-alt-auto-n-override": "Not completed: {{$a.modname}} (set by {{$a.overrideuser}})",
"completion-alt-auto-pass": "Completed: {{$a}} (achieved pass grade)",
"completion-alt-auto-y": "Completed: {{$a}}",
"completion-alt-auto-y-override": "Completed: {{$a.modname}} (set by {{$a.overrideuser}})",
"completion-alt-manual-n": "Not completed: {{$a}}. Select to mark as complete.",
"completion-alt-manual-n-override": "Not completed: {{$a.modname}} (set by {{$a.overrideuser}}). Select to mark as complete.",
"completion-alt-manual-y": "Completed: {{$a}}. Select to mark as not complete.",
"completion-alt-manual-y-override": "Completed: {{$a.modname}} (set by {{$a.overrideuser}}). Select to mark as not complete.",
"confirmcanceledit": "Are you sure you want to leave this page? All changes will be lost.",
"confirmdeletefile": "Are you sure you want to delete this file?",
"confirmloss": "Are you sure? All changes will be lost.",