From 5aa075f568540c48df4fe1bbfe6a0432ca8dcab8 Mon Sep 17 00:00:00 2001
From: Tiago Melo <tmelo@suse.com>
Date: Fri, 12 Jul 2019 11:32:58 +0000
Subject: [PATCH] mgr/dashboard: Fix label font-weight

Some labels were not bold, because the css rule didn't apply to them.
I have improved the css rule and also add missing classes in some labels.

Signed-off-by: Tiago Melo <tmelo@suse.com>
---
 .../rbd-trash-move-modal.component.html              |  3 ++-
 .../rbd-trash-purge-modal.component.html             |  2 +-
 .../rbd-trash-restore-modal.component.html           |  3 ++-
 .../configuration/configuration.component.html       |  2 +-
 .../src/app/ceph/cluster/logs/logs.component.html    | 12 ++++++++----
 .../config-option/config-option.component.html       |  4 ++--
 .../config-option/config-option.component.scss       |  4 ++++
 .../shared/components/grafana/grafana.component.html |  2 +-
 .../refresh-selector/refresh-selector.component.html |  2 +-
 src/pybind/mgr/dashboard/frontend/src/styles.scss    |  2 +-
 10 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
index f772e42e248..e6633bcae19 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html
@@ -13,7 +13,8 @@
           click <kbd>Move Image</kbd>. Optionally, you can pick an expiration date.</p>
 
         <div class="form-group">
-          <label for="expires"
+          <label class="col-form-label"
+                 for="expires"
                  i18n>Protection expires at</label>
           <input type="text"
                  placeholder="NOT PROTECTED"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
index 8c93fab2e60..c95556dbac1 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html
@@ -15,7 +15,7 @@
         </p>
 
         <div class="form-group">
-          <label class="mx-auto"
+          <label class="col-form-label mx-auto"
                  i18n>Pool:</label>
           <input class="form-control"
                  type="text"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
index 718c0882062..6ed23bc4190 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.html
@@ -17,7 +17,8 @@
         </p>
 
         <div class="form-group">
-          <label for="name"
+          <label class="col-form-label"
+                 for="name"
                  i18n>New Name</label>
           <input type="text"
                  class="form-control"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html
index b5bfe83edcd..d01ebcdefe9 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.html
@@ -11,7 +11,7 @@
   <div class="table-filters form-inline">
     <div class="form-group filter"
          *ngFor="let filter of filters">
-      <label>{{ filter.label }}: </label>
+      <label class="col-form-label">{{ filter.label }}: </label>
       <select class="form-control custom-select"
               [(ngModel)]="filter.value"
               (ngModelChange)="updateFilter()">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
index e9385129d6d..00be424f378 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
@@ -41,7 +41,8 @@
 <ng-template #logFiltersTpl>
   <div class="form-inline">
     <div class="form-group">
-      <label i18n>Priority:</label>
+      <label class="col-form-label"
+             i18n>Priority:</label>
       <select class="form-control custom-select"
               [(ngModel)]="priority"
               (ngModelChange)="filterLogs()">
@@ -51,7 +52,8 @@
     </div>
 
     <div class="form-group">
-      <label i18n>Keyword:</label>
+      <label class="col-form-label"
+             i18n>Keyword:</label>
       <div class="input-group">
         <div class="input-group-prepend">
           <span class="input-group-text">
@@ -75,7 +77,8 @@
     </div>
 
     <div class="form-group">
-      <label i18n>Date:</label>
+      <label class="col-form-label"
+             i18n>Date:</label>
       <div class="input-group">
         <input type="text"
                class="form-control"
@@ -96,7 +99,8 @@
     </div>
 
     <div class="form-group">
-      <label i18n>Time range:</label>
+      <label class="col-form-label"
+             i18n>Time range:</label>
       <div class="d-inline-flex">
         <timepicker [showMeridian]="false"
                     [showSpinners]="false"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.html
index 8f7d28bc28e..0d18853601e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.html
@@ -2,7 +2,7 @@
   <div *ngFor="let option of options; let last = last">
     <div class="form-group row pt-2"
          *ngIf="option.type === 'bool'">
-      <label class="control-label col-6"
+      <label class="col-form-label col-6"
              [for]="option.name">
         <b>{{ option.text }}</b>
         <br>
@@ -27,7 +27,7 @@
 
     <div class="form-group row pt-2"
          *ngIf="option.type !== 'bool'">
-      <label class="col-6 control-label"
+      <label class="col-6 col-form-label"
              [for]="option.name">{{ option.text }}
         <br>
         <span class="text-muted">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.scss
index 89629245e1d..e35c2e37bed 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.scss
@@ -4,3 +4,7 @@
     cursor: pointer;
   }
 }
+
+.col-form-label {
+  text-align: left;
+}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html
index c774a4a32e7..777707327a5 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html
@@ -19,7 +19,7 @@
     <div class="col-12">
       <div class="form-inline timepicker">
         <label for="timepicker"
-               class="ml-1 my-1"
+               class="ml-1 my-1 col-form-label"
                i18n>Grafana Time Picker</label>
 
         <select id="timepicker"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html
index 5d2a627073b..ce979b0569d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.html
@@ -2,7 +2,7 @@
   <div class="col-12">
     <div class="float-right d-inline-flex">
       <label for="refreshInterval"
-             class="m-2"
+             class="col-form-label my-2"
              i18n>Refresh</label>
       <select id="refreshInterval"
               name="refreshInterval"
diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss
index 4554edfc3a0..41133267e6c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/styles.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss
@@ -375,7 +375,7 @@ legend {
   }
 }
 
-.form-group > label {
+.col-form-label {
   font-weight: 700;
 }
 
-- 
2.39.5