Skip to content
This repository has been archived by the owner on Oct 6, 2020. It is now read-only.

feat(Button): Icon support and default style updates #51

Merged
merged 37 commits into from
Aug 21, 2019
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f4d33a7
Saving progress on button updates
jadenlemmon Jul 29, 2019
01b6ef8
Conform molekule to heydoctor new button styles
jadenlemmon Aug 2, 2019
951f6b7
Another button group example
jadenlemmon Aug 2, 2019
d737aee
Update snapshots
jadenlemmon Aug 2, 2019
64855ad
Update docs/wrapper.js
jadenlemmon Aug 4, 2019
1d5c0fe
Additional variant updates
jadenlemmon Aug 4, 2019
048f5d6
Addressing color updates
jadenlemmon Aug 4, 2019
e3728b8
Minor updates
jadenlemmon Aug 5, 2019
c26ba39
Snapshots
jadenlemmon Aug 5, 2019
37ca9df
Trigger deploy
jadenlemmon Aug 7, 2019
e45a541
Try to fix build
jadenlemmon Aug 7, 2019
9e8f537
Merge branch 'master' into feat/patient-rd-button
jadenlemmon Aug 7, 2019
e0e188d
Update src/theme.js
jadenlemmon Aug 9, 2019
a1fd9b9
Removes additional whitespace and "f"
mathewmorris Aug 9, 2019
e775927
Refactors Button styling
mathewmorris Aug 12, 2019
77a2f88
Fixes loading symbol
mathewmorris Aug 12, 2019
c0e765c
Fixes outline prop button
mathewmorris Aug 12, 2019
357bbb4
Adds seondary button to docs
mathewmorris Aug 12, 2019
be6f2d8
Adds prop checks for `text` prop
mathewmorris Aug 12, 2019
759a837
Fixes spacing with icon button
mathewmorris Aug 12, 2019
cf154ac
Fixes padding
mathewmorris Aug 12, 2019
170e248
Simplifies Button base component
mathewmorris Aug 15, 2019
dba3eed
Makes Icon in Button better
mathewmorris Aug 15, 2019
9e6a0c9
Fixes Button text in docs
mathewmorris Aug 15, 2019
b1fbeb6
Make connected Button group
mathewmorris Aug 15, 2019
72b1b47
Merge remote-tracking branch 'origin/v5' into feat/patient-rd-button
jadenlemmon Aug 19, 2019
fdd2478
Clean up merge
jadenlemmon Aug 19, 2019
856cb06
Remove duplicate grey variant
kylealwyn Aug 20, 2019
9b6619b
fix: Updated proposal to configure components via size props (#63)
kylealwyn Aug 20, 2019
cfe2194
Remove button outline, Clean up prop variable
jadenlemmon Aug 20, 2019
67c9b5a
Update snapshot
jadenlemmon Aug 20, 2019
24ab262
Update button icon support
jadenlemmon Aug 20, 2019
e8f8be0
Indentation and lint issue
kylealwyn Aug 21, 2019
fe46246
Remove unused buttonIconSizes theme field
kylealwyn Aug 21, 2019
17cd936
Remove fonts from theme
kylealwyn Aug 21, 2019
8647072
Remove button icon default props
kylealwyn Aug 21, 2019
e8621a5
feat: Button variant styling proposal (#66)
kylealwyn Aug 21, 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
51 changes: 33 additions & 18 deletions docs/wrapper.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,37 @@
import React, { Component } from 'react';
import { createGlobalStyle } from 'styled-components';
import React from 'react';
import { createGlobalStyle, css } from 'styled-components';
import { ThemeProvider } from '../src';

const GlobalStyle = createGlobalStyle `
* {
box-sizing: border-box;
}
`
const GlobalStyle = createGlobalStyle`
${({ theme }) => css`
${theme.fonts.map(
font => css`
@font-face {f
mathewmorris marked this conversation as resolved.
Show resolved Hide resolved
font-family: "${font.name}";
font-weight: ${font.weight || 500};
font-style: normal;
src: url(${font.url}) format("${font.format || 'woff2'}");
mathewmorris marked this conversation as resolved.
Show resolved Hide resolved
}
`
)}

class App extends Component {
render() {
return (
<>
<GlobalStyle />
<ThemeProvider>{this.props.children}</ThemeProvider>
</>
);
}
}
* {
font-family: "${theme.typography.bodyFontFamily}", sans-serif !important;
}

export default App;
h1 {
font-family: "${theme.typography.headerFontFamily}", serif !important;
font-size: 38px;
color: ${theme.colors.black};
}
`}
`;

export default ({ children }) => (
<ThemeProvider>
<>
<GlobalStyle />
{children}
</>
</ThemeProvider>
);
71 changes: 33 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"react-router-dom": "^4.2.2",
"react-testing-library": "^6.0.0",
"rimraf": "^2.6.3",
"rollup": "^1.2.2",
"rollup": "^1.17.0",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-filesize": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Alert/Alert.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Alerts are typically used to display meaningful copy to users - typically notify

<PropsTable of={Alert} />

## Exammples
## Examples
mathewmorris marked this conversation as resolved.
Show resolved Hide resolved

<Playground>
<Alert variant="success">
Expand Down
10 changes: 5 additions & 5 deletions src/Badge/__snapshots__/Badge.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
exports[`Badge 1`] = `
<DocumentFragment>
.c0 {
padding: 4px 8px;
font-size: 12px;
padding: 4.666666666666667px 9.333333333333334px;
mathewmorris marked this conversation as resolved.
Show resolved Hide resolved
font-size: 14px;
font-family: inherit;
font-weight: bold;
border-radius: 12px;
background: #C8E8FF;
color: #006DC1;
border-radius: 14px;
background: #CADCFF;
color: #0958F3;
}

<span
Expand Down
Loading