From 70694c839ab9e48f1eeb6a580e1a8464f4758d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 2 Jan 2019 14:31:38 +0100 Subject: [PATCH] MOBILE-2795 ux: Control divider color from css --- .../badges/pages/issued-badge/issued-badge.html | 14 +++++++------- .../addon-block-activitymodules.html | 2 +- .../myoverview/addon-block-myoverview.html | 2 +- .../addon-block-recentlyaccessedcourses.html | 2 +- .../addon-block-recentlyaccesseditems.html | 2 +- .../sitemainmenu/addon-block-sitemainmenu.html | 2 +- .../starredcourses/addon-block-starredcourses.html | 2 +- .../components/timeline/addon-block-timeline.html | 2 +- .../contacts/addon-messages-contacts.html | 2 +- .../discussions/addon-messages-discussions.html | 2 +- .../group-conversations/group-conversations.html | 6 +++--- src/addon/messages/pages/search/search.html | 2 +- src/addon/messages/pages/settings/settings.html | 4 ++-- .../addon-mod-assign-submission-file.html | 2 +- .../addon-mod-assign-submission-onlinetext.html | 2 +- .../components/index/addon-mod-choice-index.html | 4 ++-- src/addon/mod/feedback/pages/attempt/attempt.html | 2 +- src/addon/mod/feedback/pages/form/form.html | 2 +- .../pages/nonrespondents/nonrespondents.html | 2 +- .../feedback/pages/respondents/respondents.html | 4 ++-- .../mod/forum/pages/discussion/discussion.html | 2 +- .../components/index/addon-mod-glossary-index.html | 4 ++-- src/addon/mod/glossary/pages/edit/edit.html | 4 ++-- .../mod/lesson/pages/menu-modal/menu-modal.html | 4 ++-- src/addon/mod/lesson/pages/player/player.html | 2 +- src/addon/mod/quiz/pages/player/player.html | 2 +- .../pages/preflight-modal/preflight-modal.html | 2 +- src/addon/mod/quiz/pages/review/review.html | 2 +- .../components/index/addon-mod-wiki-index.html | 2 +- .../addon-mod-wiki-subwiki-picker.html | 2 +- .../components/index/addon-mod-workshop-index.html | 12 ++++++------ src/addon/mod/workshop/pages/phase/phase.html | 2 +- .../notifications/pages/settings/settings.html | 2 +- src/core/courses/pages/categories/categories.html | 4 ++-- .../pages/course-preview/course-preview.html | 4 ++-- src/core/courses/pages/search/search.html | 2 +- .../login/pages/email-signup/email-signup.html | 14 +++++++------- .../forgotten-password/forgotten-password.html | 2 +- src/core/mainmenu/pages/more/more.html | 2 +- src/core/settings/pages/about/about.html | 6 +++--- .../settings/pages/space-usage/space-usage.html | 2 +- .../pages/synchronization/synchronization.html | 4 ++-- .../components/index/core-sitehome-index.html | 2 +- src/core/user/pages/about/about.html | 6 +++--- src/theme/variables.scss | 8 ++++++++ 45 files changed, 84 insertions(+), 76 deletions(-) diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html index f1e232737..111cc8a8f 100644 --- a/src/addon/badges/pages/issued-badge/issued-badge.html +++ b/src/addon/badges/pages/issued-badge/issued-badge.html @@ -19,7 +19,7 @@ - +

{{ 'addon.badges.recipientdetails' | translate}}

@@ -31,7 +31,7 @@
- +

{{ 'addon.badges.issuerdetails' | translate}}

@@ -49,7 +49,7 @@
- +

{{ 'addon.badges.badgedetails' | translate}}

@@ -100,7 +100,7 @@
- +

{{ 'addon.badges.issuancedetails' | translate}}

@@ -121,7 +121,7 @@ - +

{{ 'addon.badges.bendorsement' | translate}}

@@ -160,7 +160,7 @@ - +

{{ 'addon.badges.relatedbages' | translate}}

@@ -173,7 +173,7 @@ - +

{{ 'addon.badges.alignment' | translate}}

diff --git a/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html index 8d42ff51c..7711b65f6 100644 --- a/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html +++ b/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html @@ -1,4 +1,4 @@ - +

{{ 'addon.block_activitymodules.pluginname' | translate }}

diff --git a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html index bc00beb27..9b3cfa183 100644 --- a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -1,4 +1,4 @@ - +

{{ 'addon.block_myoverview.pluginname' | translate }}

diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html index a7b89c595..0d83e5a7e 100644 --- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html +++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html @@ -1,4 +1,4 @@ - +

{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}

- + {{ 'addon.messages.groupconversations' | translate }} ({{ group.count }}) @@ -58,7 +58,7 @@
- + {{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }}) diff --git a/src/addon/messages/pages/search/search.html b/src/addon/messages/pages/search/search.html index 33ccff7eb..43dfbd4c5 100644 --- a/src/addon/messages/pages/search/search.html +++ b/src/addon/messages/pages/search/search.html @@ -24,7 +24,7 @@ - {{ item.titleString | translate }} + {{ item.titleString | translate }} {{ item.emptyString | translate }} diff --git a/src/addon/messages/pages/settings/settings.html b/src/addon/messages/pages/settings/settings.html index 36d895958..4048bb8f6 100644 --- a/src/addon/messages/pages/settings/settings.html +++ b/src/addon/messages/pages/settings/settings.html @@ -16,7 +16,7 @@
- {{ 'addon.messages.contactableprivacy' | translate }} + {{ 'addon.messages.contactableprivacy' | translate }} {{ 'addon.messages.contactableprivacy_onlycontacts' | translate }} @@ -35,7 +35,7 @@
- + {{ notification.displayname }} diff --git a/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html index 779bff313..69d048e0c 100644 --- a/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html +++ b/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html @@ -14,6 +14,6 @@
- {{plugin.name}} + {{plugin.name}}
diff --git a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html index fde89ebe0..a231c0cfa 100644 --- a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html +++ b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html @@ -9,7 +9,7 @@
- {{ plugin.name }} + {{ plugin.name }}

{{ 'addon.mod_assign.wordlimit' | translate }}

{{ 'core.numwords' | translate: {'$a': words + ' / ' + configs.wordlimit} }}

diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html index 82d44f856..58eeaefe7 100644 --- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html +++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html @@ -62,7 +62,7 @@
- + {{ 'addon.mod_choice.responses' | translate }} @@ -77,7 +77,7 @@ - +

{{ 'addon.mod_choice.numberofuser' | translate }}: {{ result.numberofuser }} ({{ 'core.percentagenumber' | translate: {$a: result.percentageamount} }})

diff --git a/src/addon/mod/feedback/pages/attempt/attempt.html b/src/addon/mod/feedback/pages/attempt/attempt.html index e071278a0..f897a0d48 100644 --- a/src/addon/mod/feedback/pages/attempt/attempt.html +++ b/src/addon/mod/feedback/pages/attempt/attempt.html @@ -18,7 +18,7 @@ - +

{{item.itemnumber}}. diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html index 4a65c41c2..29405ccb4 100644 --- a/src/addon/mod/feedback/pages/form/form.html +++ b/src/addon/mod/feedback/pages/form/form.html @@ -13,7 +13,7 @@

{{ 'addon.mod_feedback.non_anonymous' | translate }}

- + {{item.itemnumber}}. diff --git a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html index 12a3189ac..f614ebf67 100644 --- a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html +++ b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html @@ -16,7 +16,7 @@ {{groupOpt.name}} - + {{ 'addon.mod_feedback.non_respondents_students' | translate : {$a: total } }} diff --git a/src/addon/mod/feedback/pages/respondents/respondents.html b/src/addon/mod/feedback/pages/respondents/respondents.html index ca7b4a7a7..21cf03aa0 100644 --- a/src/addon/mod/feedback/pages/respondents/respondents.html +++ b/src/addon/mod/feedback/pages/respondents/respondents.html @@ -18,7 +18,7 @@ - + {{ 'addon.mod_feedback.non_anonymous_entries' | translate : {$a: responses.total } }} @@ -33,7 +33,7 @@ - + {{ 'addon.mod_feedback.anonymous_entries' |translate : {$a: anonResponses.total } }} diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html index 3d0048019..65b449476 100644 --- a/src/addon/mod/forum/pages/discussion/discussion.html +++ b/src/addon/mod/forum/pages/discussion/discussion.html @@ -36,7 +36,7 @@ - + diff --git a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html index 5eb594112..d3fcd19f0 100644 --- a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html +++ b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html @@ -33,7 +33,7 @@ - + {{ 'addon.mod_glossary.entriestobesynced' | translate }} @@ -44,7 +44,7 @@ - + {{getDivider(entry)}} diff --git a/src/addon/mod/glossary/pages/edit/edit.html b/src/addon/mod/glossary/pages/edit/edit.html index d76e0793b..f5c2381a0 100644 --- a/src/addon/mod/glossary/pages/edit/edit.html +++ b/src/addon/mod/glossary/pages/edit/edit.html @@ -27,10 +27,10 @@ {{ 'addon.mod_glossary.aliases' | translate }} - {{ 'addon.mod_glossary.attachment' | translate }} + {{ 'addon.mod_glossary.attachment' | translate }} - {{ 'addon.mod_glossary.linking' | translate }} + {{ 'addon.mod_glossary.linking' | translate }} {{ 'addon.mod_glossary.entryusedynalink' | translate }} diff --git a/src/addon/mod/lesson/pages/menu-modal/menu-modal.html b/src/addon/mod/lesson/pages/menu-modal/menu-modal.html index 068490b8d..5744f07bd 100644 --- a/src/addon/mod/lesson/pages/menu-modal/menu-modal.html +++ b/src/addon/mod/lesson/pages/menu-modal/menu-modal.html @@ -13,13 +13,13 @@ -

{{ 'addon.mod_lesson.linkedmedia' | translate }}

+

{{ 'addon.mod_lesson.linkedmedia' | translate }}

-

{{ 'addon.mod_lesson.lessonmenu' | translate }}

+

{{ 'addon.mod_lesson.lessonmenu' | translate }}

diff --git a/src/addon/mod/lesson/pages/player/player.html b/src/addon/mod/lesson/pages/player/player.html index 86c088030..428adceef 100644 --- a/src/addon/mod/lesson/pages/player/player.html +++ b/src/addon/mod/lesson/pages/player/player.html @@ -39,7 +39,7 @@
- + diff --git a/src/addon/mod/quiz/pages/player/player.html b/src/addon/mod/quiz/pages/player/player.html index 430d23fd5..77795828b 100644 --- a/src/addon/mod/quiz/pages/player/player.html +++ b/src/addon/mod/quiz/pages/player/player.html @@ -49,7 +49,7 @@
- +

{{ 'core.question.questionno' | translate:{$a: question.number} }}

{{ 'core.question.information' | translate }}

diff --git a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.html b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.html index b925e9039..c00c08277 100644 --- a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.html +++ b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.html @@ -16,7 +16,7 @@

Couldn't find the directive to render this access rule.

- +
- +

{{ 'core.settings.total' | translate }}

{{ totalUsage | coreBytesToSize }}

diff --git a/src/core/settings/pages/synchronization/synchronization.html b/src/core/settings/pages/synchronization/synchronization.html index 12e7a753b..a81c59e13 100644 --- a/src/core/settings/pages/synchronization/synchronization.html +++ b/src/core/settings/pages/synchronization/synchronization.html @@ -5,7 +5,7 @@ - +

{{ 'core.settings.syncsettings' | translate }}

@@ -13,7 +13,7 @@ - +

{{ 'core.settings.sites' | translate }}

diff --git a/src/core/sitehome/components/index/core-sitehome-index.html b/src/core/sitehome/components/index/core-sitehome-index.html index 600834cd1..6472f3418 100644 --- a/src/core/sitehome/components/index/core-sitehome-index.html +++ b/src/core/sitehome/components/index/core-sitehome-index.html @@ -12,7 +12,7 @@ - + diff --git a/src/core/user/pages/about/about.html b/src/core/user/pages/about/about.html index 3e6932169..cfc7db797 100644 --- a/src/core/user/pages/about/about.html +++ b/src/core/user/pages/about/about.html @@ -10,7 +10,7 @@
- {{ 'core.user.contact' | translate}} + {{ 'core.user.contact' | translate}}

{{ 'core.user.email' | translate }}

@@ -46,7 +46,7 @@ - {{ 'core.userdetails' | translate}} + {{ 'core.userdetails' | translate}}

{{ 'core.user.webpage' | translate}}

@@ -60,7 +60,7 @@ - {{ 'core.user.description' | translate}} + {{ 'core.user.description' | translate}}

diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 29b5087ce..3e0d624a2 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -123,6 +123,8 @@ $item-avatar-size: 54px !default; $input-select-opacity: .5 !default; $note-color: $gray-dark !default; $popover-width: 280px !default; +$item-divider-background: $gray-lighter !default; +$item-divider-color: $black !default; // Moodle Mobile variables @@ -169,6 +171,8 @@ $checkbox-ios-disabled-opacity: $input-select-opacity !default; $toggle-ios-disabled-opacity: $input-select-opacity !default; $note-ios-color: $note-color; $popover-ios-width: $popover-width; +$item-ios-divider-background: $item-divider-background; +$item-ios-divider-color: $item-divider-color; // App Material Design Variables // -------------------------------------------------- @@ -190,6 +194,8 @@ $toggle-md-disabled-opacity: $input-select-opacity !default; $note-md-color: $note-color; $popover-md-width: $popover-width; $action-sheet-md-title-color: $core-color; +$item-md-divider-background: $item-divider-background; +$item-md-divider-color: $item-divider-color; // App Windows Variables // -------------------------------------------------- @@ -209,6 +215,8 @@ $checkbox-wp-disabled-opacity: $input-select-opacity !default; $toggle-wp-disabled-opacity: $input-select-opacity !default; $note-wp-color: $note-color; $popover-wp-width: $popover-width; +$item-wp-divider-background: $item-divider-background; +$item-wp-divider-color: $item-divider-color; // App Theme // --------------------------------------------------