Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Leave and hide buttons was removed #8213

Merged
merged 3 commits into from
Sep 20, 2017
Merged

[FIX] Leave and hide buttons was removed #8213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c63681
Add leave and hide buttons again
karlprieb Sep 19, 2017
fbda3ce
fix lint
karlprieb Sep 20, 2017
87db75b
add livechat hide and leave messages
karlprieb Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 71 additions & 89 deletions packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
18 changes: 18 additions & 0 deletions packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui-master/public/icons.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion packages/rocketchat-ui-sidenav/client/sidebarItem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading