diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss index 1cb04e2f4..f08ca2a8a 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, $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 { diff --git a/src/components/split-view/split-view.scss b/src/components/split-view/split-view.scss index a88d5cd97..ef7534bcb 100644 --- a/src/components/split-view/split-view.scss +++ b/src/components/split-view/split-view.scss @@ -39,4 +39,7 @@ core-split-view { ion-header { display: none; } + ion-content.statusbar-padding:first-child .scroll-content { + padding-top: 0 !important; + } } diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html index 905800187..9471f649a 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 @@ - +
diff --git a/src/lang/en.json b/src/lang/en.json index 37b28852d..cbb09a371 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -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.",