Skip to content

Removing "MarginHack" from LoadingIcon #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Removing "MarginHack" from LoadingIcon #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/src/app/common/components/loading-icon/loading-icon.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
repeatCount="indefinite" />
</path>
</svg>
<div class="text-area" [style.font-size]="fontSize" [style.margin-top]="marginHack">
<div class="text-area" [style.font-size]="fontSize">
<ng-content></ng-content>
</div>
1 change: 0 additions & 1 deletion src/src/app/common/components/loading-icon/loading-icon.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Component, Input } from '@angular/core';
styleUrl: './loading-icon.component.scss'
})
export class LoadingIconComponent {
@Input() marginHack = '0px';
@Input() width = '100%';
@Input() height = '100%';
@Input() fontSize = '14px';
Expand Down
2 changes: 1 addition & 1 deletion src/src/app/view/login-landing/login-landing.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</div>
<div class="centered-box_content-container">
@if (error === '') {
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px">Logging in</app-loading-icon>
<app-loading-icon fontSize="24px" height="35px" width="35px">Logging in</app-loading-icon>
} @else {
<div class="error-banner">{{ error }}</div>
}
Expand Down
2 changes: 1 addition & 1 deletion src/src/app/view/login/login.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<app-twitch-login [twitchScopeIndex]="0" />
</div>
<div class="centered-box_content-container" [hidden]="!checkingLogin">
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px">
<app-loading-icon fontSize="24px" height="35px" width="35px">
Checking Login Info
</app-loading-icon>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/src/app/view/vm-manager/vm-manager.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h1>
[fontIcon]="vm.isOnline ? 'power_off' : 'power_settings_new'"
[matTooltip]="vm.isOnline ? 'Turn Off' : 'Turn On'" />
} @else {
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px" />
<app-loading-icon fontSize="24px" height="35px" width="35px" />
}
</h1>
<p>{{ vm.notes }}</p>
Expand All @@ -46,6 +46,6 @@ <h1>
</div>
} @else if (!error) {
<div class="layout-content" style="text-align: center">
<app-loading-icon fontSize="24px" height="35px" width="35px" marginHack="-25px">Getting VMs...</app-loading-icon>
<app-loading-icon fontSize="24px" height="35px" width="35px">Getting VMs...</app-loading-icon>
</div>
}