From a349c2a1ac6c916b2d4026ba9f0cde6e1a01f3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 7 Mar 2019 16:21:48 +0100 Subject: [PATCH] MOBILE-2911 style: Simplify selected items style --- scripts/langindex.json | 2 ++ .../pages/navigation-modal/navigation-modal.html | 2 +- .../pages/navigation-modal/navigation-modal.scss | 15 --------------- src/addon/mod/workshop/pages/phase/phase.scss | 11 +---------- src/components/split-view/split-view.scss | 12 +----------- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/scripts/langindex.json b/scripts/langindex.json index 1d6bf8eae..c87296df8 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -344,6 +344,7 @@ "addon.mod_assign_submission_onlinetext.pluginname": "assignsubmission_onlinetext", "addon.mod_book.errorchapter": "book", "addon.mod_book.modulenameplural": "book", + "addon.mod_book.toc": "book", "addon.mod_chat.beep": "chat", "addon.mod_chat.chatreport": "chat", "addon.mod_chat.currentusers": "chat", @@ -752,6 +753,7 @@ "addon.mod_scorm.scormstatusnotdownloaded": "local_moodlemobileapp", "addon.mod_scorm.scormstatusoutdated": "local_moodlemobileapp", "addon.mod_scorm.suspended": "scorm", + "addon.mod_scorm.toc": "scorm", "addon.mod_scorm.warningofflinedatadeleted": "local_moodlemobileapp", "addon.mod_scorm.warningsynconlineincomplete": "local_moodlemobileapp", "addon.mod_survey.cannotsubmitsurvey": "local_moodlemobileapp", diff --git a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.html b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.html index a68cdaa43..9398439f7 100644 --- a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.html +++ b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.html @@ -21,7 +21,7 @@ {{ 'addon.mod_quiz.showall' | translate }} {{ 'addon.mod_quiz.showeachpage' | translate }} - + {{ 'core.question.questionno' | translate:{$a: question.number} }} {{ 'core.question.information' | translate }} diff --git a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss index 5b3b72890..6576971e0 100644 --- a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss +++ b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss @@ -1,19 +1,4 @@ ion-app.app-root page-addon-mod-quiz-navigation-modal { - .addon-mod_quiz-selected, .item.addon-mod_quiz-selected { - @include border-start(5px, solid, $core-splitview-selected); - font-weight: bold; - - &.item-md { - @include padding(null, null, null, $item-md-padding-start - 5px); - } - &.item-ios { - @include padding(null, null, null, $item-ios-padding-start - 5px); - } - &.item-wp { - @include padding(null, null, null, $item-wp-padding-start - 5px); - } - } - .item.core-question-correct, .item.core-question-incorrect, .item.core-question-notanswered, diff --git a/src/addon/mod/workshop/pages/phase/phase.scss b/src/addon/mod/workshop/pages/phase/phase.scss index 6b909c4ea..f30416066 100644 --- a/src/addon/mod/workshop/pages/phase/phase.scss +++ b/src/addon/mod/workshop/pages/phase/phase.scss @@ -1,15 +1,6 @@ ion-app.app-root page-addon-mod-workshop-phase-info { .core-workshop-phase-selected { background-color: $white; - @include border-start(5px, solid, $core-splitview-selected); - &.item-md { - @include padding(null, null, null, $item-md-padding-start - 5px); - } - &.item-ios { - @include padding(null, null, null, $item-ios-padding-start - 5px); - } - &.item-wp { - @include padding(null, null, null, $item-wp-padding-start - 5px); - } + @include core-selected-item($core-splitview-selected); } } \ No newline at end of file diff --git a/src/components/split-view/split-view.scss b/src/components/split-view/split-view.scss index 893e7708c..5c399b5e5 100644 --- a/src/components/split-view/split-view.scss +++ b/src/components/split-view/split-view.scss @@ -21,17 +21,7 @@ ion-app.app-root core-split-view { .split-pane-side .core-split-item-selected { background-color: $gray-lighter; - @include safe-area-border-start(5px, solid, $core-splitview-selected); - - &.item-md { - @include padding(null, null, null, $item-md-padding-start - 5px); - } - &.item-ios { - @include padding(null, null, null, $item-ios-padding-start - 5px); - } - &.item-wp { - @include padding(null, null, null, $item-wp-padding-start - 5px); - } + @include core-selected-item($core-splitview-selected); } .item-ios[detail-push] .item-inner,