Skip to content

Commit 1e03af2

Browse files
Removing "MarginHack" from LoadingIcon
Set up all the loading icons so their text and gif were aligned. Removed the hack property to offset them on every screen. closes #25
1 parent f9a22d8 commit 1e03af2

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

src/src/app/common/components/loading-icon/loading-icon.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
repeatCount="indefinite" />
2222
</path>
2323
</svg>
24-
<div class="text-area" [style.font-size]="fontSize" [style.margin-top]="marginHack">
24+
<div class="text-area" [style.font-size]="fontSize">
2525
<ng-content></ng-content>
2626
</div>

src/src/app/common/components/loading-icon/loading-icon.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { Component, Input } from '@angular/core';
88
styleUrl: './loading-icon.component.scss'
99
})
1010
export class LoadingIconComponent {
11-
@Input() marginHack = '0px';
1211
@Input() width = '100%';
1312
@Input() height = '100%';
1413
@Input() fontSize = '14px';

src/src/app/view/login-landing/login-landing.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</div>
55
<div class="centered-box_content-container">
66
@if (error === '') {
7-
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px">Logging in</app-loading-icon>
7+
<app-loading-icon fontSize="24px" height="35px" width="35px">Logging in</app-loading-icon>
88
} @else {
99
<div class="error-banner">{{ error }}</div>
1010
}

src/src/app/view/login/login.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<app-twitch-login [twitchScopeIndex]="0" />
2020
</div>
2121
<div class="centered-box_content-container" [hidden]="!checkingLogin">
22-
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px">
22+
<app-loading-icon fontSize="24px" height="35px" width="35px">
2323
Checking Login Info
2424
</app-loading-icon>
2525
</div>

src/src/app/view/vm-manager/vm-manager.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>
3131
[fontIcon]="vm.isOnline ? 'power_off' : 'power_settings_new'"
3232
[matTooltip]="vm.isOnline ? 'Turn Off' : 'Turn On'" />
3333
} @else {
34-
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px" />
34+
<app-loading-icon fontSize="24px" height="35px" width="35px" />
3535
}
3636
</h1>
3737
<p>{{ vm.notes }}</p>
@@ -46,6 +46,6 @@ <h1>
4646
</div>
4747
} @else if (!error) {
4848
<div class="layout-content" style="text-align: center">
49-
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px">Getting VMs...</app-loading-icon>
49+
<app-loading-icon fontSize="24px" height="35px" width="35px">Getting VMs...</app-loading-icon>
5050
</div>
5151
}

0 commit comments

Comments
 (0)