Skip to content
This repository has been archived by the owner on Aug 22, 2023. It is now read-only.

Commit

Permalink
Merge pull request #12 from up42/develop
Browse files Browse the repository at this point in the history 
Production Release
  • Loading branch information
Matteo Pescarin authored Nov 25, 2019
2 parents d9a8305 + 3423d5e commit 0f6941c
Show file tree
Hide file tree
Showing 17 changed files with 148 additions and 43 deletions.
3 changes: 3 additions & 0 deletions dist/assets/tokens/tokens.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
"marketing_desktop_font_size_body_small": "1rem",
"marketing_desktop_font_size_label_default": "1.125rem",
"marketing_desktop_font_size_label_small": "0.889rem",
"marketing_desktop_font_size_label_xsmall": "0.79rem",
"marketing_desktop_font_size_code_default": "0.889rem",
"marketing_desktop_font_size_nav_default": "1rem",
"marketing_desktop_font_size_nav_small": "0.889rem",
Expand All @@ -125,9 +126,11 @@
"marketing_mobile_font_size_body_small": "0.889rem",
"marketing_mobile_font_size_label_default": "1rem",
"marketing_mobile_font_size_label_small": "0.889rem",
"marketing_mobile_font_size_label_xsmall": "0.79rem",
"marketing_mobile_font_size_code_default": "0.889rem",
"marketing_mobile_font_size_nav_default": "0.889rem",
"marketing_mobile_font_size_nav_small": "0.889rem",
"marketing_line_height_7_1": "1.265",
"marketing_line_height_10": "1.5",
"marketing_line_height_11": "1.56",
"marketing_line_height_12": "1.58",
Expand Down
3 changes: 3 additions & 0 deletions dist/assets/tokens/tokens.map.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ $tokens-map: (
'marketing-desktop-font-size-body-small': (1rem),
'marketing-desktop-font-size-label-default': (1.125rem),
'marketing-desktop-font-size-label-small': (0.889rem),
'marketing-desktop-font-size-label-xsmall': (0.79rem),
'marketing-desktop-font-size-code-default': (0.889rem),
'marketing-desktop-font-size-nav-default': (1rem),
'marketing-desktop-font-size-nav-small': (0.889rem),
Expand All @@ -126,9 +127,11 @@ $tokens-map: (
'marketing-mobile-font-size-body-small': (0.889rem),
'marketing-mobile-font-size-label-default': (1rem),
'marketing-mobile-font-size-label-small': (0.889rem),
'marketing-mobile-font-size-label-xsmall': (0.79rem),
'marketing-mobile-font-size-code-default': (0.889rem),
'marketing-mobile-font-size-nav-default': (0.889rem),
'marketing-mobile-font-size-nav-small': (0.889rem),
'marketing-line-height-7-1': (1.265),
'marketing-line-height-10': (1.5),
'marketing-line-height-11': (1.56),
'marketing-line-height-12': (1.58),
Expand Down
21 changes: 21 additions & 0 deletions dist/assets/tokens/tokens.raw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,13 @@
"value": "0.889rem",
"originalValue": "{!ms_major_second_-2}"
},
"marketing_desktop_font_size_label_xsmall": {
"type": "number",
"category": "font-size",
"name": "marketing_desktop_font_size_label_xsmall",
"value": "0.79rem",
"originalValue": "{!ms_major_second_-3}"
},
"marketing_desktop_font_size_code_default": {
"type": "number",
"category": "font-size",
Expand Down Expand Up @@ -1238,6 +1245,13 @@
"value": "0.889rem",
"originalValue": "{!ms_major_second_-2}"
},
"marketing_mobile_font_size_label_xsmall": {
"type": "number",
"category": "font-size",
"name": "marketing_mobile_font_size_label_xsmall",
"value": "0.79rem",
"originalValue": "{!ms_major_second_-3}"
},
"marketing_mobile_font_size_code_default": {
"type": "number",
"category": "font-size",
Expand All @@ -1259,6 +1273,13 @@
"value": "0.889rem",
"originalValue": "{!ms_major_second_-2}"
},
"marketing_line_height_7_1": {
"type": "number",
"category": "line-height",
"value": "1.265",
"originalValue": "1.265",
"name": "marketing_line_height_7_1"
},
"marketing_line_height_10": {
"type": "number",
"category": "line-height",
Expand Down
3 changes: 3 additions & 0 deletions dist/assets/tokens/tokens.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ $marketing-desktop-font-size-body-default: 1.125rem;
$marketing-desktop-font-size-body-small: 1rem;
$marketing-desktop-font-size-label-default: 1.125rem;
$marketing-desktop-font-size-label-small: 0.889rem;
$marketing-desktop-font-size-label-xsmall: 0.79rem;
$marketing-desktop-font-size-code-default: 0.889rem;
$marketing-desktop-font-size-nav-default: 1rem;
$marketing-desktop-font-size-nav-small: 0.889rem;
Expand All @@ -125,9 +126,11 @@ $marketing-mobile-font-size-body-default: 1rem;
$marketing-mobile-font-size-body-small: 0.889rem;
$marketing-mobile-font-size-label-default: 1rem;
$marketing-mobile-font-size-label-small: 0.889rem;
$marketing-mobile-font-size-label-xsmall: 0.79rem;
$marketing-mobile-font-size-code-default: 0.889rem;
$marketing-mobile-font-size-nav-default: 0.889rem;
$marketing-mobile-font-size-nav-small: 0.889rem;
$marketing-line-height-7-1: 1.265;
$marketing-line-height-10: 1.5;
$marketing-line-height-11: 1.56;
$marketing-line-height-12: 1.58;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/marketing.css
View file

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

Loading

0 comments on commit 0f6941c

Please sign in to comment.