mgr/dashboard: Clean custom header styles

Fixes: https://tracker.ceph.com/issues/46417
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit cf55a768b26e1eded9cd2235c2966b2529a3cafc)

 Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss
	src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
	src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss
	src/pybind/mgr/dashboard/frontend/src/styles.scss

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 a0e3bf8b308ece796eaa0d2e48c94406b20d886f..4e5deedfafc7bcdac45ecfdf748c2bdc8484e915 100644 (file)
--- 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 776e6ecb5038ce337d8df76b30cd6ad0f4ec1035..50066c5b59767d612c4487e455ec01165356bf0a 100644 (file)
--- 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
@@ -251,8 +251,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 3be3ac9789a55ef933fbe7dd3eb60be7a0b02499..c274306b02e2145b7eaf1bc2e246a64fcfd49bfb 100644 (file)
--- 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
@@ -93,8 +93,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 1e4b6d989ea5ede88195c04611659f8fe0c025c8..7abaced8edc8808ec9ff616af448ed4fc17c1128 100644 (file)
--- 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 054a9c5c0cc29bb5656aa02e99b57d25b1548fc6..e5e0f807e923f34b132b5b06d6651ab744731583 100644 (file)
--- 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 d98e16c50c7e3604b0eb9aa9c11a49a2c014c808..07c0b6d3bfd3c07558a325483b913d94fed56a2e 100755 (executable)
--- 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 9370066183edf3ba613631b9b7f420e3461c7730..a27bf74d4adf82d7e6d92723e1abe7ccd535e98f 100644 (file)
--- 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 @@
 @import 'defaults';
 
 ::ng-deep cd-login {
-  h1 {
-    margin: 0 0 30px 0;
-  }
-
   .form-group {
     border-left: 4px solid white;
     background-color: $color-password-toggle-bg;

diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss
index bb883e43ec0126abc01e14a55f3d529062eaa62e..12aec546555c8e11f8cb0326587061d367ed5011 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/styles.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss
@@ -62,23 +62,6 @@ body {
   height: 100%;
   font-size: 12px;
 }
-h1 {
-  letter-spacing: -1px;
-  font-size: 2em;
-}
-h2 {
-  letter-spacing: -1px;
-  font-size: 1.833em;
-}
-h3 {
-  display: block;
-  font-size: 1.583em;
-  font-weight: 400;
-}
-h4 {
-  font-size: 1.5em;
-  line-height: normal;
-}
 option {
   font-weight: normal;
   font-style: normal;
@@ -264,9 +247,6 @@ uib-accordion .card-title,
 .card-header {
   font-size: 1.3em;
 }
-.card-body h2:first-child {
-  margin-top: 0;
-}
 .disabled {
   pointer-events: none;
 }