Commit c91bc9d5 authored by Asaad Mahmood's avatar Asaad Mahmood Committed by Carlos Tadeu Panato Junior

Minor 5.0 bugs (#1296)

* MM-10795 - Fixing post control menu overlap

* Updaing post control hover

* MM-10798 - Fixing notification badge on t-sidebar
parent 77035314
......@@ -96,7 +96,9 @@ export default class TeamButton extends React.Component {
>
<div className={'team-btn ' + btnClass}>
{badge}
{content}
<div className='team-btn__content'>
{content}
</div>
</div>
</OverlayTrigger>
);
......
......@@ -1213,7 +1213,7 @@
padding: 4px;
position: absolute;
right: 0;
top: -4px;
top: -8px;
white-space: normal;
z-index: 6;
......
......@@ -24,18 +24,27 @@
width: 100%;
a {
@include opacity(.7);
display: block;
height: 100%;
text-decoration: none;
}
&.active {
a {
.team-btn__content {
@include opacity(1);
background: transparent;
}
}
.team-btn__content {
@include clearfix;
@include border-radius(4px);
@include opacity(.7);
background-color: alpha-color($black, .3);
border: 1px solid alpha-color($white, .2);
height: 100%;
}
button {
border: none;
padding: 0;
......@@ -44,8 +53,6 @@
.team-btn {
@include border-radius(4px);
background-color: alpha-color($black, .3);
border: 1px solid alpha-color($white, .2);
font-weight: bold;
height: 44px;
letter-spacing: -.5px;
......@@ -57,7 +64,6 @@
width: 44px;
.team-btn__image {
@include border-radius(4px);
@include clearfix;
background-color: $white;
background-repeat: round;
......@@ -70,6 +76,7 @@
position: absolute;
right: -8px;
top: -6px;
z-index: 5;
&.stroked {
border: 1px solid;
......@@ -91,6 +98,7 @@
}
&.active:before {
@include border-radius(4px);
background: $black;
content: '';
height: 100%;
......
......@@ -573,7 +573,7 @@ export function applyTheme(theme) {
changeCss('.app__body .modal .modal-header .modal-title, .app__body .modal .modal-header .modal-title .name, .app__body .modal .modal-header button.close', 'color:' + theme.sidebarHeaderTextColor);
changeCss('.app__body #navbar .navbar-default .navbar-brand .dropdown-toggle', 'color:' + theme.sidebarHeaderTextColor);
changeCss('.app__body #navbar .navbar-default .navbar-toggle .icon-bar', 'background:' + theme.sidebarHeaderTextColor);
changeCss('.app__body .post-list__timestamp > div, .app__body .multi-teams .team-sidebar .team-wrapper .team-container a:hover .team-btn, .app__body .multi-teams .team-sidebar .team-wrapper .team-container.active .team-btn', 'border-color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.5));
changeCss('.app__body .post-list__timestamp > div, .app__body .multi-teams .team-sidebar .team-wrapper .team-container a:hover .team-btn__content, .app__body .multi-teams .team-sidebar .team-wrapper .team-container.active .team-btn__content', 'border-color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.5));
changeCss('@media(max-width: 768px){.app__body .search-bar__container', 'color:' + theme.sidebarHeaderTextColor);
changeCss('.app__body .navbar-right__icon', 'background:' + changeOpacity(theme.sidebarHeaderTextColor, 0.2));
changeCss('.app__body .navbar-right__icon:hover, .app__body .navbar-right__icon:focus', 'background:' + changeOpacity(theme.sidebarHeaderTextColor, 0.3));
......
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