From 35d59119610f1a5649e84a70cee1f9caa26b761b Mon Sep 17 00:00:00 2001 From: badaev Date: Tue, 3 Nov 2020 17:21:57 +0800 Subject: [PATCH] =?UTF-8?q?RocketChat#755=20[EDIT]=20=D0=9E=D1=82=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D1=8D?= =?UTF-8?q?=D0=B3=D0=BE=D0=B2=20=D0=B8=20=D1=80=D0=B5=D0=B0=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B2=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=D1=85=20|=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/reactions/client/stylesheets/reaction.css | 4 +-- app/tags/client/stylesheets/tags.css | 4 +-- .../imports/components/goBackButton.css | 4 ++- .../client/imports/components/messages.css | 3 +- app/theme/client/imports/general/base_old.css | 1 + app/ui-message/client/message.js | 4 +-- app/ui-sidenav/client/sidebarHeader.html | 2 +- app/ui-sidenav/client/sidebarHeader.js | 9 +++++ private/public/icons.svg | 36 +++++++++++++++++++ 9 files changed, 57 insertions(+), 10 deletions(-) diff --git a/app/reactions/client/stylesheets/reaction.css b/app/reactions/client/stylesheets/reaction.css index a3fb880223a8..16c281e77c62 100644 --- a/app/reactions/client/stylesheets/reaction.css +++ b/app/reactions/client/stylesheets/reaction.css @@ -49,13 +49,13 @@ } &.add-reaction { - visibility: hidden; + visibility: visible; padding: 0 2px; transition: opacity 0.2s ease; - opacity: 0; + opacity: 0.5; color: #888888; } diff --git a/app/tags/client/stylesheets/tags.css b/app/tags/client/stylesheets/tags.css index fe4336864cdd..9053af27e22f 100644 --- a/app/tags/client/stylesheets/tags.css +++ b/app/tags/client/stylesheets/tags.css @@ -26,13 +26,13 @@ } &.add-tag { - visibility: hidden; + visibility: visible; padding: 0 2px; transition: opacity 0.2s ease; - opacity: 0; + opacity: 0.5; color: #888888; } diff --git a/app/theme/client/imports/components/goBackButton.css b/app/theme/client/imports/components/goBackButton.css index faa149e885b4..39936c13804d 100644 --- a/app/theme/client/imports/components/goBackButton.css +++ b/app/theme/client/imports/components/goBackButton.css @@ -1,5 +1,7 @@ .go-back-button { - border-color: transparent !important; + border-width: 0.12rem !important; + border-color: var(--rc-color-button-primary) !important; + border-radius: 10rem !important; background-color: transparent !important; font-size: 24px !important; diff --git a/app/theme/client/imports/components/messages.css b/app/theme/client/imports/components/messages.css index 78d8c6af9d64..67e515b97a60 100644 --- a/app/theme/client/imports/components/messages.css +++ b/app/theme/client/imports/components/messages.css @@ -215,14 +215,13 @@ text-align: center; text-decoration: none; color: var(--color-black) !important; - border: 1px solid var(--button-reply-primary-background); display: inline-block; border-radius: 0.6em; transition: all 0.5s ease-in-out; position: relative; overflow: hidden; &:hover { - border-color: #4fb0fc; + border: 1px solid #4fb0fc; color: var(--color-black) !important; opacity: 1 !important; } diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css index f7c1911ead14..1988de3d7c03 100755 --- a/app/theme/client/imports/general/base_old.css +++ b/app/theme/client/imports/general/base_old.css @@ -2130,6 +2130,7 @@ padding: 8px 50px 4px 70px; line-height: 20px; + margin-block-end: 15px; &-unread { display: inline-block; diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js index c579c0a8027e..005eed124f61 100755 --- a/app/ui-message/client/message.js +++ b/app/ui-message/client/message.js @@ -334,7 +334,7 @@ Template.message.helpers({ hideReactions() { const { msg } = this; if (_.isEmpty(msg.reactions)) { - return 'hidden'; + //return 'hidden'; } }, tags() { @@ -370,7 +370,7 @@ Template.message.helpers({ hideTags() { const { msg } = this; if (_.isEmpty(msg.tags)) { - return 'hidden'; + //return 'hidden'; } }, hideAddReaction() { diff --git a/app/ui-sidenav/client/sidebarHeader.html b/app/ui-sidenav/client/sidebarHeader.html index b634c16fc31f..c1d244cf70b7 100644 --- a/app/ui-sidenav/client/sidebarHeader.html +++ b/app/ui-sidenav/client/sidebarHeader.html @@ -7,7 +7,7 @@
{{#each toolbarButtons}} - {{/each}} diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js index bdb8e6bcbd2b..b39da68fad21 100644 --- a/app/ui-sidenav/client/sidebarHeader.js +++ b/app/ui-sidenav/client/sidebarHeader.js @@ -87,6 +87,15 @@ Template.sidebarHeader.helpers({ toolbarButtons() { return toolbarButtons(/* Meteor.userId() */).filter((button) => !button.condition || button.condition()); }, + homeButton(titleButton) { + return titleButton === 'Home'; + }, + getButtonStyle(titleButton) { + if (titleButton === 'Home') { + return 'margin-left: auto;'; + } + return ''; + }, showToolbar() { return showToolbar.get(); }, diff --git a/private/public/icons.svg b/private/public/icons.svg index bfd043b673e6..77c4309e8e97 100644 --- a/private/public/icons.svg +++ b/private/public/icons.svg @@ -366,6 +366,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +