Move radius to CSS variables, rename help button to be consistent

janfaracik · Oct 22, 2021 · 1a6662c · 1a6662c
1 parent 26423de
commit 1a6662c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/core/src/main/resources/lib/form/helpLink.jelly b/core/src/main/resources/lib/form/helpLink.jelly
@@ -54,7 +54,7 @@ THE SOFTWARE.
   <j:choose>
     <j:when test="${attrs.url!=null}">
       <j:set var="altText" value="${attrs.featureName != null ? '%Help for feature:' + ' ' + attrs.featureName : '%Help'}" />
-      <a href="#" class="help-button" tooltip="${altText}" helpURL="${rootURL}${attrs.url}">
+      <a href="#" class="jenkins-help-button" tooltip="${altText}" helpURL="${rootURL}${attrs.url}">
         ?
       </a>
     </j:when>

diff --git a/test/src/test/java/hudson/model/HelpLinkTest.java b/test/src/test/java/hudson/model/HelpLinkTest.java
@@ -93,7 +93,7 @@ private void clickAllHelpLinks(JenkinsRule.WebClient webClient, AbstractProject
     }
 
     private void clickAllHelpLinks(HtmlPage p) throws Exception {
-        List<?> helpLinks = DomNodeUtil.selectNodes(p, "//a[@class='help-button']");
+        List<?> helpLinks = DomNodeUtil.selectNodes(p, "//a[@class='jenkins-help-button']");
         assertTrue(helpLinks.size()>0);
         System.out.println("Clicking "+helpLinks.size()+" help links");
 

diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
@@ -256,6 +256,7 @@
   --form-item-max-width--medium: 450px;
   --form-label-font-weight: bold;
   --form-input-padding: 8px;
+  --form-input-border-radius: 6px;
 
   // Pop out menus
   --menu-text-color: black;

diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
@@ -50,7 +50,7 @@
   background: var(--input-color);
   border: 2px solid var(--input-border);
   padding: var(--form-input-padding);
-  border-radius: 6px;
+  border-radius: var(--form-input-border-radius);
   width: 100%;
   box-shadow: 0 0 0 10px transparent;
   transition: 0.2s ease;
@@ -76,7 +76,7 @@
     display: block;
     background: var(--input-color);
     border: 2px solid var(--input-border);
-    border-radius: 6px;
+    border-radius: var(--form-input-border-radius);
     width: 100%;
     margin: 0;
     padding: 0 4px 0 29px;
@@ -356,7 +356,7 @@
   }
 }
 
-.help-button {
+.jenkins-help-button {
   position: relative;
   width: 18px;
   height: 18px;

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1034,7 +1034,7 @@ function rowvgStartEachRow(recursive,f) {
     });
 
 
-    Behaviour.specify("A.help-button", "a-help-button", ++p, function(e) {
+    Behaviour.specify("A.jenkins-help-button", "a-jenkins-help-button", ++p, function(e) {
         e.onclick = helpButtonOnClick;
         e.tabIndex = 9999; // make help link unnavigable from keyboard
         e.parentNode.parentNode.addClassName('has-help');