From fadba5a60bd3d4d0640461a9428d42797831e4b1 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Fri, 22 Oct 2021 13:32:26 +0100
Subject: [PATCH] Move help-button to form.less, restyle help box

---
 .../main/resources/lib/form/helpArea.jelly    |  2 +-
 war/src/main/less/base/style.less             | 80 +++----------------
 war/src/main/less/modules/form.less           | 61 ++++++++++++++
 3 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/core/src/main/resources/lib/form/helpArea.jelly b/core/src/main/resources/lib/form/helpArea.jelly
index 721748914ddc..4b40a3e04553 100644
--- a/core/src/main/resources/lib/form/helpArea.jelly
+++ b/core/src/main/resources/lib/form/helpArea.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <st:documentation>
     Place holder to lazy-load help text via AJAX.
   </st:documentation>
-  <div class="help-area tr">
+  <div class="help-area">
       <div class="help">${%Loading...}</div>
   </div>
 </j:jelly>
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index 85d867929fdf..7fb680878bbb 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -633,11 +633,19 @@ label.attach-previous {
 
 .help {
   display: none;  /* hidden until loaded */
-  border: solid #bbb 1px;
   background-color: var(--help-area-bg-color);
-  padding: 1em;
-  margin-bottom: 1em;
+  padding: 1rem;
+  margin: 1rem 0;
   word-break: break-word;
+  border-radius: 6px;
+
+  p:first-of-type {
+    margin-top: 0;
+  }
+
+  p:last-of-type {
+    margin-bottom: 0;
+  }
 }
 
 .help a {
@@ -653,72 +661,6 @@ label.attach-previous {
   /* this marker class is used by JavaScript to locate the area to display help text. */
 }
 
-.help-button {
-  position: relative;
-  width: 18px;
-  height: 18px;
-  margin-left: 1ch;
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  color: var(--text-color)!important;
-  line-height: 18px;
-  border-radius: 100%;
-
-  &::before {
-    content: "?";
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    background: var(--text-color);
-    opacity: 0.1;
-    border-radius: inherit;
-    transition: 0.2s ease;
-  }
-
-  &::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    box-shadow: 0 0 0 10px transparent;
-    border-radius: inherit;
-    opacity: 0.1;
-    transition: 0.2s ease;
-  }
-
-  &:hover {
-    text-decoration: none;
-
-    &::before {
-      opacity: 0.2;
-    }
-  }
-
-  &:active {
-    &::before {
-      opacity: 0.3;
-    }
-
-    &::after {
-      box-shadow: 0 0 0 5px var(--text-color);
-    }
-  }
-
-  &:active, &:focus {
-    outline: none;
-    text-decoration: none;
-  }
-}
-
-.setting-help .help-button {
-  margin: 0;
-}
-
 .icon-help,
 .svg-icon.icon-help {
   height: 1.25rem;
diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index 65692fdfe9e1..3de2c0c2eb75 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -352,3 +352,64 @@
   }
 }
 
+.help-button {
+  position: relative;
+  width: 18px;
+  height: 18px;
+  margin-left: 1ch;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  color: var(--text-color)!important;
+  line-height: 18px;
+  border-radius: 100%;
+
+  &::before {
+    content: "?";
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background: var(--text-color);
+    opacity: 0.1;
+    border-radius: inherit;
+    transition: 0.2s ease;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    box-shadow: 0 0 0 10px transparent;
+    border-radius: inherit;
+    opacity: 0.1;
+    transition: 0.2s ease;
+  }
+
+  &:hover {
+    text-decoration: none;
+
+    &::before {
+      opacity: 0.2;
+    }
+  }
+
+  &:active {
+    &::before {
+      opacity: 0.3;
+    }
+
+    &::after {
+      box-shadow: 0 0 0 5px var(--text-color);
+    }
+  }
+
+  &:active, &:focus {
+    outline: none;
+    text-decoration: none;
+  }
+}