From 7e73ae9087203b767666a6e076b4c856ba1855ac Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 7 May 2024 09:52:03 +0200 Subject: [PATCH 1/6] MOBILE-4470 policy: Fix scroll button displayed when it shouldn't --- src/core/features/policy/pages/site-policy/site-policy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/features/policy/pages/site-policy/site-policy.ts b/src/core/features/policy/pages/site-policy/site-policy.ts index afe259d68..fd5d18c04 100644 --- a/src/core/features/policy/pages/site-policy/site-policy.ts +++ b/src/core/features/policy/pages/site-policy/site-policy.ts @@ -342,7 +342,7 @@ export class CorePolicySitePolicyPage implements OnInit, OnDestroy { const scrollElement = await this.content?.getScrollElement(); - this.hasScroll = !!scrollElement && scrollElement.scrollHeight > scrollElement.clientHeight; + this.hasScroll = !!scrollElement && scrollElement.scrollHeight > scrollElement.clientHeight + 2; // Add 2px of error margin. } /** From abbcd66ecdc2a1e08bef2e3bc552b2e054625793 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 7 May 2024 15:39:43 +0200 Subject: [PATCH 2/6] MOBILE-4470 messages: Fix multilang not applied to conversation title --- .../components/conversation-info/conversation-info.html | 3 ++- src/addons/messages/pages/discussion/discussion.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html index 1e8b058d3..f18c17a89 100644 --- a/src/addons/messages/components/conversation-info/conversation-info.html +++ b/src/addons/messages/components/conversation-info/conversation-info.html @@ -23,7 +23,8 @@ onError="this.src='assets/img/group-avatar.svg'">

- + +

- + + Date: Wed, 8 May 2024 08:35:50 +0200 Subject: [PATCH 3/6] MOBILE-4470 messages: Fix delete button size --- src/core/components/message/message.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/components/message/message.scss b/src/core/components/message/message.scss index b5e1c10dc..f8395258c 100644 --- a/src/core/components/message/message.scss +++ b/src/core/components/message/message.scss @@ -96,7 +96,7 @@ } .delete-button { - min-height: initial; + min-height: 36px; line-height: initial; margin: 0px; align-self: flex-end; From 87dedc6fda1bdbc7e6e3e9ed13ed6bc33ed20675 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 8 May 2024 10:15:40 +0200 Subject: [PATCH 4/6] MOBILE-4470 notes: Fix empty select when adding note --- src/addons/notes/components/add/add-modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addons/notes/components/add/add-modal.html b/src/addons/notes/components/add/add-modal.html index 20012aac4..e7d957543 100644 --- a/src/addons/notes/components/add/add-modal.html +++ b/src/addons/notes/components/add/add-modal.html @@ -14,7 +14,7 @@

- {{ 'addon.notes.personalnotes' | translate }} + {{ 'addon.notes.personalnotes' | translate }} {{ 'addon.notes.coursenotes' | translate }} {{ 'addon.notes.sitenotes' | translate }} From 778dda1ccd27d266a0191d2e226c957054d0a85f Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 8 May 2024 11:18:43 +0200 Subject: [PATCH 5/6] MOBILE-4470 notes: Fix error message when synchronizing --- src/addons/notes/services/notes-sync.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/addons/notes/services/notes-sync.ts b/src/addons/notes/services/notes-sync.ts index 8d20bcb8d..bfe3aecd2 100644 --- a/src/addons/notes/services/notes-sync.ts +++ b/src/addons/notes/services/notes-sync.ts @@ -25,6 +25,8 @@ import { AddonNotesDBRecord, AddonNotesDeletedDBRecord } from './database/notes' import { AddonNotes, AddonNotesCreateNoteData } from './notes'; import { AddonNotesOffline } from './notes-offline'; import { CoreArray } from '@singletons/array'; +import { CoreAnyError } from '@classes/errors/error'; +import { CoreTextUtils } from '@services/utils/text'; /** * Service to sync notes. @@ -154,7 +156,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider[] = []; // Format the notes to be sent. @@ -233,7 +235,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider Translate.instant('addon.notes.warningnotenotsent', { course: 'fullname' in course ? course.fullname : courseId, // @deprecated since 4.3. - error: error, + error: CoreTextUtils.getErrorMessageFromError(error), })); } From ed22463b9cf37115ebbe58f0880684ba1d6d2f81 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 8 May 2024 11:39:49 +0200 Subject: [PATCH 6/6] MOBILE- 4470 alert: Remove vertical padding from buttons --- src/theme/components/ion-alert.scss | 7 +++++++ src/theme/theme.scss | 1 + 2 files changed, 8 insertions(+) create mode 100644 src/theme/components/ion-alert.scss diff --git a/src/theme/components/ion-alert.scss b/src/theme/components/ion-alert.scss new file mode 100644 index 000000000..1ceabab86 --- /dev/null +++ b/src/theme/components/ion-alert.scss @@ -0,0 +1,7 @@ +ion-alert { + &.md .alert-button { + // Remove padding from alert buttons, they already have min accessibility height. + padding-top: 0px; + padding-bottom: 0px; + } +} diff --git a/src/theme/theme.scss b/src/theme/theme.scss index 04e068e5c..77646e4ff 100644 --- a/src/theme/theme.scss +++ b/src/theme/theme.scss @@ -29,6 +29,7 @@ /* Ionic components overrides */ html { @import "components/ion-action-sheet.scss"; + @import "components/ion-alert.scss"; @import "components/ion-back-button.scss"; @import "components/ion-button.scss"; @import "components/ion-card.scss";