diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index c86f7b3a9..523be5f80 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -199,9 +199,11 @@ $session-conversation-header-height: 60px; * { user-select: none; - .text-selectable, input, textarea { + .text-selectable, + input, + textarea { user-select: text; - + &::selection { background: rgba($session-color-green, 0.6); } diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 89ae7f6cf..d9e93b67c 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -407,7 +407,6 @@ $session-compose-margin: 20px; position: absolute; bottom: 2px; width: 100%; - @at-root .light-theme #{&} { background-color: $session-color-white; @@ -540,7 +539,7 @@ $session-compose-margin: 20px; &-bottom-buttons { @include bottom-buttons(); - + .session-button { height: 57px; } diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index a25367cc5..d4c88e8fa 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -399,8 +399,14 @@ export class ConversationHeader extends React.Component { {this.renderExpirationLength()} - {this.renderSearch()} - {this.renderAvatar()} + + {!this.props.isRss && ( + <> + {this.renderSearch()} + {this.renderAvatar()} + + )} + {this.renderMenu(triggerId)}