From b2da3f8d39c2c606c293919562528732390f386c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:03:37 +0000 Subject: [PATCH] Tidy up --- core/src/main/java/hudson/model/Computer.java | 1 - core/src/main/java/hudson/model/Job.java | 1 - core/src/main/java/hudson/model/User.java | 1 - core/src/main/java/hudson/model/View.java | 1 - core/src/main/java/hudson/search/Search.java | 4 ++-- src/main/js/components/command-palette/index.js | 4 ++-- src/main/scss/components/_command-palette.scss | 9 +++++---- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index 94f822d77e..c6f7801270 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -48,7 +48,6 @@ import hudson.node_monitors.DiskSpaceMonitorNodeProperty; import hudson.node_monitors.NodeMonitor; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; - import hudson.security.ACL; import hudson.security.AccessControlled; import hudson.security.Permission; diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index c6fdeeb4bb..ee03581011 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -48,7 +48,6 @@ import hudson.model.listeners.ItemListener; import hudson.scm.ChangeLogSet; import hudson.scm.SCM; import hudson.search.QuickSilver; - import hudson.search.SearchIndex; import hudson.search.SearchIndexBuilder; import hudson.search.SearchItem; diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 6900dc1f54..e67e2c7200 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -40,7 +40,6 @@ import hudson.XmlFile; import hudson.init.InitMilestone; import hudson.init.Initializer; import hudson.model.listeners.SaveableListener; - import hudson.security.ACL; import hudson.security.AccessControlled; import hudson.security.SecurityRealm; diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 60474395ff..1f03c3f813 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -42,7 +42,6 @@ import hudson.init.Initializer; import hudson.model.Descriptor.FormException; import hudson.model.listeners.ItemListener; import hudson.search.CollectionSearchIndex; - import hudson.search.SearchIndexBuilder; import hudson.security.ACL; import hudson.security.AccessControlled; diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java index a9af0b8759..7bd44a7256 100644 --- a/core/src/main/java/hudson/search/Search.java +++ b/core/src/main/java/hudson/search/Search.java @@ -171,9 +171,9 @@ public class Search implements StaplerProxy { if (iconName.startsWith("symbol")) { r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), - Symbol.get(new SymbolRequest.Builder().withRaw(iconName).build()), "symbol", curItem.item.getSearchGroup())); + Symbol.get(new SymbolRequest.Builder().withRaw(iconName).build()), "symbol", curItem.item.getSearchGroup().getDisplayName())); } else { - r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), iconName, "image", curItem.item.getSearchGroup())); + r.suggestions.add(new Item(curItem.getPath(), curItem.getUrl(), iconName, "image", curItem.item.getSearchGroup().getDisplayName())); } } rsp.serveExposedBean(req, r, new ExportConfig()); diff --git a/src/main/js/components/command-palette/index.js b/src/main/js/components/command-palette/index.js index 8549457622..85b5b2e7c0 100644 --- a/src/main/js/components/command-palette/index.js +++ b/src/main/js/components/command-palette/index.js @@ -69,7 +69,7 @@ function init() { label: i18n.dataset.getHelp, url: headerCommandPaletteButton.dataset.searchHelpUrl, isExternal: true, - group: null + group: null, }), ]); } else { @@ -86,7 +86,7 @@ function init() { if (query.length === 0 || Object.keys(results).length > 0) { for (const [group, items] of Object.entries(results)) { - if (group !== 'null') { + if (group !== "null") { const heading = document.createElement("p"); heading.className = "jenkins-command-palette__results__heading"; heading.innerText = group; diff --git a/src/main/scss/components/_command-palette.scss b/src/main/scss/components/_command-palette.scss index 1ae23772d5..94ab94acfd 100644 --- a/src/main/scss/components/_command-palette.scss +++ b/src/main/scss/components/_command-palette.scss @@ -14,7 +14,7 @@ &::backdrop { background: var(--command-palette-backdrop-background); - backdrop-filter: contrast(0.7) brightness(0.9) saturate(1.25) blur(3px); + backdrop-filter: brightness(0.9) saturate(1.25) blur(2px); animation: jenkins-dialog-backdrop-animate-in 0.1s linear; } @@ -76,7 +76,7 @@ &__search { --search-bar-height: 3rem !important; - background: transparent; + background: color-mix(in sRGB, var(--card-background), transparent); box-shadow: var(--command-palette-inset-shadow); margin-bottom: var(--section-padding); border-radius: 1rem; @@ -109,6 +109,7 @@ display: flex; flex-direction: column; border-radius: 1rem; + background: color-mix(in sRGB, var(--card-background), transparent); backdrop-filter: var(--command-palette-results-backdrop-filter); box-shadow: var(--command-palette-inset-shadow); @@ -132,7 +133,7 @@ color: var(--text-color-secondary); &:not(:first-of-type) { - padding-top: 1.5rem; + padding-top: 1.375rem; } } @@ -153,7 +154,7 @@ display: flex; align-items: center; justify-content: flex-start; - padding: 0.75rem; + padding: 0.625rem; border-radius: 0.5rem; color: var(--text-color) !important; transition: var(--standard-transition);