Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify styling for 'Search bar' #10174

Merged
merged 9 commits into from
Jan 22, 2025
Merged

Simplify styling for 'Search bar' #10174

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e5eddd
Init
janfaracik Jan 17, 2025
54b4dc6
Update _command-palette.scss
janfaracik Jan 17, 2025
94a7fb8
Update _search-bar.scss
janfaracik Jan 17, 2025
5bf9b32
Lint
janfaracik Jan 17, 2025
fab5598
Update _side-panel-tasks.scss
janfaracik Jan 17, 2025
a5ef8e8
Merge branch 'master' into simplify-search
janfaracik Jan 18, 2025
2ac9c28
Merge branch 'master' into simplify-search
janfaracik Jan 19, 2025
0fc2c48
Merge branch 'master' into simplify-search
janfaracik Jan 20, 2025
8571dab
Merge branch 'master' into simplify-search
janfaracik Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/layout/search-bar.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ THE SOFTWARE.
</div>
<input value="${attrs.value}"
id="${attrs.id}"
class="jenkins-search__input"
class="jenkins-input jenkins-search__input"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this change mean to existing implementations (at least azure-vm-agents) that have just the existing class? Do they now need to be adapted, is it wrong to use the previous class without the new class?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot, in the case of azure-vm-agents it uses a combobox which already has a jenkins-input class attached. If there are cases (which AFAIK in public repos there aren't) then yeah they'll need the jenkins-input class adding.

placeholder="${attrs.placeholder ?: '%Search'}"
type="search"
autofocus="${attrs.autofocus == 'true' ? 'true' : null}"
Expand Down
8 changes: 4 additions & 4 deletions src/main/js/components/search-bar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createElementFromHtml } from "@/util/dom";
import makeKeyboardNavigable from "@/util/keyboard";
import { xmlEscape } from "@/util/security";

const SELECTED_CLASS = "jenkins-search__results-item--selected";
const SELECTED_CLASS = "jenkins-dropdown__item--selected";

function init() {
const searchBarInputs = document.querySelectorAll(".jenkins-search__input");
Expand All @@ -16,7 +16,7 @@ function init() {
);
searchWrapper.appendChild(searchResultsContainer);
const searchResults = createElementFromHtml(
`<div class="jenkins-search__results"></div>`,
`<div class="jenkins-dropdown"></div>`,
);
searchResultsContainer.appendChild(searchResults);

Expand All @@ -35,9 +35,9 @@ function init() {
results.forEach((item, index) => {
container.appendChild(
createElementFromHtml(
`<a class="${index === 0 ? SELECTED_CLASS : ""}" href="${
`<a class="jenkins-dropdown__item ${index === 0 ? SELECTED_CLASS : ""}" href="${
item.url
}"><div>${item.icon}</div>${xmlEscape(item.label)}</a>`,
}"><div class="jenkins-dropdown__item__icon">${item.icon}</div>${xmlEscape(item.label)}</a>`,
),
);
});
Expand Down
4 changes: 4 additions & 0 deletions src/main/scss/components/_command-palette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@

input {
background: transparent !important;

--input-border: transparent;
--input-border-hover: transparent;

border-radius: inherit;

&::before,
Expand Down
2 changes: 1 addition & 1 deletion src/main/scss/components/_side-panel-tasks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $background-outset: 0.7rem;
}

.jenkins-search__input {
padding-left: 2.8rem;
padding-left: 2.6rem;
}
}
}
Expand Down
172 changes: 6 additions & 166 deletions src/main/scss/form/_search-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,7 @@
position: relative;

&__input {
appearance: none;
background: var(--item-background--hover);
border: none;
outline: none;
border-radius: 0.625rem;
width: 100%;
margin: 0;
padding: 0 0.5rem 0 var(--search-bar-height);
line-height: 1;
box-shadow:
0 0 0 2px transparent,
0 0 0 12px transparent;
transition: var(--standard-transition);
padding: 0 0.25rem 0 calc(var(--search-bar-height) * 0.9);
height: var(--search-bar-height);

&::placeholder {
Expand Down Expand Up @@ -60,18 +48,8 @@
}

&:not(:disabled) {
&:hover {
background: var(--item-background--active);
}

&:active,
&:focus {
outline: none;
background: var(--item-background--active);
box-shadow:
0 0 0 2px var(--focus-input-border),
0 0 0 7px var(--focus-input-glow);

&::-webkit-search-cancel-button {
opacity: 0.5;
pointer-events: all;
Expand All @@ -82,22 +60,12 @@

&:active,
&:focus {
outline: none;
background: var(--item-background--active);
box-shadow:
0 0 0 2px var(--focus-input-border),
0 0 0 7px var(--focus-input-glow);

&::-webkit-search-cancel-button {
opacity: 1;
pointer-events: all;
transform: scale(1);
}
}

&:disabled {
cursor: not-allowed;
}
}

&__icon {
Expand All @@ -110,10 +78,10 @@
pointer-events: none;

svg {
width: 45%;
height: 45%;
max-width: 1.1rem;
max-height: 1.1rem;
width: 1rem;
height: 1rem;
max-width: 1rem;
max-height: 1rem;
grid-column-start: 1;
grid-row-start: 1;
place-self: center center;
Expand Down Expand Up @@ -242,6 +210,7 @@
height: 1px; // Setting to 0 caused the items not to render initially in Chrome
opacity: 0;
transition: var(--standard-transition);
background: color-mix(in sRGB, var(--background) 85%, transparent);
backdrop-filter: var(--dropdown-backdrop-filter);
visibility: collapse;
scale: 95%;
Expand All @@ -254,135 +223,6 @@
visibility: visible;
translate: 0 0.3125rem;
}

a {
position: relative;
display: flex;
align-items: center;
gap: 0.7rem;
padding: 0.5rem 0.7rem;
font-size: 0.875rem;
border-radius: 10px;
color: var(--text-color);
font-weight: 500;
text-decoration: none;
z-index: 0;
line-height: 1;
min-height: 2.25rem;
transition: background var(--standard-transition);

div {
display: flex;
align-items: center;
justify-content: center;
width: 1.125rem;
height: 1.125rem;

svg,
img {
width: 100%;
height: 100%;
}
}

&::before,
&::after {
position: absolute;
content: "";
inset: 0;
z-index: -1;
border-radius: 10px;
transition: var(--standard-transition);
pointer-events: none;
}

&::before {
background-color: transparent;
}

&::after {
box-shadow: 0 0 0 0.66rem transparent;
}

&:hover,
&:focus {
&::before {
background-color: var(--item-background--hover);
}
}

&:active,
&:focus {
outline: none !important;
z-index: 1;

&::before {
background-color: var(--item-background--active);
}

&::after {
box-shadow: 0 0 0 0.33rem var(--item-box-shadow--focus);
}
}

&:focus-visible {
&::after {
box-shadow: 0 0 0 0.33rem var(--text-color);
}
}
}

.jenkins-search__results {
position: relative;
display: flex;
justify-content: flex-start;
flex-direction: column;
gap: 0.2rem;
padding: 0.4rem;

& > div {
position: relative;
margin-top: -0.25rem;

a {
padding-left: 2.6rem;
color: var(--text-color-secondary);
}

&::before {
content: "";
position: absolute;
top: 0.4rem;
left: 1.1rem + 0.625rem;
bottom: 0.3rem;
width: 0.125rem;
background: currentColor;
border-radius: 100vmax;
opacity: 0.05;
}

&:empty {
display: none;
}
}
}

&:hover {
.jenkins-search__results-item--selected {
background: transparent;
}
}
}

.jenkins-search__results-item--selected {
background: var(--item-background--hover);
animation: pulse 1s ease-in-out forwards;

@keyframes pulse {
50% {
background: var(--item-background--active);
}
}
}

.jenkins-search__results__no-results-label {
Expand Down
Loading