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

ui v2: button style updates #741

Merged
merged 3 commits into from
Dec 4, 2020
Merged

ui v2: button style updates #741

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b69659
button style updatse
danielhochman Dec 4, 2020
79e42ad
Update frontend/packages/core/src/button.tsx
danielhochman Dec 4, 2020
00f26c0
Update button.tsx
dschaller Dec 4, 2020
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
24 changes: 15 additions & 9 deletions frontend/packages/core/src/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const COLORS = {
neutral: {
background: {
primary: "#FFFFFF",
hover: "#EFF0F2",
hover: "#E7E7EA",
active: "#CFD3D7",
disabled: "#FFFFFF",
},
Expand All @@ -18,18 +18,18 @@ const COLORS = {
primary: {
background: {
primary: "#3548D4",
hover: "#7680E8",
active: "#1B31C6",
disabled: "#7680E8",
hover: "#2D3DB4",
active: "#2938A5",
disabled: "#E7E7EA",
},
font: "#FFFFFF",
},
danger: {
background: {
primary: "#DB3615",
hover: "#FF6441",
active: "#E32E11",
disabled: "#FF3E1C",
hover: "#BA2E12",
active: "#AB2A10",
disabled: "#F1B3A6",
},
font: "#FFFFFF",
},
Expand All @@ -38,9 +38,12 @@ const COLORS = {
const StyledButton = styled(MuiButton)(
{
borderRadius: "4px",
fontWeight: 700,
fontWeight: 500,
lineHeight: "20px",
fontSize: "16px",
textTransform: "none",
padding: "0.875rem 2rem",
height: "48px",
padding: "14px 32px",
margin: "2rem .875rem",
},
props => ({
Expand All @@ -62,6 +65,9 @@ const StyledButton = styled(MuiButton)(

const OutlinedButton = styled(StyledButton)({
border: "1px solid #0D1030",
"&.Mui-disabled": {
borderColor: "rgba(13, 16, 48, 0.1)",
},
});

export interface ButtonProps
Expand Down