diff --git a/scripts/langindex.json b/scripts/langindex.json index 2ad44374bec..ed3b5aa1636 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1631,7 +1631,6 @@ "core.course.warningmanualcompletionmodified": "local_moodlemobileapp", "core.course.warningofflinemanualcompletiondeleted": "local_moodlemobileapp", "core.course.youmust": "completion", - "core.coursedetails": "moodle", "core.coursenogroups": "local_moodlemobileapp", "core.courses.addtofavourites": "block_myoverview", "core.courses.aria:coursecategory": "course", diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss index cf9c7a7dfd3..d94845afb36 100644 --- a/src/core/components/user-avatar/user-avatar.scss +++ b/src/core/components/user-avatar/user-avatar.scss @@ -4,6 +4,9 @@ position: relative; width: var(--core-avatar-size); height: var(--core-avatar-size); + --contact-status-size: 14px; + --margin-end-on-item: 8px; + --margin-vertical-on-item: 8px; img { border-radius: var(--core-avatar-radius); @@ -53,8 +56,8 @@ position: absolute; right: 0; bottom: 0; - width: 14px; - height: 14px; + width: var(--contact-status-size); + height: var(--contact-status-size); border-radius: 50%; &.online { border: 1px solid white; @@ -92,7 +95,7 @@ } :host-context(ion-item) { - @include margin(6px, 8px, 6px, 0px); + @include margin(var(--margin-vertical-on-item), var(--margin-end-on-item), var(--margin-vertical-on-item), 0px); img { min-width: var(--core-avatar-size); min-height: var(--core-avatar-size); diff --git a/src/core/features/login/tests/behat/signup.feature b/src/core/features/login/tests/behat/signup.feature index 6518f37702d..26288011628 100755 --- a/src/core/features/login/tests/behat/signup.feature +++ b/src/core/features/login/tests/behat/signup.feature @@ -75,7 +75,8 @@ Feature: Test signup in app When I press the user menu button in the app And I press "User Test" in the app - Then I should find "Barcelona, Spain" in the app + Then I should find "Barcelona" in the app + Then I should find "Spain" in the app And I should find "u1@u1.com" in the app @lms_from3.10 diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html index 38fd5d14a30..128d010ad8c 100644 --- a/src/core/features/user/pages/about/about.html +++ b/src/core/features/user/pages/about/about.html @@ -14,7 +14,7 @@

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

- + @@ -14,11 +14,11 @@

{{ user?.fullname }}

-