Skip to content

Commit 48c6f4c

Browse files
beth-panxnmetulevshweaver-MSFT
authored
fix css to no wrap in channel picker (#484)
Co-authored-by: Nikola Metulev <[email protected]> Co-authored-by: Shane Weaver <[email protected]>
1 parent 989493c commit 48c6f4c

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

src/components/mgt-teams-channel-picker/mgt-teams-channel-picker.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ $dropdown-item-selected-background: var(--dropdown-item-selected-background, #de
6767
.channel-chosen-list {
6868
min-height: 29px;
6969
display: flex;
70-
flex-wrap: wrap;
70+
flex-wrap: nowrap;
7171
vertical-align: middle;
7272
margin: 0 0 0 0;
7373
list-style-type: none;
@@ -106,7 +106,7 @@ $dropdown-item-selected-background: var(--dropdown-item-selected-background, #de
106106
font-weight: normal;
107107
font-size: 14px;
108108
line-height: 19px;
109-
background-color: $input-background-color;
109+
background-color: transparent;
110110
color: $font-color;
111111
padding-left: 5px;
112112
&::placeholder {
@@ -120,7 +120,8 @@ $dropdown-item-selected-background: var(--dropdown-item-selected-background, #de
120120
.close-icon {
121121
display: inline-block;
122122
position: absolute;
123-
right: 10px;
123+
right: 0;
124+
padding: 10px;
124125
line-height: normal;
125126
font-family: 'FabricMDL2Icons';
126127
margin-bottom: 1px;

src/components/mgt-teams-channel-picker/mgt-teams-channel-picker.ts

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ export class MgtTeamsChannelPicker extends MgtTemplatedComponent {
287287
${!this._selectedItemState ? getSvg(SvgIcon.Search, '#252424') : ''}
288288
</div>
289289
<div class="channel-chosen-list">
290-
${this.renderSelected()} ${this.renderInput()}
290+
${this.renderSelected()} ${this.renderInput()} ${this.renderCloseButton()}
291291
</div>
292292
</div>
293293
<div class=${classMap(dropdownClasses)}>${this.renderDropdown()}</div>
@@ -313,9 +313,6 @@ export class MgtTeamsChannelPicker extends MgtTemplatedComponent {
313313
<div class="selected-team-name">${this._selectedItemState.parent.item.displayName}</div>
314314
<div class="arrow">${getSvg(SvgIcon.TeamSeparator, '#B3B0AD')}</div>
315315
${this._selectedItemState.item.displayName}
316-
<div class="close-icon" @click="${() => this.selectChannel(null)}">
317-
318-
</div>
319316
</li>
320317
<div class="search-icon">
321318
${this._isFocused ? getSvg(SvgIcon.Search, '#252424') : ''}
@@ -352,6 +349,21 @@ export class MgtTeamsChannelPicker extends MgtTemplatedComponent {
352349
`;
353350
}
354351

352+
/**
353+
* Renders close button
354+
*
355+
* @protected
356+
* @returns
357+
* @memberof MgtTeamsChannelPicker
358+
*/
359+
protected renderCloseButton() {
360+
return html`
361+
<div class="close-icon" @click="${() => this.selectChannel(null)}">
362+
363+
</div>
364+
`;
365+
}
366+
355367
/**
356368
* Renders dropdown content
357369
*

0 commit comments

Comments
 (0)