Merge branch 'develop' into news

This commit is contained in:
jliddev
2021-06-23 14:06:55 -05:00
2 changed files with 4 additions and 38 deletions

View File

@@ -4,7 +4,7 @@
<p class="mr-3">{{ sessionService.pageContextText$ | async }}</p>
<p>v{{ versionNumber | async }}</p>
<div class="ml-3" [ngSwitch]="appUpdateState$ | async">
<div *ngSwitchCase="appUpdateState.CheckingForUpdate">{{'APP.WOWUP_UPDATE.CHECKING_FOR_UPDATE' | translate}}</div>
<div *ngSwitchCase="appUpdateState.CheckingForUpdate"><p>{{'APP.WOWUP_UPDATE.CHECKING_FOR_UPDATE' | translate}}</p></div>
<div *ngSwitchCase="appUpdateState.Downloading" class="row align-items-center">
<mat-progress-spinner class="" color="primary" mode="determinate" [value]="appUpdateProgress$ | async"
[diameter]="20"></mat-progress-spinner>
@@ -24,4 +24,4 @@
</div>
</div>
</div>
</footer>
</footer>

View File

@@ -7,7 +7,7 @@ footer {
align-items: center;
p {
font-size: 0.8em;
font-size: 0.85em;
margin: 0;
}
@@ -18,38 +18,10 @@ footer {
cursor: pointer;
}
.link {
.mat-icon {
height: 20px;
width: 20px;
}
}
.patreon-link {
padding: 0 0.25em;
.patron-img {
height: 25px;
}
}
.discord-link {
height: 20px;
padding: 2.5px 0.25em;
}
.github-link {
height: 20px;
padding: 2.5px 0.25em;
}
.guide-link {
height: 20px;
padding: 2.5px 0.25em;
}
.footer-button {
height: 25px;
padding: 0 0.5em;
margin: 3px 0 0 0;
overflow: hidden;
border-radius: 4px;
border: none;
@@ -85,12 +57,6 @@ footer {
&:hover {
cursor: pointer;
}
&.animate {
.mat-icon {
animation: rotate 1.5s infinite linear reverse;
}
}
}
&.downloading-button {