Merge pull request #8213 from RocketChat/leave-and-hide

[FIX] Leave and hide buttons was removed
RocketChat · Sep 20, 2017 · c198b5f · c198b5f
2 parents 9ecbcf4 + 87db75b
commit c198b5f
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 93 deletions.
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -704,6 +704,7 @@
   "Hide_flextab": "Hide right side bar with click",
   "Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
   "Hide_Private_Warning": "Are you sure you want to hide the discussion with \"%s\"?",
+  "Hide_Livechat_Warning": "Are you sure you want to hide the livechat with \"%s\"?",
   "Hide_room": "Hide room",
   "Hide_Room_Warning": "Are you sure you want to hide the room \"%s\"?",
   "Hide_roles": "Hide roles",
@@ -981,6 +982,7 @@
   "Least_Amount": "Least Amount",
   "Leave_Group_Warning": "Are you sure you want to leave the group \"%s\"?",
   "Leave_Private_Warning": "Are you sure you want to leave the discussion with \"%s\"?",
+  "Leave_Livechat_Warning": "Are you sure you want to leave the livechat with \"%s\"?",
   "Leave_room": "Leave room",
   "Leave_Room_Warning": "Are you sure you want to leave the room \"%s\"?",
   "Leave_the_current_channel": "Leave the current channel",

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -18,6 +18,16 @@
 	border-radius: var(--sidebar-item-radius);
 	align-items: center;
 
+	&:hover {
+		& .sidebar-item__menu {
+			display: block;
+		}
+
+		& .badge {
+			display: none;
+		}
+	}
+
 	&--active {
 		background-color: var(--color-dark-light);
 	}
@@ -122,6 +132,14 @@
 		font-size: var(--sidebar-item-text-size);
 		line-height: var(--sidebar-item-height);
 	}
+
+	&__menu {
+		display: none;
+
+		&-icon {
+			fill: var(--color-white);
+		}
+	}
 }
 
 .rtl .sidebar-item__user-status {

diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -17,8 +17,11 @@
 			</div>
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
 			{{#if unread}}
-			<span class="badge badge--unread">{{unread}}</span>
+				<span class="badge badge--unread">{{unread}}</span>
 			{{/if}}
+			<div class="sidebar-item__menu">
+				{{> icon block="sidebar-item__menu-icon" icon="menu"}}
+			</div>
 		</a>
 	</li>
 </template>