Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-23517] - Fix channel header popover #5159

Merged
merged 5 commits into from
Mar 26, 2020
Merged

[MM-23517] - Fix channel header popover #5159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42fef41
[MM-23517] - Fix channel header popover
Mar 25, 2020
7a6140a
Merge branch 'master' into MM-23517-final-fix-popover
mattermod Mar 25, 2020
0c39adb
Add more accurate css values
Mar 25, 2020
a65987d
Merge branch 'MM-23517-final-fix-popover' of github.com:mattermost/ma…
Mar 25, 2020
c8f9e37
consider DM's for the header popover
Mar 26, 2020
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
Prev Previous commit
consider DM's for the header popover
  • Loading branch information
Nevyana Angelova authored and Nevyana Angelova committed Mar 26, 2020
commit c8f9e3773442c744fe7941e9fcb4d3555931eddc
3 changes: 2 additions & 1 deletion components/channel_header/channel_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,8 @@ class ChannelHeader extends React.PureComponent {
style={{maxWidth: `${this.state.popoverOverlayWidth}px`}}
placement='bottom'
className={classNames(['channel-header__popover',
{'chanel-header__popover--lhs_offset': this.props.hasMoreThanOneTeam,
{'chanel-header__popover--dm': isDirect,
'chanel-header__popover--lhs_offset': this.props.hasMoreThanOneTeam,
'chanel-header__popover--new_sidebar': newSideBarPreference}])}
>
<span
Expand Down
9 changes: 9 additions & 0 deletions sass/components/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
margin-left: -4px;
font-size: em(12px);

&.chanel-header__popover--dm {
margin-left: 73px;
}

&.chanel-header__popover--lhs_offset {
margin-left: 61px;

Expand All @@ -39,6 +43,11 @@

&.chanel-header__popover--new_sidebar {
margin-left: 16px;


&.chanel-header__popover--dm {
margin-left: 91px;
}
}

.popover-content {
Expand Down