diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss index 6748041b1..6f3b22d48 100644 --- a/stylesheets/_session_group_panel.scss +++ b/stylesheets/_session_group_panel.scss @@ -70,6 +70,7 @@ height: 3.5rem; background-color: black; flex-shrink: 0; + align-items: center; } .module-empty-state { diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index c56eb3ce5..04b2030b7 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -14,6 +14,31 @@ $session-compose-margin: 20px; @include session-dark-background-hover; } } + + &--is-selected { + @at-root .light-theme #{&} { + @include session-dark-background-hover; + &:hover { + @include session-dark-background-hover; + } + } + @at-root .dark-theme #{&} { + @include session-dark-background-hover; + &:hover { + @include session-dark-background-hover; + } + } + .module-conversation__user__profile-number, + .module-conversation__user__profile-name, + .module-conversation-list-item__message__text { + @at-root .light-theme #{&} { + color: $session-color-black; + } + @at-root .dark-theme #{&} { + color: $session-color-white; + } + } + } } .gutter { width: 380px !important; @@ -99,20 +124,6 @@ $session-compose-margin: 20px; } } -.module-conversation-list-item--is-selected { - background-color: $color-dark-70; - .module-conversation__user__profile-number, - .module-conversation__user__profile-name, - .module-conversation-list-item__message__text { - @at-root .light-theme #{&} { - color: $session-color-black; - } - @at-root .dark-theme #{&} { - color: $session-color-white; - } - } -} - .inbox { @at-root .light-theme #{&} { color: $session-color-black; diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index c4d73235d..7b2590a58 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -13,13 +13,13 @@ background: none !important; } .module-conversation-header { - border-bottom: none; - @at-root .light-theme #{&} { background-color: $session-color-white; + border-bottom: none; } @at-root .dark-theme #{&} { background-color: $session-shade-4; + border-bottom: none; } } diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx index 05d76478f..ee0a3b73f 100644 --- a/ts/components/session/LeftPaneContactSection.tsx +++ b/ts/components/session/LeftPaneContactSection.tsx @@ -137,7 +137,6 @@ export class LeftPaneContactSection extends React.Component { const friends = this.getCurrentFriends(); const combined = [...sentFriendsRequest, ...friends]; const item = combined[index]; - const onClick = this.props.openConversationInternal; return ( { style={style} {...item} i18n={window.i18n} - onClick={onClick} + onClick={this.props.openConversationInternal} /> ); };