From cf55a768b26e1eded9cd2235c2966b2529a3cafc Mon Sep 17 00:00:00 2001
From: Tiago Melo <tmelo@suse.com>
Date: Wed, 8 Jul 2020 09:40:30 +0000
Subject: [PATCH] mgr/dashboard: Clean custom header styles

Fixes: https://tracker.ceph.com/issues/46417

Signed-off-by: Tiago Melo <tmelo@suse.com>
---
 .../rbd-configuration-form.component.html     |  4 ++--
 .../block/rbd-form/rbd-form.component.html    |  4 ++--
 .../configuration-form.component.html         |  4 ++--
 .../osd-creation-preview-modal.component.html |  2 +-
 .../osd-pg-scrub-modal.component.html         |  4 ++--
 .../login-password-form.component.html        |  2 +-
 .../app/core/auth/login/login.component.scss  |  4 ----
 .../src/styles/ceph-custom/_basics.scss       | 21 -------------------
 .../src/styles/ceph-custom/_grid.scss         |  4 ----
 9 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.html
index a0e3bf8b308..4e5deedfafc 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.html
@@ -4,13 +4,13 @@
 
   <div *ngFor="let section of rbdConfigurationService.sections"
        class="col-12">
-    <h3 class="cd-header">
+    <h4 class="cd-header">
       <span (click)="toggleSectionVisibility(section.class)"
             class="collapsible">
         {{ section.heading }} <i [ngClass]="!sectionVisibility[section.class] ? icons.addCircle : icons.minusCircle"
                                  aria-hidden="true"></i>
       </span>
-    </h3>
+    </h4>
     <div class="{{ section.class }}"
          [hidden]="!sectionVisibility[section.class]">
       <div class="form-group row"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
index 75f86642df3..4db306f9ebf 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
@@ -252,8 +252,8 @@
                   i18n>Advanced</legend>
 
           <div class="col-md-12">
-            <h3 class="cd-header"
-                i18n>Striping</h3>
+            <h4 class="cd-header"
+                i18n>Striping</h4>
 
             <!-- Object Size -->
             <div class="form-group row">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
index ab23e58c59f..3df68d267b8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
@@ -94,8 +94,8 @@
 
         <!-- Values -->
         <div formGroupName="values">
-          <h2 i18n
-              class="cd-header">Values</h2>
+          <h3 i18n
+              class="cd-header">Values</h3>
           <ng-container *ngFor="let section of availSections">
             <div class="form-group row"
                  *ngIf="type === 'bool'">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.html
index 31e2f0581dd..bbbe426a45e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.html
@@ -7,7 +7,7 @@
           [formGroup]="formGroup"
           novalidate>
       <div class="modal-body">
-        <h3 i18n>DriveGroups</h3>
+        <h4 i18n>DriveGroups</h4>
         <pre>{{ driveGroups | json}}</pre>
       </div>
       <div class="modal-footer">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html
index 4568650ae6b..4e9e3eefd8e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.html
@@ -23,8 +23,8 @@
           </div>
         </div>
         <div *ngIf="advancedEnabled">
-          <h2 class="page-header"
-              i18n>Advanced configuration options</h2>
+          <h3 class="page-header"
+              i18n>Advanced configuration options</h3>
           <cd-config-option [optionNames]="advancedOptions"
                             [optionsForm]="osdPgScrubForm"
                             [optionsFormDir]="formDir"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.html
index d98e16c50c7..07c0b6d3bfd 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.html
@@ -1,5 +1,5 @@
 <div>
-  <h1 i18n>Please set a new password.</h1>
+  <h2 i18n>Please set a new password.</h2>
   <h4 i18n>You will be redirected to the login page afterwards.</h4>
   <form #frm="ngForm"
         [formGroup]="userForm"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss
index 3e84175a425..85b3ac5534e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss
@@ -1,10 +1,6 @@
 @use './src/styles/defaults/bootstrap-defaults' as bd;
 
 ::ng-deep cd-login {
-  h1 {
-    margin: 0 0 30px;
-  }
-
   .form-group {
     background-color: bd.$color-password-toggle-bg;
     border-left: 4px solid bd.$color-solid-white;
diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
index 7cfe9244aa4..2de197a9e92 100644
--- a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
@@ -12,27 +12,6 @@ body {
   width: 100%;
 }
 
-h1 {
-  font-size: 2em;
-  letter-spacing: -1px;
-}
-
-h2 {
-  font-size: 1.833em;
-  letter-spacing: -1px;
-}
-
-h3 {
-  display: block;
-  font-size: 1.583em;
-  font-weight: 400;
-}
-
-h4 {
-  font-size: 1.5em;
-  line-height: normal;
-}
-
 option {
   font-style: normal;
   font-weight: normal;
diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss
index ef977e7d69e..393902a9108 100644
--- a/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss
@@ -74,10 +74,6 @@ tags-input .tags {
   font-size: 1.3em;
 }
 
-.card-body h2:first-child {
-  margin-top: 0;
-}
-
 .disabled {
   pointer-events: none;
 }
-- 
2.47.3