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

Introduce standard spacing to the theme #425

Merged
merged 2 commits into from
Nov 22, 2018
Merged

Introduce standard spacing to the theme #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26b12ad
feat: introduce standard spacing to the theme
fbarl Nov 22, 2018
716d1a9
fix: change '0px' to '0' in spacing theme
fbarl Nov 22, 2018
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
3 changes: 2 additions & 1 deletion src/components/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import styled from 'styled-components';
import PropTypes from 'prop-types';

import Text from '../Text';
import { spacing } from '../../theme/selectors';
import { fromAtoms } from '../../utils/theme';

const StyledAlert = styled.div`
Expand All @@ -13,7 +14,7 @@ const StyledAlert = styled.div`
margin: 8px 0 8px 0;
min-height: 1em;
opacity: ${props => (props.visible ? '1' : '0')};
padding: 1em;
padding: ${spacing('small')};
transition: opacity 0.2s linear;

a {
Expand Down
12 changes: 6 additions & 6 deletions src/components/Alert/__snapshots__/Alert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`<Alert /> snapshots renders default 1`] = `
margin: 8px 0 8px 0;
min-height: 1em;
opacity: 1;
padding: 1em;
padding: 16px;
-webkit-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
Expand Down Expand Up @@ -62,7 +62,7 @@ exports[`<Alert /> snapshots renders error 1`] = `
margin: 8px 0 8px 0;
min-height: 1em;
opacity: 1;
padding: 1em;
padding: 16px;
-webkit-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
Expand Down Expand Up @@ -112,7 +112,7 @@ exports[`<Alert /> snapshots renders icon if provided 1`] = `
margin: 8px 0 8px 0;
min-height: 1em;
opacity: 1;
padding: 1em;
padding: 16px;
-webkit-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
Expand Down Expand Up @@ -162,7 +162,7 @@ exports[`<Alert /> snapshots renders success 1`] = `
margin: 8px 0 8px 0;
min-height: 1em;
opacity: 1;
padding: 1em;
padding: 16px;
-webkit-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
Expand Down Expand Up @@ -221,7 +221,7 @@ exports[`<Alert /> snapshots renders title if provided 1`] = `
margin: 8px 0 8px 0;
min-height: 1em;
opacity: 1;
padding: 1em;
padding: 16px;
-webkit-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
Expand Down Expand Up @@ -289,7 +289,7 @@ exports[`<Alert /> snapshots renders warning 1`] = `
margin: 8px 0 8px 0;
min-height: 1em;
opacity: 1;
padding: 1em;
padding: 16px;
-webkit-transition: opacity 0.2s linear;
transition: opacity 0.2s linear;
}
Expand Down
9 changes: 9 additions & 0 deletions src/components/Input/__snapshots__/Input.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,15 @@ exports[`<Input /> should render correctly 1`] = `
"tooltip": 6,
},
"overlayIconSize": "300px",
"spacing": Object {
"base": "24px",
"large": "48px",
"none": "0px",
"small": "16px",
"xl": "64px",
"xs": "8px",
"xss": "4px",
},
"textColor": "hsl(0, 0%, 10%)",
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/theme/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { colors, themeColorsAsScss } from './colors';
import { fontSizes, fontFamilies, themeFontsAsScss } from './fonts';
import { borderRadius, themeBorderRadiiAsScss } from './borders';
import { layers, themeLayersAsScss } from './layers';
import { spacing, themeSpacingsAsScss } from './spacings';
import { overlayIconSize, textColor, themeMiscVarsAsScss } from './misc';
import { boxShadow } from './box-shadows';
import { atoms } from './atoms';
Expand All @@ -12,6 +13,7 @@ export function themeVarsAsScss() {
.concat(themeLayersAsScss())
.concat(themeFontsAsScss())
.concat(themeBorderRadiiAsScss())
.concat(themeSpacingsAsScss())
.concat(themeMiscVarsAsScss());
return `${themeVariables.join('; ')};`;
}
Expand All @@ -36,6 +38,9 @@ const theme = {
// z-index layers
layers,

// Spacings
spacing,

// Misc
overlayIconSize,
textColor,
Expand Down
1 change: 1 addition & 0 deletions src/theme/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ export const boxShadow = themeSelector('boxShadow');
export const borderRadius = themeSelector('borderRadius');
export const color = themeSelector('colors');
export const fontSize = themeSelector('fontSizes');
export const spacing = themeSelector('spacing');
22 changes: 22 additions & 0 deletions src/theme/spacings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { forEach } from 'lodash';

export const spacing = {
none: '0px',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need this? and if so would it be better as just 0 seeing as unit is irrelevant and often times you want to explicitly have no border with border: 0 as opposed to a border of 0px width. Semantics ¯\(ツ)/¯

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need this?

I put it there just in case, so that if we ever decided to enforce the linting rules, we don't have come back to this just to add the zero :)

...would it be better as just 0 seeing as unit...

Agree, will make the change.

xss: '4px',
xs: '8px',
small: '16px',
base: '24px',
large: '48px',
xl: '64px',
};

// Collects all theme spacing vars as SCSS vars.
export function themeSpacingsAsScss() {
const themeSpacings = [];

forEach(spacing, (value, name) => {
themeSpacings.push(`$spacing-${name}: ${value}`);
});

return themeSpacings;
}