diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss index 1575f794f..6a8f387cc 100644 --- a/src/addons/calendar/components/calendar/calendar.scss +++ b/src/addons/calendar/components/calendar/calendar.scss @@ -10,6 +10,7 @@ .addon-calendar-months { background-color: var(--contrast-background); padding: 0; + font-size: 14px; } .addon-calendar-day { diff --git a/src/addons/messages/messages-common.scss b/src/addons/messages/messages-common.scss index 42917afcf..3bcd416a8 100644 --- a/src/addons/messages/messages-common.scss +++ b/src/addons/messages/messages-common.scss @@ -11,12 +11,12 @@ } } - .note { - position: absolute; - top: 0; - right: 0; - margin: 4px 8px; - font-size: 1.3rem; + ion-note { + ion-badge { + margin-left: 6px; + margin-right: 6px; + vertical-align: middle; + } } .addon-message-last-message { @@ -43,6 +43,11 @@ margin-top: 10px; } } + + ion-item-divider ion-badge { + margin-left: 16px; + margin-right: 16px; + } } :host-context([dir=rtl]) { @@ -53,11 +58,6 @@ margin-left: 0; } - .note { - left: 0; - right: unset; - } - .addon-message-last-message-user { margin-left: 2px; margin-right: 0; diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html index 15454d75a..4bd68d1bd 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.html +++ b/src/addons/messages/pages/group-conversations/group-conversations.html @@ -123,10 +123,6 @@ - - {{ conversation.unreadcount }} - {{conversation.lastmessagedate | coreDateDayOrTime}} -

@@ -139,5 +135,9 @@ class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="0">

+ + {{ conversation.unreadcount }} + {{conversation.lastmessagedate | coreDateDayOrTime}} + diff --git a/src/addons/mod/forum/components/index/index.scss b/src/addons/mod/forum/components/index/index.scss index 51951a796..d1ce26508 100644 --- a/src/addons/mod/forum/components/index/index.scss +++ b/src/addons/mod/forum/components/index/index.scss @@ -55,9 +55,8 @@ flex-grow: 1; } - .addon-mod-forum-discussion-more-info { - font-size: 1.4rem; - clear: both; + .addon-mod-forum-discussion-more-info.ios { + font-size: 0.9rem; } } diff --git a/src/addons/notifications/components/components.module.ts b/src/addons/notifications/components/components.module.ts index 4d873ecd1..06e36bdcd 100644 --- a/src/addons/notifications/components/components.module.ts +++ b/src/addons/notifications/components/components.module.ts @@ -13,9 +13,7 @@ // limitations under the License. import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { IonicModule } from '@ionic/angular'; -import { TranslateModule } from '@ngx-translate/core'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonNotificationsActionsComponent } from './actions/actions'; @@ -24,9 +22,7 @@ import { AddonNotificationsActionsComponent } from './actions/actions'; AddonNotificationsActionsComponent, ], imports: [ - CommonModule, - IonicModule, - TranslateModule.forChild(), + CoreSharedModule, ], exports: [ AddonNotificationsActionsComponent, diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss index 13f0c2db4..aa2d3ba72 100644 --- a/src/core/components/split-view/split-view.scss +++ b/src/core/components/split-view/split-view.scss @@ -70,7 +70,7 @@ --menu-border-width: 0; --menu-box-shadow: none; --menu-z: 0; - --selected-item-border-width: 0; + --selected-item-color: transparent; } :host(.content-only) { diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss index 151bea4ec..adeec2ef0 100644 --- a/src/core/features/mainmenu/pages/menu/menu.scss +++ b/src/core/features/mainmenu/pages/menu/menu.scss @@ -29,6 +29,7 @@ height: 100%; flex-direction: column; ion-tab-button { + display: contents; width: 100%; ion-badge { top: calc(50% - 20px); diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 6f1020d4d..26a0cb984 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -136,6 +136,11 @@ ion-item-divider { opacity: 0.25; padding-inline-end: 16px; } + + &.ios { + padding-top: 10px; + padding-bottom: 10px; + } } // Ionic list. @@ -371,8 +376,13 @@ ion-select.core-button-select, margin-inline-end: auto; } + &.ion-activated { + --color: var(--ion-color-primary-contrast); + } + } ion-button.core-button-select { + --border-radius: 0; &::part(native) { text-transform: none; font-weight: 400;