some minor UI improvements

This commit is contained in:
tidusjar 2020-08-22 23:01:47 +01:00
commit 157d173a44
6 changed files with 56 additions and 34 deletions

View file

@ -170,7 +170,7 @@
<div> <div>
<app-my-nav [showNav]="showNav" [isAdmin]="isAdmin" [applicationName]="applicationName" [username]="username" (logoutClick)="logOut();" (themeChange)="onSetTheme($event)"> <app-my-nav id="main-container" [showNav]="showNav" [isAdmin]="isAdmin" [applicationName]="applicationName" [username]="username" (logoutClick)="logOut();" (themeChange)="onSetTheme($event)">
</app-my-nav> </app-my-nav>

View file

@ -27,23 +27,28 @@
} }
::ng-deep .mat-card-image { ::ng-deep .mat-card-image {
height:75%; height: 75%;
object-fit:cover; object-fit: cover;
display:block; display: block;
} }
.card-spacing { .card-spacing {
height:100%; height: 100%;
} }
.mat-card-content h6 { .mat-card-content h6 {
overflow:hidden; overflow: hidden;
white-space:nowrap; white-space: nowrap;
font-weight:500; font-weight: 500;
font-size:1.1rem; font-size: 1.1rem;
} }
@media (min-width: 300px) { @media (min-width: 300px) {
.small-middle-container {
margin: inherit;
}
.col-xl-2 { .col-xl-2 {
flex: 0 0 100%; flex: 0 0 100%;
max-width: 100%; max-width: 100%;
@ -51,20 +56,20 @@
} }
.btn-group { .btn-group {
width:100%; width: 100%;
} }
mat-button-base { mat-button-base {
width:100%; width: 100%;
} }
.col { .col {
padding-right: 10px !important; padding-right: 10px !important;
padding-left:10px !important; padding-left: 10px !important;
} }
.row { .row {
margin-left:0px; margin-left: 0px;
} }
.small-padding { .small-padding {
@ -74,28 +79,29 @@
} }
::ng-deep .mat-card-image { ::ng-deep .mat-card-image {
height:85% !important; height: 85% !important;
} }
} }
@media (min-width: 600px) { @media (min-width: 600px) {
.justify-content-md-center { .justify-content-md-center {
justify-content: center !important; justify-content: center !important;
} }
.small-middle-container{
width:auto; .small-middle-container {
width: auto;
} }
.btn-group { .btn-group {
width:auto; width: auto;
} }
mat-button-base { mat-button-base {
width:auto; width: auto;
} }
::ng-deep .mat-card-image { ::ng-deep .mat-card-image {
height:75% !important; height: 75% !important;
} }
} }
@ -106,32 +112,32 @@
min-width: 50%; min-width: 50%;
} }
.col{ .col {
padding-right: 15px !important; padding-right: 15px !important;
padding-left: 15px !important; padding-left: 15px !important;
} }
.small-padding{ .small-padding {
padding-left: 20px !important; padding-left: 20px !important;
padding-right: 20px !important; padding-right: 20px !important;
height:auto; height: auto;
} }
.row{ .row {
margin-left:0px; margin-left: 0px;
} }
.small-middle-container{ .small-middle-container {
width:auto; width: auto;
overflow:hidden; overflow: hidden;
} }
.btn-group { .btn-group {
width:auto; width: auto;
} }
mat-button-base { mat-button-base {
width:auto; width: auto;
} }
} }
@ -166,6 +172,7 @@
min-width: 16.66666667%; min-width: 16.66666667%;
} }
} }
@media (min-width: 1900px) { @media (min-width: 1900px) {
.col-xl-2 { .col-xl-2 {
flex: 0 0 14.285713%; flex: 0 0 14.285713%;

View file

@ -35,7 +35,7 @@
<mat-icon aria-label="Side nav toggle icon">menu</mat-icon> <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
</button> </button>
<div class="col-md-10 offset-md-1 col-10"> <div class="col-md-10 offset-md-1 col-8">
<span class="middle justify-content-center align-items-center"> <span class="middle justify-content-center align-items-center">
<!-- Search Bar --> <!-- Search Bar -->
<div style="width: 50%;"> <div style="width: 50%;">

View file

@ -1,6 +1,8 @@
@import "~styles/variables.scss"; @import "~styles/variables.scss";
.sidenav-container { .sidenav-container {
min-height: 100vh; min-height: 100vh;
-webkit-overflow-scrolling:touch;
overflow:auto;
} }
.sidenav { .sidenav {

View file

@ -3,6 +3,7 @@ import { AuthService } from '../auth/auth.service';
import { HubConnection } from '@aspnet/signalr'; import { HubConnection } from '@aspnet/signalr';
import * as signalR from '@aspnet/signalr'; import * as signalR from '@aspnet/signalr';
@Injectable() @Injectable()
export class SignalRNotificationService { export class SignalRNotificationService {
@ -28,12 +29,16 @@ export class SignalRNotificationService {
this.Notification.emit(data); this.Notification.emit(data);
}); });
let retryCount = 0;
this.hubConnection.start().then((data: any) => { this.hubConnection.start().then((data: any) => {
console.log('Now connected'); console.log('Now connected');
}).catch((error: any) => { }).catch((error: any) => {
retryCount++;
console.log('Could not connect ' + error); console.log('Could not connect ' + error);
setTimeout(() => this.initialize(), 3000); if (retryCount <= 3) {
setTimeout(() => this.initialize(), 3000);
}
}); });
} }

View file

@ -38,11 +38,19 @@
html, html,
body { body {
min-height: 100vh; min-height: 100vh;
overflow: auto; overflow: hidden;
scrollbar-color: #616161 #303030; //firefox scrollbar-color: #616161 #303030; //firefox
scrollbar-width: thin; //firefox scrollbar-width: thin; //firefox
-webkit-overflow-scrolling: touch;
}
#main-container {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
overflow: auto;
} }
.spinner-container { .spinner-container {
position: relative; position: relative;
margin-left: 50%; margin-left: 50%;