Skip to content

Commit 8a0368d

Browse files
authored
Merge pull request #6137 from IgniteUI/vslavov/progress-bar-styles-8.1.x
fix(progress-bar): revert change to progress-bar styles
2 parents 0f76347 + 5978ddb commit 8a0368d

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-component.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@
113113
@extend %circular-text !optional;
114114
}
115115

116-
@include e(text, $m: hidden) {
117-
@extend %circular-text !optional;
118-
}
119-
120116
@include m(indeterminate) {
121117
@extend %circular-display--indeterminate !optional;
122118

123119
@include e(outer) {
124120
@extend %circular-outer--indeterminate !optional;
125121
}
122+
123+
@include e(text) {
124+
@extend %circular-text--hidden !optional;
125+
}
126126
}
127127
}

projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,10 @@
292292
fill: --var($theme, 'text-color');
293293
}
294294

295+
%circular-text--hidden {
296+
visibility: hidden;
297+
}
298+
295299
@include keyframes('indeterminate-accordion') {
296300
50% {
297301
stroke-dashoffset: 260;

projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,9 @@ describe('IgCircularBar', () => {
450450
fix.detectChanges();
451451

452452
expect(bar.classList.contains(CIRCULAR_INDETERMINATE_CLASS)).toEqual(true);
453+
454+
// Expect text in indeterminate bar to be hidden;
455+
expect(getComputedStyle(bar.querySelector('text').firstElementChild).visibility).toEqual('hidden');
453456
});
454457
});
455458
});

0 commit comments

Comments
 (0)