diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html index b5c1a0b4a..02c90d858 100644 --- a/src/addon/messages/components/discussions/addon-messages-discussions.html +++ b/src/addon/messages/components/discussions/addon-messages-discussions.html @@ -12,7 +12,7 @@

{{ 'core.searchresults' | translate }}

{{ search.results.length }} - +

@@ -20,15 +20,15 @@ -
+

- - - {{discussion.message.timecreated / 1000 | coreDateDayOrTime}} -

+ + + {{discussion.message.timecreated / 1000 | coreDateDayOrTime}} +

diff --git a/src/addon/messages/components/discussions/discussions.scss b/src/addon/messages/components/discussions/discussions.scss index e6f7b9089..d7392e828 100644 --- a/src/addon/messages/components/discussions/discussions.scss +++ b/src/addon/messages/components/discussions/discussions.scss @@ -1,13 +1,15 @@ -ion-app.app-root addon-messages-discussions { +ion-app.app-root .addon-message-discussion { h2 { - display: flex; - justify-content: space-between; - - .note { - margin: 0; - align-self: flex-end; - display: inline-flex; - font-size: initial; + margin-top: 6px; + core-format-text { + font-weight: bold; } } + + .note { + position: absolute; + @include position(0, 0, null, null); + margin: 4px 8px; + font-size: 1.3rem; + } } \ No newline at end of file diff --git a/src/addon/messages/pages/discussion/discussion.scss b/src/addon/messages/pages/discussion/discussion.scss index 521b07bca..1622bb4f5 100644 --- a/src/addon/messages/pages/discussion/discussion.scss +++ b/src/addon/messages/pages/discussion/discussion.scss @@ -23,7 +23,7 @@ ion-app.app-root page-addon-messages-discussion { .addon-messages-unreadfrom { color: $core-color; background-color: transparent; - margin-top: 10px; + margin-top: 6px; ion-icon { color: $core-color; background-color: transparent; diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html index bbead5710..62ec6e659 100644 --- a/src/addon/messages/pages/group-conversations/group-conversations.html +++ b/src/addon/messages/pages/group-conversations/group-conversations.html @@ -20,7 +20,7 @@ - +

{{ 'addon.messages.contacts' | translate }}

{{contactRequestsCount}} @@ -79,7 +79,7 @@ -
+ @@ -89,18 +89,18 @@

-

- - -

- - {{ conversation.unreadcount }} - {{conversation.lastmessagedate | coreDateDayOrTime}} - + +

-

-

- {{ 'addon.messages.you' | translate }} + + {{ conversation.unreadcount }} + {{conversation.lastmessagedate | coreDateDayOrTime}} + +

+

+ {{ 'addon.messages.you' | translate }} + +

diff --git a/src/addon/messages/pages/group-conversations/group-conversations.scss b/src/addon/messages/pages/group-conversations/group-conversations.scss index 26a039907..4391d6f1d 100644 --- a/src/addon/messages/pages/group-conversations/group-conversations.scss +++ b/src/addon/messages/pages/group-conversations/group-conversations.scss @@ -1,17 +1,21 @@ ion-app.app-root page-addon-messages-group-conversations { - h2 { + .addon-message-last-message { display: flex; + flex-direction: row; justify-content: space-between; - - .note { - margin: 0; - align-self: flex-end; - display: inline-flex; - font-size: initial; - } + align-items: center; } - core-format-text.addon-message-last-message { - display: inline; + .addon-message-last-message-user { + white-space: nowrap; + color: $black; + @include margin(null, 2px, null, null) } -} + + .addon-message-last-message-text { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex-shrink: 1; + } +} \ No newline at end of file diff --git a/src/addon/messages/pages/search/search.html b/src/addon/messages/pages/search/search.html index 1acad9cb8..d96fef1f8 100644 --- a/src/addon/messages/pages/search/search.html +++ b/src/addon/messages/pages/search/search.html @@ -30,7 +30,7 @@ - +