Skip to content

Commit

Permalink
fix(lerna): add tokens as a depndency of styles (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gael-boyenval
gael-boyenval committed Jun 18, 2019
1 parent 0be97f1 commit 0fe3ec3
Show file tree
Hide file tree
Showing 15 changed files with 5,840 additions and 332 deletions.
1 change: 1 addition & 0 deletions .stylelintignore
View file
@@ -0,0 +1 @@
packages/tokens/
3 changes: 2 additions & 1 deletion package.json
View file
Expand Up @@ -95,10 +95,11 @@
"git add"
]
},
"browserslist": "> 1%",
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
}
}
}
11 changes: 10 additions & 1 deletion packages/css-dev-tools/postcssPluginConfig.js
View file
Expand Up @@ -11,7 +11,16 @@ const plugins = [
stylelint({ config: styleLintConfig }),
reporter({ clearReportedMessages: true }),
nodeSass({
includePaths: ['node_modules/@mozaic-ds/styles/'],
includePaths: [
'./node_modules/@mozaic-ds/styles/',
'./node_modules/@mozaic-ds/styles/settings-tools/',
'./node_modules/@mozaic-ds/styles/typography/',
'./node_modules/@mozaic-ds/styles/layout/',
'./node_modules/@mozaic-ds/styles/utilities/',
'./node_modules/@mozaic-ds/styles/components/',
'./node_modules/@mozaic-ds/tokens/build/scss/',
'./node_modules/',
],
outputStyle: 'expanded',
indentWidth: 2,
}),
Expand Down
7 changes: 5 additions & 2 deletions packages/styles/package.json
View file
Expand Up @@ -3,5 +3,8 @@
"version": "v1.0.1-alpha.8",
"description": "Styles scss for Designe System Adeo",
"author": "",
"license": "ISC"
}
"license": "ISC",
"dependencies": {
"@mozaic-ds/tokens": "^v1.0.1-alpha.8"
}
}
1 change: 0 additions & 1 deletion packages/tokens/.gitignore
View file

This file was deleted.

163 changes: 163 additions & 0 deletions packages/tokens/build/android/colors.xml
View file
@@ -0,0 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>


<resources>
<color name="color_primary_01_100">#ffeaf3e2</color>
<color name="color_primary_01_200">#ffcbe3b5</color>
<color name="color_primary_01_300">#ffadd585</color>
<color name="color_primary_01_400">#ff91c854</color>
<color name="color_primary_01_500">#ff78be20</color>
<color name="color_primary_01_600">#ff41a017</color>
<color name="color_primary_01_700">#ff158110</color>
<color name="color_primary_01_800">#ff0a601b</color>
<color name="color_primary_01_900">#ff053e1f</color>
<color name="color_primary_02_100">#ffdbedea</color>
<color name="color_primary_02_200">#ffa5d1cb</color>
<color name="color_primary_02_300">#ff6eb4ad</color>
<color name="color_primary_02_400">#ff379590</color>
<color name="color_primary_02_500">#ff007574</color>
<color name="color_primary_02_600">#ff035f64</color>
<color name="color_primary_02_700">#ff044c53</color>
<color name="color_primary_02_800">#ff063a44</color>
<color name="color_primary_02_900">#ff062b35</color>
<color name="color_grey_100">#ffeeeef0</color>
<color name="color_grey_200">#ffd3d2d6</color>
<color name="color_grey_300">#ffbab6bc</color>
<color name="color_grey_400">#ffa19ba2</color>
<color name="color_grey_500">#ff887f87</color>
<color name="color_grey_600">#ff6f676c</color>
<color name="color_grey_700">#ff554f52</color>
<color name="color_grey_800">#ff3c3738</color>
<color name="color_grey_900">#ff222020</color>
<color name="color_grey_999">#ff000000</color>
<color name="color_grey_000">#ffffffff</color>
<color name="color_secondary_blue_100">#ffecfcfd</color>
<color name="color_secondary_blue_200">#ffb7eef5</color>
<color name="color_secondary_blue_300">#ff84dbeb</color>
<color name="color_secondary_blue_400">#ff54c4de</color>
<color name="color_secondary_blue_500">#ff25a8d0</color>
<color name="color_secondary_blue_600">#ff2282a8</color>
<color name="color_secondary_blue_700">#ff1e5f82</color>
<color name="color_secondary_blue_800">#ff18415d</color>
<color name="color_secondary_blue_900">#ff102739</color>
<color name="color_secondary_purple_100">#ffefebfe</color>
<color name="color_secondary_purple_200">#ffc7b0fa</color>
<color name="color_secondary_purple_300">#ffa575f3</color>
<color name="color_secondary_purple_400">#ff883be9</color>
<color name="color_secondary_purple_500">#ff7000dd</color>
<color name="color_secondary_purple_600">#ff5803b3</color>
<color name="color_secondary_purple_700">#ff42058a</color>
<color name="color_secondary_purple_800">#ff2e0663</color>
<color name="color_secondary_purple_900">#ff1c053d</color>
<color name="color_secondary_red_100">#fffeedee</color>
<color name="color_secondary_red_200">#fffab9bc</color>
<color name="color_secondary_red_300">#fff38789</color>
<color name="color_secondary_red_400">#ffea5d58</color>
<color name="color_secondary_red_500">#ffdf382b</color>
<color name="color_secondary_red_600">#ffb42a27</color>
<color name="color_secondary_red_700">#ff8b2226</color>
<color name="color_secondary_red_800">#ff641b21</color>
<color name="color_secondary_red_900">#ff3e1219</color>
<color name="color_secondary_orange_100">#fffff5eb</color>
<color name="color_secondary_orange_200">#ffffdab2</color>
<color name="color_secondary_orange_300">#ffffc17d</color>
<color name="color_secondary_orange_400">#ffffab4b</color>
<color name="color_secondary_orange_500">#fffc961e</color>
<color name="color_secondary_orange_600">#ffc86f21</color>
<color name="color_secondary_orange_700">#ff974f20</color>
<color name="color_secondary_orange_800">#ff6a351c</color>
<color name="color_secondary_orange_900">#ff401f15</color>
<color name="color_secondary_yellow_100">#fffff8e2</color>
<color name="color_secondary_yellow_200">#ffffebaf</color>
<color name="color_secondary_yellow_300">#fffee07d</color>
<color name="color_secondary_yellow_400">#fffcd64c</color>
<color name="color_secondary_yellow_500">#fff8cc1c</color>
<color name="color_secondary_yellow_600">#ffc9a21b</color>
<color name="color_secondary_yellow_700">#ff9c7b18</color>
<color name="color_secondary_yellow_800">#ff705613</color>
<color name="color_secondary_yellow_900">#ff46350d</color>
<color name="color_button_solid_background">#ff78be20</color>
<color name="color_button_solid_font">#ffffffff</color>
<color name="color_button_solid_focus_border">#ff158110</color>
<color name="color_button_solid_disabled_background">#ffeeeef0</color>
<color name="color_button_solid_disabled_font">#ff887f87</color>
<color name="color_button_solid_active_background">#ff158110</color>
<color name="color_button_solid_hover_background">#ff41a017</color>
<color name="color_button_solid_hover_font">#ffffffff</color>
<color name="color_button_solid_primary_campus_background">#ff007574</color>
<color name="color_button_solid_primary_campus_font">#ffffffff</color>
<color name="color_button_solid_primary_campus_focus_border">#ff062b35</color>
<color name="color_button_solid_primary_campus_disabled_background">#ffeeeef0</color>
<color name="color_button_solid_primary_campus_disabled_font">#ff887f87</color>
<color name="color_button_solid_primary_campus_active_background">#ff062b35</color>
<color name="color_button_solid_primary_campus_hover_background">#ff063a44</color>
<color name="color_button_solid_primary_campus_hover_font">#ffffffff</color>
<color name="color_button_solid_secondary_background">#ff887f87</color>
<color name="color_button_solid_secondary_font">#ffffffff</color>
<color name="color_button_solid_secondary_focus_border">#ff222020</color>
<color name="color_button_solid_secondary_disabled_background">#ffeeeef0</color>
<color name="color_button_solid_secondary_disabled_font">#ff887f87</color>
<color name="color_button_solid_secondary_active_background">#ff3c3738</color>
<color name="color_button_solid_secondary_hover_background">#ff554f52</color>
<color name="color_button_solid_secondary_hover_font">#ffffffff</color>
<color name="color_button_solid_danger_background">#ffdf382b</color>
<color name="color_button_solid_danger_font">#ffffffff</color>
<color name="color_button_solid_danger_focus_border">#ff8b2226</color>
<color name="color_button_solid_danger_disabled_background">#ffeeeef0</color>
<color name="color_button_solid_danger_disabled_font">#ff887f87</color>
<color name="color_button_solid_danger_active_background">#ff8b2226</color>
<color name="color_button_solid_danger_hover_background">#ffb42a27</color>
<color name="color_button_solid_danger_hover_font">#ffffffff</color>
<color name="color_button_bordered_background">#ffffffff</color>
<color name="color_button_bordered_border">#ff78be20</color>
<color name="color_button_bordered_font">#ff78be20</color>
<color name="color_button_bordered_focus_border">#ff158110</color>
<color name="color_button_bordered_disabled_background">#ffeeeef0</color>
<color name="color_button_bordered_disabled_font">#ff887f87</color>
<color name="color_button_bordered_active_background">#ffcbe3b5</color>
<color name="color_button_bordered_hover_background">#ffeaf3e2</color>
<color name="color_button_bordered_primary_campus_background">#ffffffff</color>
<color name="color_button_bordered_primary_campus_border">#ff007574</color>
<color name="color_button_bordered_primary_campus_font">#ff007574</color>
<color name="color_button_bordered_primary_campus_focus_border">#ff062b35</color>
<color name="color_button_bordered_primary_campus_disabled_background">#ffeeeef0</color>
<color name="color_button_bordered_primary_campus_disabled_font">#ff887f87</color>
<color name="color_button_bordered_primary_campus_active_background">#ffa5d1cb</color>
<color name="color_button_bordered_primary_campus_hover_background">#ffdbedea</color>
<color name="color_button_bordered_secondary_background">#ffffffff</color>
<color name="color_button_bordered_secondary_border">#ff554f52</color>
<color name="color_button_bordered_secondary_font">#ff554f52</color>
<color name="color_button_bordered_secondary_focus_border">#ff222020</color>
<color name="color_button_bordered_secondary_disabled_background">#ffeeeef0</color>
<color name="color_button_bordered_secondary_disabled_font">#ff887f87</color>
<color name="color_button_bordered_secondary_active_background">#ffd3d2d6</color>
<color name="color_button_bordered_secondary_hover_background">#ffeeeef0</color>
<color name="color_button_bordered_danger_background">#ffffffff</color>
<color name="color_button_bordered_danger_border">#ffdf382b</color>
<color name="color_button_bordered_danger_font">#ffdf382b</color>
<color name="color_button_bordered_danger_focus_border">#ff8b2226</color>
<color name="color_button_bordered_danger_disabled_background">#ffeeeef0</color>
<color name="color_button_bordered_danger_disabled_font">#ff887f87</color>
<color name="color_button_bordered_danger_active_background">#fffab9bc</color>
<color name="color_button_bordered_danger_hover_background">#fffeedee</color>
<color name="color_font_primary_01">#ff78be20</color>
<color name="color_font_primary_02">#ff007574</color>
<color name="color_font_darkest">#ff000000</color>
<color name="color_font_darker">#ff222020</color>
<color name="color_font_dark">#ff3c3738</color>
<color name="color_font_light">#ff554f52</color>
<color name="color_font_lightest">#ffffffff</color>
<color name="color_input_text">#ff222020</color>
<color name="color_input_border">#ff6f676c</color>
<color name="color_input_placeholder">#ffa19ba2</color>
<color name="color_input_background">#ffffffff</color>
<color name="color_input_disabled_border">#ffa19ba2</color>
<color name="color_input_disabled_background">#ffeeeef0</color>
<color name="color_input_hover_border">#ff222020</color>
<color name="color_input_focus_border">#ff25a8d0</color>
<color name="color_input_valid_border">#ff78be20</color>
<color name="color_input_valid_hover_border">#ff0a601b</color>
<color name="color_input_invalid_border">#ffdf382b</color>
<color name="color_input_invalid_hover_border">#ff641b21</color>

</resources>
18 changes: 18 additions & 0 deletions packages/tokens/build/android/font_dimens.xml
View file
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>


<resources>
<dimen name="size_font_10">41.00sp</dimen><!-- 41px -->
<dimen name="size_font_11">49.00sp</dimen><!-- 49px -->
<dimen name="size_font_12">59.00sp</dimen><!-- 59px -->
<dimen name="size_font_01">10.90sp</dimen><!-- 11px -->
<dimen name="size_font_02">12.00sp</dimen><!-- 12px -->
<dimen name="size_font_03">13.00sp</dimen><!-- 13px -->
<dimen name="size_font_04">14.00sp</dimen><!-- 14px -->
<dimen name="size_font_05">16.00sp</dimen><!-- 16px -->
<dimen name="size_font_06">18.00sp</dimen><!-- 18px -->
<dimen name="size_font_07">23.00sp</dimen><!-- 23px -->
<dimen name="size_font_08">28.00sp</dimen><!-- 28px -->
<dimen name="size_font_09">34.00sp</dimen><!-- 34px -->

</resources>

0 comments on commit 0fe3ec3

Please sign in to comment.