Commit ca43a96a authored by Caleb Roseland's avatar Caleb Roseland
Browse files

MM-26598: channel name truncated too early on hover (#5996)

* reorg button margin/padding; simplify selector

* re-align mentions badge

* re-re-align mentions badge

* merge master; resolve conflicts
parent 09550d6c
......@@ -63,7 +63,7 @@
.badge {
display: inline-block;
flex-shrink: 0;
margin-right: 14px;
margin-right: 3px;
padding: 0 6px;
min-width: 22px;
height: auto;
......@@ -369,9 +369,13 @@
border-radius: 4px;
}
.SidebarMenu_menuButton:hover, .SidebarMenu_menuButton:active, .SidebarMenu_menuButton:focus {
cursor: pointer;
color: var(--sidebar-text);
.SidebarMenu_menuButton {
&:hover,
&:active,
&:focus {
cursor: pointer;
color: var(--sidebar-text);
}
}
.SidebarMenu_menuButton:focus {
......@@ -852,8 +856,6 @@
.SidebarMenu_menuButton {
height: 28px;
width: 28px;
margin-top: -7px;
margin-right: 11px;
}
}
......@@ -892,7 +894,7 @@
position: relative;
font-size: 14px;
text-decoration: none;
padding: 7px 5px 7px 14px;
padding: 7px 16px 7px 14px;
display: flex;
color: var(--sidebar-text-60);
align-items: flex-start;
......@@ -921,6 +923,12 @@
.SidebarChannel .SidebarLink:hover {
background: rgba(255, 255, 255, 0.08);
padding-right: 5px;
.SidebarMenu_menuButton {
margin-right: 11px;
}
.SidebarMenu {
display: block;
}
......@@ -962,7 +970,6 @@
.SidebarChannel span.SidebarChannelLinkLabel {
width: 100%;
white-space: nowrap;
padding-right: 10px;
line-height: 18px;
text-align: justify;
height: 18px;
......@@ -971,7 +978,6 @@
.SidebarChannelLinkLabel_wrapper {
overflow: hidden;
display: flex;
margin-right: 16px;
> span {
text-overflow: ellipsis;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment