Skip to content

Commit

Permalink
fix: update layout tokens to match IDL (carbon-design-system#470)
Browse files Browse the repository at this point in the history
* fix: append additional spacing tokens
  • Loading branch information
vpicone authored Apr 8, 2019
1 parent 170f15a commit 1ec8bfb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
11 changes: 10 additions & 1 deletion packages/layout/scss/_spacing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ $carbon--spacing-06: carbon--mini-units(3) !default;
$carbon--spacing-07: carbon--mini-units(4) !default;
$carbon--spacing-08: carbon--mini-units(5) !default;
$carbon--spacing-09: carbon--mini-units(6) !default;
$carbon--spacing-10: carbon--mini-units(8) !default;
$carbon--spacing-11: carbon--mini-units(10) !default;
$carbon--spacing-12: carbon--mini-units(12) !default;

$carbon--spacing: (
$carbon--spacing-01,
Expand All @@ -26,7 +29,10 @@ $carbon--spacing: (
$carbon--spacing-06,
$carbon--spacing-07,
$carbon--spacing-08,
$carbon--spacing-09
$carbon--spacing-09,
$carbon--spacing-10,
$carbon--spacing-11,
$carbon--spacing-12
) !default;

$spacing-01: $carbon--spacing-01 !default;
Expand All @@ -38,6 +44,9 @@ $spacing-06: $carbon--spacing-06 !default;
$spacing-07: $carbon--spacing-07 !default;
$spacing-08: $carbon--spacing-08 !default;
$spacing-09: $carbon--spacing-09 !default;
$spacing-09: $carbon--spacing-10 !default;
$spacing-09: $carbon--spacing-11 !default;
$spacing-09: $carbon--spacing-12 !default;

$carbon--layout-01: carbon--mini-units(2) !default;
$carbon--layout-02: carbon--mini-units(3) !default;
Expand Down
8 changes: 7 additions & 1 deletion packages/layout/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function em(px) {

/**
* Convert a given px unit to its string representation
* @param {number} px
* @param {number} value - number of pixels
* @returns {string}
*/
export function px(value) {
Expand Down Expand Up @@ -95,6 +95,9 @@ export const spacing06 = miniUnits(3);
export const spacing07 = miniUnits(4);
export const spacing08 = miniUnits(5);
export const spacing09 = miniUnits(6);
export const spacing10 = miniUnits(8);
export const spacing11 = miniUnits(10);
export const spacing12 = miniUnits(12);
export const spacing = [
spacing01,
spacing02,
Expand All @@ -105,6 +108,9 @@ export const spacing = [
spacing07,
spacing08,
spacing09,
spacing10,
spacing11,
spacing12,
];

// Layout
Expand Down

0 comments on commit 1ec8bfb

Please sign in to comment.