From 1783029921aa722b37fd59f58e027fd84fc0ec09 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Fri, 25 Aug 2023 22:03:11 +0100
Subject: [PATCH 1/2] yarn lint:fix

---
 war/src/main/scss/components/_tooltips.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/war/src/main/scss/components/_tooltips.scss b/war/src/main/scss/components/_tooltips.scss
index 566093bb98fd..972db7310a36 100644
--- a/war/src/main/scss/components/_tooltips.scss
+++ b/war/src/main/scss/components/_tooltips.scss
@@ -79,10 +79,10 @@
 
     &::after {
       mask-image: linear-gradient(
-                      -45deg,
-                      transparent 40%,
-                      white,
-                      transparent 60%
+        -45deg,
+        transparent 40%,
+        white,
+        transparent 60%
       );
       mask-size: 200% 200%;
       mask-position: center;

From 3996dc06fb0238b4eee2d71d8f67a8f10b320067 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 20 Nov 2023 15:26:36 +0000
Subject: [PATCH 2/2] Address comments

---
 core/src/main/java/hudson/Functions.java                   | 4 ++++
 core/src/main/resources/lib/layout/keyboard-shortcut.jelly | 6 +++---
 war/src/main/scss/components/_tooltips.scss                | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index c12d1846181e..86d9e9c55d29 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -2475,6 +2475,10 @@ public static String generateItemId() {
         return String.valueOf(Math.floor(Math.random() * 3000));
     }
 
+    /**
+     * @param keyboardShortcut the shortcut to be translated
+     * @return the translated shortcut, e.g. CMD+K -> ⌘+K for macOS, CTRL+K for Windows
+     */
     @Restricted(NoExternalUse.class)
     public static String translateModifierKeysForUsersPlatform(String keyboardShortcut) {
         StaplerRequest currentRequest = Stapler.getCurrentRequest();
diff --git a/core/src/main/resources/lib/layout/keyboard-shortcut.jelly b/core/src/main/resources/lib/layout/keyboard-shortcut.jelly
index 92bbf4a59470..56dfa40c128e 100644
--- a/core/src/main/resources/lib/layout/keyboard-shortcut.jelly
+++ b/core/src/main/resources/lib/layout/keyboard-shortcut.jelly
@@ -32,11 +32,11 @@ THE SOFTWARE.
       Optional suffix to the shortcut
     </st:attribute>
     Displays a keyboard shortcut chip based on the component's body.
-    CMD/CTRL will automatically be translated to the user's operating system's appropriate variant.
+    CMD will automatically be translated to the user's operating system's appropriate variant.
   </st:documentation>
 
   <div class="jenkins-tooltip__keyboard-shortcut">
-    <j:if test="${attrs.prefix != null}">
+    <j:if test="${attrs.containsKey('prefix')}">
       <span>
         ${attrs.prefix}
       </span>
@@ -47,7 +47,7 @@ THE SOFTWARE.
       </j:set>
       <j:out value="${h.translateModifierKeysForUsersPlatform(body)}" />
     </div>
-    <j:if test="${attrs.suffix != null}">
+    <j:if test="${attrs.containsKey('suffix')}">
       <span>
         ${attrs.suffix}
       </span>
diff --git a/war/src/main/scss/components/_tooltips.scss b/war/src/main/scss/components/_tooltips.scss
index 972db7310a36..6743f6c88180 100644
--- a/war/src/main/scss/components/_tooltips.scss
+++ b/war/src/main/scss/components/_tooltips.scss
@@ -85,7 +85,6 @@
         transparent 60%
       );
       mask-size: 200% 200%;
-      mask-position: center;
       animation: shortcut-glow-animation 1.25s forwards linear;
     }