Merge pull request #7063 from krisstern/feat/stable-2.361/backporting-2

Second backporting for LTS 2.361.1
jenkinsci · Sep 3, 2022 · d7bf138 · d7bf138
2 parents 6f86b27 + b394da7
commit d7bf138
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly b/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly
@@ -77,4 +77,5 @@
             </j:if>
         </div>
     </header>
+    <script src="${resURL}/jsbundles/keyboard-shortcuts.js" type="text/javascript"/>
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
@@ -236,8 +236,6 @@ THE SOFTWARE.
       </div>
     </footer>
     </j:if>
-
-    <script src="${resURL}/jsbundles/keyboard-shortcuts.js" type="text/javascript"/>
   </body>
 </html>
 </l:view>

diff --git a/war/src/main/less/form/checkbox.less b/war/src/main/less/form/checkbox.less
@@ -26,6 +26,42 @@
   clip: rect(0 0 0 0);
   clip-path: inset(50%);
 
+  &:not(:disabled) {
+    &:active,
+    &:focus {
+      & + label {
+        &::before {
+          box-shadow: 0 0 0 5px var(--focus-input-glow),
+            inset 0 0 0 5px var(--focus-input-border);
+        }
+      }
+    }
+
+    &:checked {
+      &:active,
+      &:focus {
+        & + label {
+          &::before {
+            box-shadow: 0 0 0 5px var(--focus-input-glow),
+              inset 0 0 0 12px var(--focus-input-border);
+          }
+        }
+      }
+    }
+  }
+
+  &:checked {
+    &:active,
+    &:focus {
+      & + label {
+        &::before {
+          box-shadow: 0 0 0 5px var(--focus-input-glow),
+            inset 0 0 0 12px var(--focus-input-border);
+        }
+      }
+    }
+  }
+
   &:checked {
     & + label {
       &:active,