Skip to content

Commit b778e43

Browse files
committed
added default color to uui-circle-loader and adjusted uui-button
1 parent ac4d436 commit b778e43

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

packages/uui-button/lib/uui-button.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ export class UUIButtonElement extends LabelMixin('', LitElement) {
162162
163163
#loader {
164164
font-size: 1.5em;
165+
color: inherit;
165166
}
166167
167168
/* ANIMATIONS */

packages/uui-loader-circle/lib/uui-loader-circle.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export class UUILoaderCircleElement extends LitElement {
2121
position: relative;
2222
width: 1em;
2323
height: 1em;
24+
color: var(--uui-color-primary);
2425
}
2526
2627
#spinner {

packages/uui-loader-circle/lib/uui-loader-circle.story.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,17 @@ export default {
2222
const Template: Story = props =>
2323
html`
2424
<uui-loader-circle
25-
style="color: ${props.color}; font-size: ${props.fontSize}"
25+
style="${props.color
26+
? 'color: ' + props.color
27+
: ''}; font-size: ${props.fontSize}"
2628
progress=${props.progress}
2729
?show-progress=${props.showProgress}></uui-loader-circle>
2830
`;
2931

3032
export const AAAOverview = Template.bind({});
3133
AAAOverview.storyName = 'Overview';
3234

33-
AAAOverview.args = { color: 'black' };
35+
AAAOverview.args = { color: '' };
3436
AAAOverview.argTypes = {
3537
color: { table: { category: 'inline styling' } },
3638
};

0 commit comments

Comments
 (0)