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

Playtesting Followup: General Styling Fixes #194

Merged
merged 6 commits into from
Dec 3, 2022
Merged

Playtesting Followup: General Styling Fixes #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
423c4e4
Reduce toast height by 1px
Dec 2, 2022
f6e46f4
Reduce top padding in definitions panel
Dec 2, 2022
ea2d976
Change hover state of call out box
Dec 2, 2022
61cfa45
Hover state for active breakdown should be blue
Dec 2, 2022
6c8ef2e
Adjust onboarding faded container to be below the bordered header in …
Dec 2, 2022
e20ebe3
adjust position of publish box in different PR - reverting
Dec 2, 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: 1 addition & 1 deletion common/components/Toast/Toast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const showToast = (
}
toastElement.style.cssText = `
width: auto;
height: ${HEADER_BAR_HEIGHT}px;
height: ${HEADER_BAR_HEIGHT - 1}px;
display: flex;
align-items: center;
background: ${toastBackgroundColor};
Expand Down
8 changes: 5 additions & 3 deletions publisher/src/components/MetricConfiguration/MetricConfiguration.styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ export const Metric = styled.div<{ inView: boolean }>`
inView ? palette.highlight.lightblue1 : `none`};

&:hover {
background: ${palette.highlight.grey1};
background: ${({ inView }) =>
inView ? palette.highlight.lightblue1 : palette.highlight.grey1};
cursor: pointer;
}

Expand Down Expand Up @@ -379,7 +380,8 @@ export const Dimension = styled.div<{ enabled?: boolean; inView?: boolean }>`
inView ? palette.highlight.lightblue1 : `none`};

&:hover {
background: ${palette.highlight.grey1};
background: ${({ inView }) =>
inView ? palette.highlight.lightblue1 : palette.highlight.grey1};
cursor: pointer;
}

Expand Down Expand Up @@ -619,7 +621,7 @@ export const DefinitionsDisplayContainer = styled.div`
display: flex;
flex-direction: column;
flex: 1 1 55%;
padding: 48px 12px 50px 70px;
padding: 18px 12px 50px 70px;
overflow-y: scroll;

@media only screen and (max-width: ${METRICS_VIEW_CONTAINER_BREAKPOINT}px) {
Expand Down
4 changes: 2 additions & 2 deletions publisher/src/components/MetricConfiguration/RaceEthnicities.styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const CalloutBox = styled.div`
border-radius: 2px;
border: 1px solid ${palette.solid.blue};
box-shadow: 0px 2px 4px rgba(0, 115, 229, 0.25);
transition: box-shadow 0.3s ease;
transition: 0.2s ease;

svg {
position: absolute;
Expand All @@ -75,7 +75,7 @@ export const CalloutBox = styled.div`

&:hover {
cursor: pointer;
box-shadow: 0px 0px 0px rgba(0, 115, 229, 0.25);
background-color: ${palette.highlight.blue};
}
`;

Expand Down
3 changes: 2 additions & 1 deletion publisher/src/components/Onboarding/Onboarding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// =============================================================================

import {
HEADER_BAR_HEIGHT,
palette,
typography,
} from "@justice-counts/common/components/GlobalStyles";
Expand Down Expand Up @@ -308,7 +309,7 @@ const OnboardingFadedContainer = styled.div<OnboardingFadedContainerProps>`
background: ${palette.solid.white};
opacity: 0.7;
position: absolute;
top: 0;
top: ${HEADER_BAR_HEIGHT}px;
${({ position }) => {
if (position === "left") {
return `
Expand Down