RocketChat#755 [EDIT] Отображение тэгов и реакций в сообщениях | иконка

sibdigital · Nov 3, 2020 · 35d5911 · 35d5911
1 parent 1fee261
commit 35d5911
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
 			</div>
 			<div class="sidebar__toolbar">
 				{{#each toolbarButtons}}
-					<button class="sidebar__toolbar-button js-button" title="{{name}}" aria-haspopup="{{hasPopup}}">
+					<button class="sidebar__toolbar-button js-button" style={{getButtonStyle name}} title="{{name}}" aria-haspopup="{{hasPopup}}">
 						{{> icon block="sidebar__toolbar-button-icon" icon=icon }}
 					</button>
 				{{/each}}

diff --git 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