From 9f1812e5da7ad41f0a9992f63bcfbd3193c68be5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 31 Jan 2020 13:18:16 +1100 Subject: [PATCH 01/13] leftpane sections titles are Wasa bold --- stylesheets/_session.scss | 2 +- stylesheets/_session_left_pane.scss | 1 + stylesheets/_session_theme.scss | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 957e416cb..6fe603f05 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -171,7 +171,7 @@ $session-modal-size-lg: 650px; $session-conversation-header-height: 60px; @mixin fontWasaBold { - font-weight: 700; + font-weight: bold; font-family: $session-font-family; } diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 8379fa2d7..2b8169977 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -189,6 +189,7 @@ $session-compose-margin: 20px; .session-button { margin-left: auto; + @include fontWasaBold(); } &-buttons { diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index adcdbedc5..1dffb5817 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -103,7 +103,7 @@ } @mixin session-h-title { - font-weight: bold; + @include fontWasaBold(); } h1 { From d8f83a1124d1b85cf4feaa172288be3960bce9f9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 31 Jan 2020 13:47:29 +1100 Subject: [PATCH 02/13] fix padding buttons overlay --- stylesheets/_session_left_pane.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 2b8169977..a6d83cc8e 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -308,8 +308,8 @@ $session-compose-margin: 20px; .session-button { width: fit-content; - margin-top: auto; - margin-bottom: 16px; + margin-top: 1rem; + margin-bottom: 1rem; flex-shrink: 0; } } From 04db814d7641cdb33038b8076e004d2b4a1714ec Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 31 Jan 2020 14:03:04 +1100 Subject: [PATCH 03/13] do not render session-id-editable border when textarea disabled --- stylesheets/_session.scss | 1 + stylesheets/_session_left_pane.scss | 17 ++++++++++------- ts/components/session/SessionIdEditable.tsx | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 6fe603f05..94109dd2e 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -1344,6 +1344,7 @@ label { .session-id-editable textarea { resize: none; overflow: hidden; + user-select: all; } input { diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index a6d83cc8e..ba412ecfe 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -297,13 +297,16 @@ $session-compose-margin: 20px; margin: 0px 20px; } - .session-id-editable textarea::-webkit-inner-spin-button { - margin: 0px 20px; - width: -webkit-fill-available; - flex-shrink: 0; - user-select: all; - overflow: hidden; - resize: none; + .session-id-editable { + textarea::-webkit-inner-spin-button { + margin: 0px 20px; + width: -webkit-fill-available; + flex-shrink: 0; + } + } + + .session-id-editable-disabled { + border: none; } .session-button { diff --git a/ts/components/session/SessionIdEditable.tsx b/ts/components/session/SessionIdEditable.tsx index a7fd4aa09..c031cb4da 100644 --- a/ts/components/session/SessionIdEditable.tsx +++ b/ts/components/session/SessionIdEditable.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import classNames from 'classnames'; interface Props { placeholder?: string; @@ -28,7 +29,7 @@ export class SessionIdEditable extends React.PureComponent { const { placeholder, editable, text } = this.props; return ( -
+