Skip to content

Change background color #39

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 1 commit into from
Nov 29, 2019
Merged

Change background color #39

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
6 changes: 2 additions & 4 deletions packages/extension-ui/src/Popup/Accounts/Account.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import styled from 'styled-components';
import { ActionContext, Address, Link } from '../../components';
import { editAccount } from '../../messaging';
import { Name } from '../../partials';
import { AccountInfoRow } from '../../components/Address';

interface Props extends AccountJson {
address: string;
Expand Down Expand Up @@ -81,9 +80,8 @@ const MenuItem = styled(Link)`
MenuItem.displayName = 'MenuItem';

export default styled(Account)`
${AccountInfoRow} {
border: 1px solid ${({ theme }): string => theme.boxBorderColor};
box-sizing: border-box;
${Address} {
margin-bottom: 8px;
}

.edit-name {
Expand Down
8 changes: 6 additions & 2 deletions packages/extension-ui/src/components/Address.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,16 @@ function Address ({ address, className, children, genesisHash, name, actions }:
);
}

export const AccountInfoRow = styled.div`
const AccountInfoRow = styled.div`
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
height: 72px;
margin-bottom: 8px;
border-radius: 4px;
&:not(:last-child) {
margin-bottom: 8px;
}
`;

const Info = styled.div`
Expand Down Expand Up @@ -181,6 +183,8 @@ export default styled(Address)`

& > div {
background: ${({ theme }): string => theme.accountBackground};
border: 1px solid ${({ theme }): string => theme.boxBorderColor};
box-sizing: border-box;
border-radius: 4px;
}

Expand Down
1 change: 0 additions & 1 deletion packages/extension-ui/src/components/TextInputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const TextInput = css<Props>`
border-radius: ${({ theme }): string => theme.borderRadius};
border: ${({ theme }): string => `1px solid ${theme.inputBorderColor}`};
outline: none;
box-shadow: 0 0 40px ${({ theme }): string => theme.boxShadow};
box-sizing: border-box;
display: block;
font-family: ${({ theme }): string => theme.fontFamily};
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-ui/src/components/themes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

const darkTheme = {
id: 'dark',
background: '#14151A',
background: '#181A23',
highlightedAreaBackground: '#0B0C10',
popupBackground: '#0B0C10',
accountBackground: '#0B0C10',
Expand Down