Skip to content

Commit bd51845

Browse files
authored
Merge pull request #6914 from IgniteUI/mpopov/6851-master
fix(button-group): Add ellipsis
2 parents 2f428f2 + b9f0b2c commit bd51845

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

projects/igniteui-angular/src/lib/buttonGroup/buttongroup-content.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
[igxLabel]="button.label"
1212
[igxRipple]="button.ripple"
1313
>
14-
<div class="igx-button-group__item-content {{ itemContentCssClass }}">
14+
<span class="igx-button-group__item-content {{ itemContentCssClass }}">
1515
<igx-icon *ngIf="button.icon" fontSet="material">{{button.icon}}</igx-icon>
16-
<span *ngIf="button.label">{{button.label}}</span>
17-
</div>
16+
<span class="igx-button-group__button-text" *ngIf="button.label">{{button.label}}</span>
17+
</span>
1818
</button>
1919
<ng-content></ng-content>
2020
</div>

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-component.scss

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
@extend %igx-group-item !optional;
1616
}
1717

18+
@include e(button-text) {
19+
@extend %igx-button-group__button-text !optional;
20+
}
21+
1822
@include e(item, $m: selected) {
1923
@extend %igx-group-item !optional;
2024
@extend %igx-group-item-selected !optional;

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

+7-5
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,10 @@
186186
display: flex;
187187
box-shadow: --var($theme, 'shadow');
188188
transition: $transition;
189-
border-radius: --var($theme, 'border-radius')
189+
border-radius: --var($theme, 'border-radius');
190190
}
191191

192192
%igx-group-item {
193-
@include ellipsis();
194193
border: $group-item-border-thickness solid --var($theme, 'item-border-color');
195194
color: --var($theme, 'item-text-color');
196195
background: --var($theme, 'item-background');
@@ -308,13 +307,16 @@
308307
%igx-group-item-content {
309308
display: flex;
310309
flex-flow: row nowrap;
311-
justify-content: center;
312-
align-items: center;
313-
text-align: center;
310+
min-width: 0;
314311

315312
* ~ * {
316313
margin-#{$left}: $group-items-margin;
317314
}
318315
}
316+
317+
%igx-button-group__button-text {
318+
width: 100%;
319+
@include ellipsis();
320+
}
319321
}
320322

src/app/buttonGroup/buttonGroup.sample.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,14 @@ <h4 class="sample-title">Custom class to style the content</h4>
4646
<article class="sample-column">
4747
<h4 class="sample-title">Templated buttons.</h4>
4848
<igx-buttongroup [multiSelection]="false">
49-
<button igxButton><igx-icon>alarm_on</igx-icon>Button 1 text</button>
50-
<button igxButton><igx-icon>autorenew</igx-icon>Button 2 text</button>
49+
<button igxButton>
50+
<igx-icon>alarm_on</igx-icon>
51+
Button 1 text
52+
</button>
53+
<button igxButton>
54+
<igx-icon>autorenew</igx-icon>
55+
Button 2 text<
56+
</button>
5157
</igx-buttongroup>
5258
</article>
5359

0 commit comments

Comments
 (0)