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

Update colors for compatibility with the dark theme #701

Closed
wants to merge 3 commits into from
Closed

Update colors for compatibility with the dark theme #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8025715
Update colors for compatibility with the dark theme
tspnn Jun 7, 2023
0a6e7a3
Add fallback values in CSS
tspnn Jun 7, 2023
00eb7a5
Lint
tspnn Jun 7, 2023
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
7 changes: 5 additions & 2 deletions wagtail_localize/static_src/common/components/Section/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ const Title = styled.div`
box-sizing: border-box;
height: 40px;
-webkit-font-smoothing: auto;
background-color: var(--w-color-secondary-50);
color: var(--w-color-secondary);
background-color: var(
--w-color-surface-header,
var(--w-color-secondary-50)
);
color: var(--w-color-text-label, var(--w-color-secondary));
padding: 1em 0 1em 1.5em;
font-size: 0.95em;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion wagtail_localize/static_src/editor/components/TranslationEditor/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const EditorHeader: FunctionComponent<EditorHeaderProps> = ({
translations,
}) => {
return (
<header className="w-flex w-flex-col sm:w-flex-row w-items-center w-justify-between w-bg-grey-50 w-border-b w-border-grey-100 w-px-0 w-py-0 w-mb-0 w-relative w-top-0 sm:w-sticky w-min-h-slim-header">
<header className="w-flex w-flex-col sm:w-flex-row w-items-center w-justify-between w-border-b w-border-grey-100 w-px-0 w-py-0 w-mb-0 w-relative w-top-0 sm:w-sticky w-min-h-slim-header">
<div className="w-pl-slim-header w-min-h-slim-header sm:w-pl-5 sm:w-pr-2 w-w-full w-flex-1 w-overflow-x-auto w-box-border">
<div className="w-flex w-flex-1 w-items-center w-overflow-hidden w-h-slim-header">
<LocaleMeta
Expand Down
26 changes: 16 additions & 10 deletions wagtail_localize/static_src/editor/components/TranslationEditor/segments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ const SingleLineTextArea: FunctionComponent<SingleLineTextAreaProps> = ({
};

export const BlockLabel = styled.h3`
color: var(--w-color-secondary-100);
border: 1px solid #f5f5f5;
border: 1px solid
var(--w-color-border-furniture, var(--w-color-secondary-100));
padding-left: 11px;
padding-right: 11px;
padding-top: 7px;
Expand All @@ -260,8 +260,8 @@ export const BlockLabel = styled.h3`

const BlockSegments = styled.ul`
list-style-type: none;
border: 1px solid #eeeeee;
background-color: #f1f1f1;
border: 1px solid var(--w-color-border-field-default, #eeeeee);
background-color: var(--w-color-surface-field, #f1f1f1);
padding: 0;
margin: 0;

Expand Down Expand Up @@ -297,7 +297,7 @@ const BlockSegments = styled.ul`
const SegmentFieldLabel = styled.h4`
margin: 0;
padding: 15px 20px;
background-color: var(--w-color-secondary-50);
background-color: var(--w-color-surface-field, var(--w-color-secondary-50));
font-style: normal;
font-weight: bold;
padding-left: 20px;
Expand All @@ -308,7 +308,6 @@ const SegmentSource = styled.p`
font-style: italic;

&.title {
color: var(--w-color-grey-600);
font-size: 1.875rem;
font-weight: 800;
line-height: 1.3;
Expand All @@ -331,14 +330,21 @@ const SegmentValue = styled.div`
const ActionButton = styled.button`
font-size: 0.8em;
font-weight: bold;
color: var(--w-color-secondary);
background-color: var(--w-color-secondary-50);
border: 2px solid var(--w-color-secondary-100);
color: var(--w-color-text-button, var(--w-color-secondary));
background-color: var(
--w-color-surface-button-default,
var(--w-color-secondary-50)
);
border: 1px solid
var(--w-color-surface-button-default, var(--w-color-secondary-100));
border-radius: 2px;
padding: 5px 10px;

&:hover {
background-color: var(--w-color-secondary-75);
background-color: var(
--w-color-surface-button-hover,
var(--w-color-secondary-75)
);
}
`;

Expand Down