Skip to content

Commit d287f22

Browse files
authored
Merge pull request #10806 from eth3lbert/indicator-color
Adjust loading spinner color
2 parents 99101c7 + 0e41e1a commit d287f22

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

app/components/follow-button.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{on "click" (perform this.toggleFollowTask)}}
1212
>
1313
{{#if (or this.followStateTask.isRunning this.toggleFollowTask.isRunning)}}
14-
<LoadingSpinner data-test-spinner />
14+
<LoadingSpinner @theme="light" data-test-spinner />
1515
{{else}}
1616
{{#if this.following}}
1717
Unfollow

app/components/loading-spinner.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div
2-
local-class="spinner"
2+
local-class="spinner {{if (eq @theme 'light') 'light'}}"
33
...attributes
44
>
55
<span local-class="message">Loading…</span>

app/components/loading-spinner.module.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
.spinner {
2-
--spinner-color: black;
3-
--spinner-bg-color: rgba(0, 0, 0, .2);
2+
--spinner-color: currentcolor;
3+
--spinner-bg-color: var(--gray-border);
44
--spinner-size: 16px;
55

66
display: inline-block;
77
height: var(--spinner-size);
88
width: var(--spinner-size);
99

10+
&.light {
11+
--spinner-bg-color: rgba(0, 0, 0, .2);
12+
}
13+
1014
&:after {
1115
content: " ";
1216
display: block;

app/templates/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
>
5252
Try Again
5353
{{#if this.dataTask.isRunning}}
54-
<LoadingSpinner local-class="spinner" data-test-spinner />
54+
<LoadingSpinner @theme="light" local-class="spinner" data-test-spinner />
5555
{{/if}}
5656
</button>
5757
{{else}}

app/templates/settings/tokens/new.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
Generate Token
183183

184184
{{#if this.saveTokenTask.isRunning}}
185-
<LoadingSpinner local-class="spinner" data-test-spinner />
185+
<LoadingSpinner @theme="light" local-class="spinner" data-test-spinner />
186186
{{/if}}
187187
</button>
188188

0 commit comments

Comments
 (0)