Skip to content
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.

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

Fix smaller UI issues #2499

Merged
merged 4 commits into from
Jun 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
$size: 28px;
font-size: $size;
height: $size;
margin-left: 12px;
width: $size;
}
&__message {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item *ngIf="multipleConnectedEndpoints$ | async; else singleEndpoint">
<app-meta-card-key>Cf/Org/Space</app-meta-card-key>
<app-meta-card-key>CF/Org/Space</app-meta-card-key>
<app-meta-card-value>
{{endpointName$ | async }}/{{ row.entity.space.entity.organization.entity.name }}/{{ row.entity.space.entity.name }}
</app-meta-card-value>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<span *ngIf="multipleConnectedEndpoints$ | async; else singleEndpoint">
Cf/Org/Space
CF/Org/Space
</span>
<ng-template #singleEndpoint>
Org/Space
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<app-meta-card-value>{{instancesCount }} / {{ instancesLimit | infinityPipe }}</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item>
<app-meta-card-key>Memory Info</app-meta-card-key>
<app-meta-card-key>Memory</app-meta-card-key>
<app-meta-card-value>{{ this.memoryTotal | MbToHumanSize }} / {{ this.memoryLimit | MbToHumanSize }}
</app-meta-card-value>
<mat-progress-bar mode="determinate" [value]="normalisedMemoryUsage"></mat-progress-bar>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<app-meta-card-value>{{serviceInstancesCount }} / {{ serviceInstancesLimit | infinityPipe }}</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item>
<app-meta-card-key>Memory Info</app-meta-card-key>
<app-meta-card-key>Memory</app-meta-card-key>
<app-meta-card-value>{{ memoryTotal | MbToHumanSize }} / {{ memoryLimit | MbToHumanSize }}
</app-meta-card-value>
<mat-progress-bar mode="determinate" [value]="normalisedMemoryUsage"></mat-progress-bar>
Expand Down
34 changes: 34 additions & 0 deletions src/frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,44 @@

<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<noscript>
<style>
.stratos {
height: 100vh;
margin: 0;
width: 100vw;
}
.no-javascript {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 100%;
width: 100%;
}
.message {
font-family: Arial, Helvetica;
font-size: 24px;
margin-bottom: 24px;
}
.title {
font-size: 36px;
font-weight: bold;
}
</style>
</noscript>

</head>

<body class="stratos">
<app-root></app-root>
<noscript>
<div class="no-javascript">
<div class="message title">STRATOS</div>
<div class="message">Javascript is required to run Stratos</div>
<div class="message">Please enable Javascript in your browser and refresh this page</div>
</div>
</noscript>
</body>

</html>
4 changes: 4 additions & 0 deletions src/frontend/sass/components/mat-popup.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Remove inner focus border on Firefox
.mat-menu-item::-moz-focus-inner {
border: 0;
}
1 change: 1 addition & 0 deletions src/frontend/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import './sass/scroll-bar-measure';
@import './sass/components/card-wall';
@import './sass/components/mat-card';
@import './sass/components/mat-popup';
@import './sass/components/mat-tabs';
@import './sass/components/mat-table';
body {
Expand Down