Skip to content

add new background color #49

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

Merged
vanruch merged 4 commits into from
Dec 11, 2019
Merged

add new background color #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1601388
add new background color
Dec 10, 2019
4811199
requested changes
Dec 11, 2019
83e898a
Merge branch 'master' into background-color
Dec 11, 2019
ee69626
Apply suggestions from code review
vanruch Dec 11, 2019
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
13 changes: 10 additions & 3 deletions packages/extension-ui/src/components/View.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// of the Apache-2.0 license. See the LICENSE file for details.

import React, { useState } from 'react';
import styled, { ThemeProvider } from 'styled-components';
import { AvailableThemes, chooseTheme, themes, ThemeSwitchContext } from '.';
import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
import { AvailableThemes, chooseTheme, themes, ThemeSwitchContext, Theme } from '.';

interface Props {
children: React.ReactNode;
Expand All @@ -22,6 +22,7 @@ function View ({ children, className }: Props): React.ReactElement<Props> {
return (
<ThemeSwitchContext.Provider value={switchTheme}>
<ThemeProvider theme={themes[theme]}>
<BodyTheme theme={themes[theme]} />
<Main className={className}>
{children}
</Main>
Expand All @@ -30,6 +31,12 @@ function View ({ children, className }: Props): React.ReactElement<Props> {
);
}

const BodyTheme = createGlobalStyle<{ theme: Theme }>`
body {
background-color: ${({ theme }): string => theme.bodyColor};
}
`;

const Main = styled.main`
display: flex;
flex-direction: column;
Expand All @@ -39,7 +46,7 @@ const Main = styled.main`
font-size: ${({ theme }): string => theme.fontSize};
line-height: ${({ theme }): string => theme.lineHeight};
border: 1px solid ${({ theme }): string => theme.inputBorderColor};

* {
font-family: ${({ theme }): string => theme.fontFamily};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/extension-ui/src/components/themes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
const darkTheme = {
id: 'dark',
background: '#181A23',
bodyColor: '#20222A',
highlightedAreaBackground: '#0B0C10',
popupBackground: '#0B0C10',
accountBackground: '#0B0C10',
Expand Down Expand Up @@ -44,6 +45,7 @@ const lightTheme: Theme = {
...darkTheme,
id: 'light',
background: '#FFFFFF',
bodyColor: '#FFFFFF',
highlightedAreaBackground: '#F4F5F7',
accountBackground: '#FFFFFF',
popupBackground: '#FFFFFF',
Expand Down