Skip to content

upstreamable: frontend: GlobalSearch: Fix visibility on dark navbar #418

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

Draft
skoeva wants to merge 1 commit into
base: headlamp-downstream
Choose a base branch
from
Draft

upstreamable: frontend: GlobalSearch: Fix visibility on dark navbar #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 frontend/src/components/App/__snapshots__/Layout.Default.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-5ntm9s-MuiInputBase-root-MuiOutlinedInput-root"
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-1amr0ad-MuiInputBase-root-MuiOutlinedInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-outlined MuiInputAdornment-sizeSmall css-16yk9m0-MuiInputAdornment-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/App/__snapshots__/Layout.ErrorState.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-5ntm9s-MuiInputBase-root-MuiOutlinedInput-root"
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-1amr0ad-MuiInputBase-root-MuiOutlinedInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-outlined MuiInputAdornment-sizeSmall css-16yk9m0-MuiInputAdornment-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/App/__snapshots__/Layout.MultiCluster.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-5ntm9s-MuiInputBase-root-MuiOutlinedInput-root"
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-1amr0ad-MuiInputBase-root-MuiOutlinedInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-outlined MuiInputAdornment-sizeSmall css-16yk9m0-MuiInputAdornment-root"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/App/__snapshots__/Layout.WithClusterRoute.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-5ntm9s-MuiInputBase-root-MuiOutlinedInput-root"
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-1amr0ad-MuiInputBase-root-MuiOutlinedInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-outlined MuiInputAdornment-sizeSmall css-16yk9m0-MuiInputAdornment-root"
Expand Down
2 changes: 1 addition & 1 deletion .../src/components/common/ErrorPage/__snapshots__/ErrorPage.DifferentImage.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<img
alt=""
class="css-8atqhb"
src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgd2lkdGg9IjY4NS4yMzYyNyIKICAgaGVpZ2h0PSIzNjUuMDg0OSIKICAgdmlld0JveD0iMCAwIDY4NS4yMzYyNyAzNjUuMDg0OSIKICAgZmlsbD0ibm9uZSIKICAgdmVyc2lvbj0iMS4xIgogICBpZD0ic3ZnNDYxIgogICB4bWw6c3BhY2U9InByZXNlcnZlIgogICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzCiAgICAgaWQ9ImRlZnM0NTkiPjxyZWN0CiAgICAgICB4PSI0My42OTMxMTEiCiAgICAgICB5PSIzMzYuNjkzOTciCiAgICAgICB3aWR0aD0iNjEwLjQxODQ2IgogICAgICAgaGVpZ2h0PSIxNDcuNzg1NTIiCiAgICAgICBpZD0icmVjdDEwMTMiIC8+PHJlY3QKICAgICAgIHg9Ii0xNTYuMjE2MjYiCiAgICAgICB5PSI5OS4yOTAwMDEiCiAgICAgICB3aWR0aD0iMzk0LjUxMjI3IgogICAgICAgaGVpZ2h0PSIzMzguOTA5ODgiCiAgICAgICBpZD0icmVjdDc0NiIgLz48Y2xpcFBhdGgKICAgICAgIGlkPSJjbGlwMF8xNDI6MiI+PHJlY3QKICAgICAgICAgd2lkdGg9IjMxOC40MSIKICAgICAgICAgaGVpZ2h0PSIzMjguNTg3MDEiCiAgICAgICAgIGZpbGw9IiNmZmZmZmYiCiAgICAgICAgIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE3OCkiCiAgICAgICAgIGlkPSJyZWN0NDU2IgogICAgICAgICB4PSIwIgogICAgICAgICB5PSIwIiAvPjwvY2xpcFBhdGg+PC9kZWZzPjx0ZXh0CiAgICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIKICAgICBpZD0idGV4dDEwMTEiCiAgICAgc3R5bGU9ImZvbnQtc3R5bGU6bm9ybWFsO2ZvbnQtdmFyaWFudDpub3JtYWw7Zm9udC13ZWlnaHQ6bm9ybWFsO2ZvbnQtc3RyZXRjaDpub3JtYWw7Zm9udC1mYW1pbHk6QXJpYWw7d2hpdGUtc3BhY2U6cHJlO3NoYXBlLWluc2lkZTp1cmwoI3JlY3QxMDEzKTtkaXNwbGF5OmlubGluZTtmaWxsOiMwMDc5ZDk7ZmlsbC1vcGFjaXR5OjEiCiAgICAgdHJhbnNmb3JtPSJtYXRyaXgoMTAuOTkwNzE0LDAsMCwxMC45OTA3MTQsLTIxMC40MDIzOSwtMzU4Ni40NDMyKSI+PHRzcGFuCiAgICAgICB4PSI0My42OTMzNTkiCiAgICAgICB5PSIzNDcuNTAyNDEiCiAgICAgICBpZD0idHNwYW42MzQwIj40MDQ8L3RzcGFuPjwvdGV4dD48ZwogICAgIGlkPSJnMTM2MyIKICAgICB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0MTAuOTU0NTUsMTguNzIyMzA3KSIKICAgICBzdHlsZT0iZmlsbDojMDA3OWQ5O2ZpbGwtb3BhY2l0eToxIj48ZwogICAgICAgYXJpYS1sYWJlbD0iOigiCiAgICAgICB0cmFuc2Zvcm09Im1hdHJpeCgyMC41NzE1NSwwLDAsMjAuNTcxNTUsMjg0Ny4zOTkzLC0yMDMzLjIyNjgpIgogICAgICAgaWQ9InRleHQ3NDQiCiAgICAgICBzdHlsZT0id2hpdGUtc3BhY2U6cHJlO3NoYXBlLWluc2lkZTp1cmwoI3JlY3Q3NDYpO2ZpbGw6IzAwNzlkOTtmaWxsLW9wYWNpdHk6MSI+PHBhdGgKICAgICAgICAgZD0ibSAtMTUyLjEzODY3LDEwNi45ODA5MyBxIDAsLTEuNjkzMzYgMC41MjczNCwtMy4wNDEwMiAwLjUzMzIxLC0xLjM0NzY1IDEuNjM0NzcsLTIuNTM3MTEgaCAxLjAxOTUzIHEgLTEuMDk1NywxLjIxODc1IC0xLjYxMTMzLDIuNTg5ODUgLTAuNTA5NzYsMS4zNzEwOSAtMC41MDk3NiwzIDAsMS42MjMwNCAwLjUwMzksMi45ODgyOCAwLjUwOTc3LDEuMzY1MjMgMS42MTcxOSwyLjYwMTU2IGggLTEuMDE5NTMgcSAtMS4xMDc0MiwtMS4xOTUzMSAtMS42MzQ3NywtMi41NDI5NyAtMC41MjczNCwtMS4zNTM1MSAtMC41MjczNCwtMy4wMzUxNSB6IgogICAgICAgICBzdHlsZT0iZm9udC1mYW1pbHk6QXJpYWw7ZmlsbDojMDA3OWQ5O2ZpbGwtb3BhY2l0eToxIgogICAgICAgICBpZD0icGF0aDk1NyIgLz48L2c+PGNpcmNsZQogICAgICAgc3R5bGU9ImZpbGw6IzAwNzlkOTtmaWxsLW9wYWNpdHk6MSIKICAgICAgIGlkPSJwYXRoOTUzIgogICAgICAgY3g9Ii0zMzIuMTE0MTQiCiAgICAgICBjeT0iMTE5LjA4NDY5IgogICAgICAgcj0iMTIuODcxNTgzIiAvPjxjaXJjbGUKICAgICAgIHN0eWxlPSJmaWxsOiMwMDc5ZDk7ZmlsbC1vcGFjaXR5OjEiCiAgICAgICBpZD0iY2lyY2xlMTAwOSIKICAgICAgIGN4PSItMzMyLjExNDE0IgogICAgICAgY3k9IjIxMy44MTc0OSIKICAgICAgIHI9IjEyLjg3MTU4MyIgLz48L2c+PC9zdmc+Cg=="
src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+DQo8c3ZnDQogICB3aWR0aD0iNjg1LjIzNjI3Ig0KICAgaGVpZ2h0PSIzNjUuMDg0OSINCiAgIHZpZXdCb3g9IjAgMCA2ODUuMjM2MjcgMzY1LjA4NDkiDQogICBmaWxsPSJub25lIg0KICAgdmVyc2lvbj0iMS4xIg0KICAgaWQ9InN2ZzQ2MSINCiAgIHhtbDpzcGFjZT0icHJlc2VydmUiDQogICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxkZWZzDQogICAgIGlkPSJkZWZzNDU5Ij48cmVjdA0KICAgICAgIHg9IjQzLjY5MzExMSINCiAgICAgICB5PSIzMzYuNjkzOTciDQogICAgICAgd2lkdGg9IjYxMC40MTg0NiINCiAgICAgICBoZWlnaHQ9IjE0Ny43ODU1MiINCiAgICAgICBpZD0icmVjdDEwMTMiIC8+PHJlY3QNCiAgICAgICB4PSItMTU2LjIxNjI2Ig0KICAgICAgIHk9Ijk5LjI5MDAwMSINCiAgICAgICB3aWR0aD0iMzk0LjUxMjI3Ig0KICAgICAgIGhlaWdodD0iMzM4LjkwOTg4Ig0KICAgICAgIGlkPSJyZWN0NzQ2IiAvPjxjbGlwUGF0aA0KICAgICAgIGlkPSJjbGlwMF8xNDI6MiI+PHJlY3QNCiAgICAgICAgIHdpZHRoPSIzMTguNDEiDQogICAgICAgICBoZWlnaHQ9IjMyOC41ODcwMSINCiAgICAgICAgIGZpbGw9IiNmZmZmZmYiDQogICAgICAgICB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNzgpIg0KICAgICAgICAgaWQ9InJlY3Q0NTYiDQogICAgICAgICB4PSIwIg0KICAgICAgICAgeT0iMCIgLz48L2NsaXBQYXRoPjwvZGVmcz48dGV4dA0KICAgICB4bWw6c3BhY2U9InByZXNlcnZlIg0KICAgICBpZD0idGV4dDEwMTEiDQogICAgIHN0eWxlPSJmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO2ZvbnQtZmFtaWx5OkFyaWFsO3doaXRlLXNwYWNlOnByZTtzaGFwZS1pbnNpZGU6dXJsKCNyZWN0MTAxMyk7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDA3OWQ5O2ZpbGwtb3BhY2l0eToxIg0KICAgICB0cmFuc2Zvcm09Im1hdHJpeCgxMC45OTA3MTQsMCwwLDEwLjk5MDcxNCwtMjEwLjQwMjM5LC0zNTg2LjQ0MzIpIj48dHNwYW4NCiAgICAgICB4PSI0My42OTMzNTkiDQogICAgICAgeT0iMzQ3LjUwMjQxIg0KICAgICAgIGlkPSJ0c3BhbjYzNDAiPjQwNDwvdHNwYW4+PC90ZXh0PjxnDQogICAgIGlkPSJnMTM2MyINCiAgICAgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNDEwLjk1NDU1LDE4LjcyMjMwNykiDQogICAgIHN0eWxlPSJmaWxsOiMwMDc5ZDk7ZmlsbC1vcGFjaXR5OjEiPjxnDQogICAgICAgYXJpYS1sYWJlbD0iOigiDQogICAgICAgdHJhbnNmb3JtPSJtYXRyaXgoMjAuNTcxNTUsMCwwLDIwLjU3MTU1LDI4NDcuMzk5MywtMjAzMy4yMjY4KSINCiAgICAgICBpZD0idGV4dDc0NCINCiAgICAgICBzdHlsZT0id2hpdGUtc3BhY2U6cHJlO3NoYXBlLWluc2lkZTp1cmwoI3JlY3Q3NDYpO2ZpbGw6IzAwNzlkOTtmaWxsLW9wYWNpdHk6MSI+PHBhdGgNCiAgICAgICAgIGQ9Im0gLTE1Mi4xMzg2NywxMDYuOTgwOTMgcSAwLC0xLjY5MzM2IDAuNTI3MzQsLTMuMDQxMDIgMC41MzMyMSwtMS4zNDc2NSAxLjYzNDc3LC0yLjUzNzExIGggMS4wMTk1MyBxIC0xLjA5NTcsMS4yMTg3NSAtMS42MTEzMywyLjU4OTg1IC0wLjUwOTc2LDEuMzcxMDkgLTAuNTA5NzYsMyAwLDEuNjIzMDQgMC41MDM5LDIuOTg4MjggMC41MDk3NywxLjM2NTIzIDEuNjE3MTksMi42MDE1NiBoIC0xLjAxOTUzIHEgLTEuMTA3NDIsLTEuMTk1MzEgLTEuNjM0NzcsLTIuNTQyOTcgLTAuNTI3MzQsLTEuMzUzNTEgLTAuNTI3MzQsLTMuMDM1MTUgeiINCiAgICAgICAgIHN0eWxlPSJmb250LWZhbWlseTpBcmlhbDtmaWxsOiMwMDc5ZDk7ZmlsbC1vcGFjaXR5OjEiDQogICAgICAgICBpZD0icGF0aDk1NyIgLz48L2c+PGNpcmNsZQ0KICAgICAgIHN0eWxlPSJmaWxsOiMwMDc5ZDk7ZmlsbC1vcGFjaXR5OjEiDQogICAgICAgaWQ9InBhdGg5NTMiDQogICAgICAgY3g9Ii0zMzIuMTE0MTQiDQogICAgICAgY3k9IjExOS4wODQ2OSINCiAgICAgICByPSIxMi44NzE1ODMiIC8+PGNpcmNsZQ0KICAgICAgIHN0eWxlPSJmaWxsOiMwMDc5ZDk7ZmlsbC1vcGFjaXR5OjEiDQogICAgICAgaWQ9ImNpcmNsZTEwMDkiDQogICAgICAgY3g9Ii0zMzIuMTE0MTQiDQogICAgICAgY3k9IjIxMy44MTc0OSINCiAgICAgICByPSIxMi44NzE1ODMiIC8+PC9nPjwvc3ZnPg0K"
/>
<h1
class="MuiTypography-root MuiTypography-h1 css-5ewpze-MuiTypography-root"
Expand Down
26 changes: 21 additions & 5 deletions frontend/src/components/globalSearch/GlobalSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import InputAdornment from '@mui/material/InputAdornment';
import { useTheme } from '@mui/material/styles';
import TextField from '@mui/material/TextField';
import useMediaQuery from '@mui/material/useMediaQuery';
import { alpha } from '@mui/system/colorManipulator';
import { lazy, Suspense, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { formatShortcutKey, useShortcut, useShortcutKey } from '../../lib/useShortcut';
Expand Down Expand Up @@ -70,13 +69,23 @@ export function GlobalSearch({ isIconButton }: { isIconButton?: boolean }) {
: {
borderRadius: '4px',
fontSize: '1rem',
fontFamily: theme.typography.fontFamily,
color: theme.palette.text.secondary,
border: '1px solid',
borderColor: theme.palette.divider,
background: theme.palette.background.default,
'&:hover': { background: theme.palette.background.muted },
}
}
onClick={() => setFocused(true)}
aria-label={isIconButton ? t('Search') : undefined}
>
<Icon icon="mdi:search" width={iconSize} height={iconSize} />
<Icon
icon="mdi:search"
width={iconSize}
height={iconSize}
color={isIconButton ? undefined : theme.palette.text.primary}
/>
{!isIconButton && <Box mx={1}>{t('Search')}</Box>}
</IconButton>
) : (
Expand All @@ -88,11 +97,17 @@ export function GlobalSearch({ isIconButton }: { isIconButton?: boolean }) {
placeholder={t('Search')}
InputProps={{
sx: theme => ({
background: alpha(theme.palette.background.default, 0.7),
background: theme.palette.background.default,
}),
startAdornment: (
<InputAdornment position="start" sx={{ pointerEvents: 'none' }}>
<Icon icon="mdi:search" width={18} height={18} />
<Icon
icon="mdi:search"
width={18}
height={18}
color={theme.palette.text.primary}
aria-hidden
/>
</InputAdornment>
),
endAdornment: (
Expand Down Expand Up @@ -134,6 +149,7 @@ export function GlobalSearch({ isIconButton }: { isIconButton?: boolean }) {
variant="outlined"
placeholder={t('Search resources, pages, clusters by name')}
InputProps={{
sx: theme => ({ background: theme.palette.background.default }),
autoFocus: true,
value: placeholderValue,
onChange: e => {
Expand Down Expand Up @@ -185,7 +201,7 @@ export function GlobalSearch({ isIconButton }: { isIconButton?: boolean }) {
width: '100%',
left: 0,
right: 0,
background: theme.palette.background.default,
background: theme.palette.navbar.background,
zIndex: 1,
}
: {}),
Expand Down
2 changes: 1 addition & 1 deletion ...end/src/components/globalSearch/__snapshots__/GlobalSearch.BasicExample.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-5ntm9s-MuiInputBase-root-MuiOutlinedInput-root"
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-sizeSmall MuiInputBase-adornedStart MuiInputBase-adornedEnd css-1amr0ad-MuiInputBase-root-MuiOutlinedInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-outlined MuiInputAdornment-sizeSmall css-16yk9m0-MuiInputAdornment-root"
Expand Down
Loading