Skip to content

Commit

Permalink
Merge pull request #81 from oddbird/greenkeeper/accoutrement-scale-3.1.0
Browse files Browse the repository at this point in the history
Update accoutrement-scale to the latest version 🚀
  • Loading branch information
mirisuzanne authored May 21, 2017
2 parents 3aeeede + 6c6a71d commit 2d297e3
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dist/css/json.css

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

2 changes: 1 addition & 1 deletion dist/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/theme.css

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 @@ -25,7 +25,7 @@
"accoutrement-color": "^2.0.1",
"accoutrement-init": "^1.1.0",
"accoutrement-layout": "^2.0.0",
"accoutrement-scale": "2.0.0",
"accoutrement-scale": "3.1.0",
"accoutrement-type": "^2.0.0",
"browser-sync": "^2.17.5",
"chalk": "^1.1.3",
Expand Down
6 changes: 3 additions & 3 deletions scss/config/_scale.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ $text-sizes: (
'h2': 'root' ('herman': 2),
'h3': 'root' ('herman': 1),

'small': 18px,
'smaller': 16px,
'small': 18px ('convert-units': 'rem'),
'smaller': 16px ('convert-units': 'rem'),
);

@include herman-add-sizes('text-sizes', $text-sizes);
Expand All @@ -60,7 +60,7 @@ $text-sizes: (
/// // @preview sizes; style: ruler
/// @include herman-add-sizes('spacing-sizes', $spacing-sizes);
$spacing-sizes: (
'rhythm': 'root' ('herman': 1),
'rhythm': 'root' ('herman': 1, 'convert-units': 'rem'),
'gutter': 'rhythm',
'spacer': 'gutter' ('linear': 3),
'shim': 'gutter' ('linear': 0.5),
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ accoutrement-layout@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/accoutrement-layout/-/accoutrement-layout-2.2.0.tgz#974d4cc75a6cad10f441ab51f2e68b093667d62c"

accoutrement-scale@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/accoutrement-scale/-/accoutrement-scale-2.0.0.tgz#408331477b08143e0b2b1166c0057187dd7529e7"
accoutrement-scale@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/accoutrement-scale/-/accoutrement-scale-3.1.0.tgz#628529484c01b6eb5dd1bc63f13dcfba34fd191c"

accoutrement-type@^2.0.0:
version "2.1.0"
Expand Down

0 comments on commit 2d297e3

Please sign in to comment.