From ed284ddae62af707b5502a3a3cd676e5eac6c127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 3 Oct 2023 15:46:22 +0200 Subject: [PATCH 1/7] MOBILE-4362 settings: Fix text-wrapping on color scheme setting --- src/core/features/settings/pages/general/general.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html index 1c4ad5f7a..5644228d4 100644 --- a/src/core/features/settings/pages/general/general.html +++ b/src/core/features/settings/pages/general/general.html @@ -47,8 +47,8 @@ {{ 'core.settings.colorscheme-' + scheme | translate }} - - + +

{{ 'core.settings.colorscheme-system-notice' | translate }}

 From 0660fb56c06c034f79184f386de02ca48be30bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 5 Oct 2023 12:16:06 +0200 Subject: [PATCH 2/7] MOBILE-4362 styles: Do not round borders on fullscreen modals --- src/theme/theme.base.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 3f9e59ec3..00b59da8f 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1869,13 +1869,15 @@ video::-webkit-media-text-track-display { } ion-modal { - .modal-wrapper { - --border-radius: var(--modal-radius); + &.show-modal { + @media only screen and (min-width: 768px) and (min-height: 600px) { + --border-radius: var(--modal-radius); + } } &.core-modal-lateral, &.core-modal-fullscreen { - --modal-radius: 0px; + --border-radius: 0px; } &.core-modal-no-background { From ebd4eec500bad5f3c1ad938213f025f3cc8e24ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 5 Oct 2023 12:46:54 +0200 Subject: [PATCH 3/7] MOBILE-4362 styles: Transparent backdrop on popovers --- src/addons/mod/data/components/action/action.ts | 1 - src/core/components/combobox/combobox.scss | 1 + src/core/components/context-menu/context-menu.ts | 1 - .../course/components/module-completion/module-completion.ts | 1 - src/core/services/utils/dom.ts | 2 +- src/theme/theme.base.scss | 4 ++++ 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/addons/mod/data/components/action/action.ts b/src/addons/mod/data/components/action/action.ts index e7881a3b5..3d631249e 100644 --- a/src/addons/mod/data/components/action/action.ts +++ b/src/addons/mod/data/components/action/action.ts @@ -203,7 +203,6 @@ export class AddonModDataActionComponent implements OnInit { await CoreDomUtils.openPopover({ component: AddonModDataActionsMenuComponent, componentProps: { items }, - showBackdrop: true, id: 'actionsmenu-popover', event, }); diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss index bb19aa559..3afd8c316 100644 --- a/src/core/components/combobox/combobox.scss +++ b/src/core/components/combobox/combobox.scss @@ -22,6 +22,7 @@ --border-color: var(--core-combobox-border-color); --border-style: solid; --border-width: var(--core-combobox-border-width); + --border-radius: var(--radius-xs); --box-shadow: var(--core-combobox-box-shadow); diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts index 33710b712..6102bc4b6 100644 --- a/src/core/components/context-menu/context-menu.ts +++ b/src/core/components/context-menu/context-menu.ts @@ -185,7 +185,6 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy { title: this.title, items: this.items, }, - showBackdrop: true, id: this.uniqueId, }); diff --git a/src/core/features/course/components/module-completion/module-completion.ts b/src/core/features/course/components/module-completion/module-completion.ts index c0c3d3dcb..8f3b2eb29 100644 --- a/src/core/features/course/components/module-completion/module-completion.ts +++ b/src/core/features/course/components/module-completion/module-completion.ts @@ -139,7 +139,6 @@ export class CoreCourseModuleCompletionComponent componentProps: { completion: this.completion, }, - showBackdrop: true, event: { target } as Event, }); } else { diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index 7eb2a73f8..9bde8deb5 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -2191,7 +2191,7 @@ export const CoreDomUtils = makeSingleton(CoreDomUtilsProvider); /** * Options for the openPopover function. */ -export type OpenPopoverOptions = PopoverOptions & { +export type OpenPopoverOptions = Omit & { waitForDismissCompleted?: boolean; }; diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 00b59da8f..346655474 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1899,6 +1899,10 @@ ion-popover { margin-top: 2px; margin-bottom: 2px; } + // Never show backdrop on popovers + ion-backdrop { + background: transparent; + } } /* From a12d5ef66f4b87834dc8eabd988182874f0c4723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 5 Oct 2023 12:47:18 +0200 Subject: [PATCH 4/7] MOBILE-4362 completion: Improve button sizes --- .../core-course-module-completion.html | 10 +++++----- src/core/features/course/components/module/module.scss | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html index e6487d401..363b382bb 100644 --- a/src/core/features/course/components/module-completion/core-course-module-completion.html +++ b/src/core/features/course/components/module-completion/core-course-module-completion.html @@ -1,7 +1,7 @@ - {{ 'core.course.todo' | translate }} - {{'core.course.done' | translate }} @@ -21,14 +21,14 @@ + class="completioninfo completion_complete chip"> {{ 'core.course.completion_manual:done' | translate }} + class="completioninfo completion_incomplete chip"> {{ 'core.course.completion_manual:markdone' | translate }} @@ -36,7 +36,7 @@ - + {{ 'core.course.completionmenuitem' | translate }}