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

Jump to bottom

Field desc fixups #2252

Merged
merged 6 commits into from
Nov 8, 2022
Merged

Field desc fixups #2252

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b4adf4
increase field tooltip delay
ritch Nov 7, 2022
7902200
fix field info tooltip colors
ritch Nov 7, 2022
6e3e81d
fix looker loading and background in flashlight for light mode
ritch Nov 7, 2022
0acfad4
updating lock
brimoor Nov 7, 2022
8f21512
remove stray logs
ritch Nov 7, 2022
4e9c173
fix field info light borders
ritch Nov 7, 2022
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: 2 additions & 0 deletions app/packages/components/src/components/ThemeProvider/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ let theme = extendJoyTheme({
level1: "hsl(200, 0%, 95%)",
level2: "hsl(200, 0%, 98%)",
level3: "hsl(200, 0%, 95%)",
looker: "hsl(200, 0%, 95%)",
mediaSpace: "hsl(200,0%,98%)",
modalBackdrop: "hsl(200, 0%, 0%, 0.5)",
sidebar: "hsl(200, 0%, 100%)",
Expand Down Expand Up @@ -69,6 +70,7 @@ let theme = extendJoyTheme({
header: "hsl(200, 0%, 15%)",
itemBackground: "hsl(200,0%,20%)",
body: "hsl(200, 0%, 15%)",
looker: "hsl(200, 0%, 10%)",
level1: "hsl(200, 0%, 20%)",
level2: "hsl(200, 0%, 10%)",
level3: "hsl(200, 0%, 5%)",
Expand Down
16 changes: 13 additions & 3 deletions app/packages/core/src/components/FieldLabelAndInfo/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function useFieldInfo(field, nested, { expandedPath, color }) {
setSelectedField(null);
}

const delay = 300;
const delay = 500;
useHover(hoverTarget, delay, onHover, onHoverEnd);

useEffect(() => {
Expand Down Expand Up @@ -111,7 +111,12 @@ export default function FieldLabelAndInfo({
}

const FieldInfoExpandedContainer = styled.div`
background: ${({ theme }) => theme.background.body};
background: ${({ theme }) => {
if (theme.mode === "light") {
return theme.background.header;
}
return theme.background.body;
}};
border-left: 5px solid ${({ color }) => color};
border-radius: 2px;
padding: 0.5rem;
Expand Down Expand Up @@ -179,7 +184,12 @@ const FieldInfoTableContainer = styled.table`
padding: 0.1rem 0.5rem;
}
tr {
background: ${({ theme }) => theme.background.level1};
background: ${({ theme }) => {
if (theme.mode === "light") {
return theme.background.level1;
}
return theme.background.level1;
}};
}
tr + tr {
border-top: solid 2px ${({ theme }) => theme.background.body};
Expand Down
2 changes: 1 addition & 1 deletion app/packages/looker/src/elements/common/looker.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
height: 100%;
font-family: "Palanquin", sans-serif;
font-weight: bold;
background: transparent;
background: var(--joy-palette-background-looker);
outline: none;
border: none;
}
Expand Down