From de3069d79942b100eedb7749875b9dace35bb50a Mon Sep 17 00:00:00 2001 From: Viven Date: Fri, 6 Apr 2018 11:20:12 +0800 Subject: [PATCH 1/2] Revert contextual bar style --- .../client/imports/components/contextual-bar.css | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/rocketchat-theme/client/imports/components/contextual-bar.css b/packages/rocketchat-theme/client/imports/components/contextual-bar.css index e9e59007df5d..d8dbeb033879 100644 --- a/packages/rocketchat-theme/client/imports/components/contextual-bar.css +++ b/packages/rocketchat-theme/client/imports/components/contextual-bar.css @@ -29,13 +29,15 @@ &__content { overflow: auto; - padding: var(--default-padding); - & .js-back { - width: 100%; - margin-top: 2rem; - } + flex: 1 1 auto; + justify-content: space-between; + + display: flex; + + flex-direction: column; + & .section:not(:last-child) { margin-bottom: 2rem; From fbfcf6e3a1ff68aceb711c576fcb18c99e4a4d24 Mon Sep 17 00:00:00 2001 From: Viven Date: Fri, 6 Apr 2018 11:20:57 +0800 Subject: [PATCH 2/2] Fix user info with a wrapper --- .../client/tabs/userInfo.html | 148 +++++++++--------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.html b/packages/rocketchat-ui-flextab/client/tabs/userInfo.html index e3e28c636a19..e5a8d827b723 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userInfo.html +++ b/packages/rocketchat-ui-flextab/client/tabs/userInfo.html @@ -18,95 +18,97 @@

{{_ "User_Info"}}

{{> userEdit (userToEdit)}} {{else}} {{#with user}} -
-