From 9f31d026dac6d07253796ad4c2b1ebaa13f829cd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 8 Jan 2020 10:40:45 +1100 Subject: [PATCH] fix ui for list on leftpane and conversationheader --- stylesheets/_session.scss | 12 +++++++++++- stylesheets/_session_theme_dark_left_pane.scss | 14 ++++++++++++-- ts/components/session/LeftPaneContactSection.tsx | 2 +- ts/components/session/LeftPaneMessageSection.tsx | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 38916fba1..5efe0dcd8 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -444,7 +444,6 @@ $session_message-container-border-radius: 5px; .module-conversation-header__title { width: 100%; display: flex; - flex-direction: column; .module-contact-name { width: 100%; @@ -454,6 +453,13 @@ $session_message-container-border-radius: 5px; text-align: center; } } + +.module-conversation-header__title { + flex-direction: column; +} +.module-conversation-header__title-flex { + flex-direction: row; +} .module-conversation__user__profile-name, .module-message__author__profile-name { font-style: normal; @@ -1072,3 +1078,7 @@ label { user-select: all; } } + +input { + user-select: text; +} diff --git a/stylesheets/_session_theme_dark_left_pane.scss b/stylesheets/_session_theme_dark_left_pane.scss index 263fb55b1..623c3b248 100644 --- a/stylesheets/_session_theme_dark_left_pane.scss +++ b/stylesheets/_session_theme_dark_left_pane.scss @@ -121,10 +121,9 @@ $session-compose-margin: 20px; } &__list { - height: -webkit-fill-available; - &-popup { width: -webkit-fill-available; + height: -webkit-fill-available; position: absolute; } } @@ -214,9 +213,18 @@ $session-compose-margin: 20px; } } +.module-conversations-list-content { + overflow-x: hidden; + display: flex; + flex-direction: column; + flex-grow: 1; + +} + .session-left-pane-section-content { display: flex; flex-direction: column; + flex-grow: 1; } .user-search-dropdown { @@ -233,6 +241,7 @@ $session-compose-margin: 20px; background: $session-shade-4; color: $session-color-white; display: inline-flex; + flex-shrink: 0; .session-icon-button { margin: auto 10px; @@ -321,6 +330,7 @@ $session-compose-margin: 20px; &-content { display: flex; flex-direction: column; + flex-grow: 1; .module-conversation-list-item { &--has-friend-request { diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx index 7799b2b58..61830000b 100644 --- a/ts/components/session/LeftPaneContactSection.tsx +++ b/ts/components/session/LeftPaneContactSection.tsx @@ -301,7 +301,7 @@ export class LeftPaneContactSection extends React.Component { return (
{frTitle}
-
+
{({ height, width }) => ( { public renderConversations() { return ( -
+