From 080fc030f550824330f57cb94a66eaea8ad04417 Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Mon, 18 Jun 2018 12:19:55 +0200
Subject: [PATCH] mgr/dashboard: Add missing blanks to fix layout issue of
 various texts.

This behaviour starts to occur after switching to Angular 6.

Signed-off-by: Volker Theile <vtheile@suse.com>
---
 .../dashboard/health/health.component.html    |  2 +-
 .../core/auth/logout/logout.component.html    |  2 +-
 .../task-manager/task-manager.component.html  |  3 +-
 .../frontend/src/openattic-theme.scss         | 40 +++++++------------
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
index ca27ddfb51a5..a90be7f20384 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
@@ -5,7 +5,7 @@
       <div class="well">
         <fieldset>
           <legend i18n>Health</legend>
-          <ng-container i18n>Overall status:</ng-container>
+          <ng-container i18n>Overall status: </ng-container>
           <span [ngStyle]="contentData.health.status | healthColor">{{ contentData.health.status }}</span>
           <ul>
             <li *ngFor="let check of contentData.health.checks">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html
index 993fd95ebb1a..cd6282070998 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.html
@@ -2,5 +2,5 @@
    title="Sign Out"
    (click)="logout()">
   <i class="fa fa-sign-out"></i>
-  <ng-container i18n>Logout</ng-container>
+  <span i18n>Logout</span>
 </a>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
index 6178293c5f09..e83da3184c5b 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
@@ -83,5 +83,6 @@
    outsideClick="true">
   <i class="fa"
      [ngClass]="icon"></i>
-  Background-Tasks<span *ngIf="executingTasks.length > 0"> ({{ executingTasks.length }})</span>
+  <span i18n>Background-Tasks</span>
+  <span *ngIf="executingTasks.length > 0"> ({{ executingTasks.length }})</span>
 </a>
diff --git a/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss
index e0822d37cf78..ebb2c52a836f 100755
--- a/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/openattic-theme.scss
@@ -299,6 +299,10 @@ ul.task-queue-pagination {
   border-top: 4px solid $oa-color-blue;
   font-size: 1.2em;
 }
+.navbar-openattic i.fa {
+  /** Add space between icon and text */
+  margin-right: 5px;
+}
 .navbar-openattic .navbar-header {
   display: flex;
   float: none;
@@ -350,6 +354,9 @@ ul.task-queue-pagination {
 .navbar-openattic .navbar-nav>li>.oa-navbar>[dropdown].open>a {
   background-color: #505050;
 }
+.navbar-openattic .navbar-nav>li a.dropdown-toggle span.caret {
+  margin-left: 5px;
+}
 .navbar-openattic .navbar-nav>.open>a,
 .navbar-openattic .navbar-nav>.open>a:hover,
 .navbar-openattic .navbar-nav>.open>a:focus,
@@ -538,6 +545,9 @@ ul.task-queue-pagination {
 .panel .panel-toolbar>.dropdown>a {
   padding-left: 5px;
 }
+.panel .panel-footer > .button-group button.btn {
+  margin-left: 3px;
+}
 .panel-dashboard {
   height: 100%;
   padding-top: 60px;
@@ -584,31 +594,6 @@ ul.task-queue-pagination {
 .panel-dashboard .alert.bottom-margin-zero {
   margin-bottom: 0;
 }
-.panel-openattic {
-  border: $border-color;
-  border-top: 0;
-  border-radius: 0;
-}
-.panel-openattic>.panel-heading {
-  border-top: 2px solid $oa-color-blue;
-  border-radius: 0;
-  padding: 20px 15px;
-}
-.panel-openattic>.panel-heading>.panel-title {
-  color: #333333;
-  font-size: 1.333em;
-  margin: 0;
-  padding: 0;
-}
-.panel-openattic>.panel-body {
-  background: #ffffff;
-  border-top: $border-color;
-  padding: 10px 15px;
-}
-.panel-openattic>.panel-footer {
-  background: #ffffff;
-  border-top: $border-color;
-}
 
 /* Typo */
 a {
@@ -1146,6 +1131,11 @@ hr.oa-hr-small {
   vertical-align: text-top;
 }
 
+/* Modal dialog */
+.modal-footer button.btn {
+  margin-left: 3px;
+}
+
 // awesome-bootstrap-checkbox + ForkAwesome
 input[type="checkbox"].styled:checked + label:after,
 input[type="radio"].styled:checked + label:after,
-- 
2.47.3