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

Automated cherry pick of #5593 #5605

Merged
merged 3 commits into from
May 27, 2020
Merged

Automated cherry pick of #5593 #5605

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
81e64db
MM-25492 - Alignign autocomplete to the left
asaadmahmood May 26, 2020
9f6ca56
MM-25485 - Updating icon sizes in switcher modal
asaadmahmood May 26, 2020
ef4424b
MM-25483 - Updating icon sizes in popover
asaadmahmood May 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
8 changes: 3 additions & 5 deletions components/suggestion/channel_mention_provider.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ChannelMentionSuggestion extends Suggestion {
const item = this.props.item;

const channelName = item.channel.display_name;
const channelIcon = (<span className='suggestion-list__icon suggestion-list__icon--standard'><i className='icon icon--no-spacing icon-globe'/></span>);
const channelIcon = (<span className='suggestion-list__icon suggestion-list__icon--large'><i className='icon icon--no-spacing icon-globe'/></span>);

let className = 'mentions__name no-flex';
if (isSelection) {
Expand All @@ -36,10 +36,8 @@ class ChannelMentionSuggestion extends Suggestion {
onMouseMove={this.handleMouseMove}
{...Suggestion.baseProps}
>
<div className='mention__align'>
<span>
{channelIcon}
</span>
<div className='d-flex align-items-center'>
{channelIcon}
<span>
{channelName}
</span>
Expand Down
2 changes: 1 addition & 1 deletion components/suggestion/search_channel_with_permissions_provider.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class SearchChannelWithPermissionsSuggestion extends Suggestion {
}}
{...Suggestion.baseProps}
>
<span className='suggestion-list__icon suggestion-list__icon--standard'>{icon}</span>
<span className='suggestion-list__icon suggestion-list__icon--large'>{icon}</span>
{displayName}
</div>
);
Expand Down
12 changes: 6 additions & 6 deletions sass/components/_suggestion-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,19 @@
flex: 0 0 1.6rem;

&--standard {
font-size: 1.6rem;
font-size: 1.2rem;
margin: 0 12px 0 0;
width: 1.6rem;
flex: 0 0 2.4rem;
width: 2rem;
height: 2rem;
}

&--large {
font-size: 1.6rem;
margin: 0 12px 0 0;
flex: 0 0 2.4rem;
width: 2.4rem;
height: 2.4rem;
}

.status--group {
Expand All @@ -34,10 +38,6 @@
width: 100%;
z-index: 100;

.post-create & {
margin: 0 0 -8px 16px;
}

.post-right__scroll & {
margin: 0;
}
Expand Down