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

More small css tweaks #25

Merged
merged 2 commits into from
May 23, 2019
Merged

More small css tweaks #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff702d
More small css tweaks
jacogr May 23, 2019
d70f2c5
Adjust Tip width
jacogr May 23, 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
4 changes: 2 additions & 2 deletions packages/extension-ui/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default styled(Header)`
color: ${defaults.hdrColor};
font-family: ${defaults.fontFamily};
font-weight: normal;
margin: 0 -0.75rem;
padding: 0.5rem 1rem;
margin: 0 -1rem;
padding: 0.75rem 1rem;
text-transform: uppercase;
`;
4 changes: 2 additions & 2 deletions packages/extension-ui/src/components/Tip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export default styled(Tip)`
color: ${(props) =>
getColor(props).color
};
margin: ${defaults.boxMargin};
padding: 1rem 1.25rem;
margin: 0.75rem -1rem;
padding: 1rem 1.5rem;

h3 {
color: ${(props) =>
Expand Down
13 changes: 7 additions & 6 deletions packages/extension-ui/src/components/defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
// of the Apache-2.0 license. See the LICENSE file for details.

const DANGER_COLOR = '#c00';
const LABEL_COLOR = '#878786';
const LINK_COLOR = '#3367d6';
const TEXT_COLOR = '#4e4e4e';
const TEXT_COLOR = '#4d4e4f';

const defaults: { [index: string]: any } = {
borderRadius: '0.25rem',
btnBg: LINK_COLOR,
btnBg: TEXT_COLOR, // LINK_COLOR,
btnBgDanger: DANGER_COLOR,
btnBorder: `0px solid `,
btnBorder: `0 solid `,
btnColor: '#fff',
btnColorDanger: '#fff',
btnPadding: '0.75rem 1rem',
Expand All @@ -21,11 +22,11 @@ const defaults: { [index: string]: any } = {
color: TEXT_COLOR,
fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
fontSize: '1rem',
hdrBg: '#e2e1e0',
hdrColor: '#878786',
hdrBg: 'transparent', // '#f5f6f7',
hdrColor: LABEL_COLOR,
inputBorder: '#ccc',
inputPadding: '0.5rem 0.75rem',
labelColor: '878786',
labelColor: LABEL_COLOR,
lineHeight: '1.25',
linkColor: LINK_COLOR,
linkColorDanger: DANGER_COLOR,
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/public/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>polkadot{.js}</title>
</head>
<body style="background:#e2e1e0; box-sizing:border-box; height:580px; margin:0; padding:0 0.75rem; width:480px;">
<body style="background:#f5f6f7; box-sizing:border-box; height:580px; margin:0; padding:0 1rem; width:480px;">
<div id="root"></div>
<script src='./popup.js'></script>
</body>
Expand Down