Merge pull request #2499 from cloudfoundry-incubator/small-ui-fixes

Fix smaller UI issues
cloudfoundry · Jun 22, 2018 · ab5a394 · ab5a394
2 parents 7ed2468 + 2616dd6
commit ab5a394
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 4 deletions.
diff --git a/src/frontend/app/shared/components/dialog-confirm/dialog-confirm.component.scss b/src/frontend/app/shared/components/dialog-confirm/dialog-confirm.component.scss
@@ -11,6 +11,7 @@
     $size: 28px;
     font-size: $size;
     height: $size;
+    margin-left: 12px;
     width: $size;
   }
   &__message {

diff --git a/src/frontend/app/shared/components/list/list-types/app/card/card-app.component.html b/src/frontend/app/shared/components/list/list-types/app/card/card-app.component.html
@@ -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>

diff --git a/...ypes/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.html b/...ypes/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.html
@@ -1,5 +1,5 @@
 <span *ngIf="multipleConnectedEndpoints$ | async; else singleEndpoint">
-  Cf/Org/Space
+  CF/Org/Space
 </span>
 <ng-template #singleEndpoint>
   Org/Space

diff --git a/...tend/app/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.html b/...tend/app/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.html
@@ -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>

diff --git a/...pp/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.html b/...pp/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.html
@@ -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>

diff --git a/src/frontend/index.html b/src/frontend/index.html
@@ -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>
diff --git a/src/frontend/sass/components/mat-popup.scss b/src/frontend/sass/components/mat-popup.scss
@@ -0,0 +1,4 @@
+// Remove inner focus border on Firefox
+.mat-menu-item::-moz-focus-inner {
+  border: 0;
+}
diff --git a/src/frontend/styles.scss b/src/frontend/styles.scss
@@ -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 {