From cf0e0ee67de7ca736056bc2cbee5541dc0157db8 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 4 Jan 2019 08:50:12 +0100 Subject: [PATCH 1/2] make sure we dont have short hands in package.json --- packages/dnb-design-system-portal/package.json | 4 ++-- packages/dnb-ui-lib/package.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/dnb-design-system-portal/package.json b/packages/dnb-design-system-portal/package.json index c26516b7735..83950116f92 100644 --- a/packages/dnb-design-system-portal/package.json +++ b/packages/dnb-design-system-portal/package.json @@ -18,14 +18,14 @@ "deploy": "yarn deploy-ci", "deploy-ci": "babel-node ./scripts/deploy.js", "deploy:fast": "yarn build-portal --prefix-paths && babel-node ./scripts/deploy.js", - "dev": "nodemon --exec 'gatsby develop' -w 'gatsby-node.js' -w 'gatsby-config.js'", + "dev": "nodemon --exec 'gatsby develop' --watch 'gatsby-node.js' --watch 'gatsby-config.js'", "lint": "eslint --quiet ./src", "lint-ci": "yarn lint:js && yarn lint:styles", "lint-staged": "lint-staged", "lint:js": "yarn lint --fix", "lint:styles": "stylelint './src/**/*.{js,css}'", "make-ui-lib-pages": "babel-node ./scripts/uilib/makeDemosFactory.js && yarn prettier:components", - "make-ui-lib-pages:dev": "nodemon --exec 'yarn make-ui-lib-pages' -e js -w '**/makeDemosFactory.js' -w '**/tasks/*' -w '**/Template.js' -w '**/template.md'", + "make-ui-lib-pages:dev": "nodemon --exec 'yarn make-ui-lib-pages' --ext js --watch '**/makeDemosFactory.js' --watch '**/tasks/*' --watch '**/Template.js' --watch '**/template.md'", "reset": "cd ../../ && yarn reset && cd - && yarn build", "serve": "live-server public --watch --no-browser --port=8001", "start": "cross-env DEBUG=gatsby:query-watcher gatsby develop", diff --git a/packages/dnb-ui-lib/package.json b/packages/dnb-ui-lib/package.json index f84b0dc2458..28e5fb90574 100644 --- a/packages/dnb-ui-lib/package.json +++ b/packages/dnb-ui-lib/package.json @@ -22,14 +22,14 @@ "cdn": "live-server --no-browser --cors --port=8081", "precommit": "yarn lint-staged", "dev:convertIcons": "nodemon --exec 'babel-node ./scripts/tools/convertIcons' --ignore '/icons/**' --ignore '*.json'", - "dev:prepareTemplates": "nodemon --exec 'yarn babel-node ./scripts/prepub/tasks/prepareTemplates.js' -e js -w './scripts/prepub/tasks/prepareTemplates.js' -w '**/index_template.js'", - "dev:styleFactory": "nodemon --exec 'babel-node ./scripts/prepub/tasks/styleFactory.js' -e js -w './scripts/prepub/tasks/styleFactory.js'", - "dev:themeFactory": "nodemon --exec 'babel-node ./scripts/prepub/tasks/themeFactory.js' -e js -w './scripts/prepub/tasks/themeFactory.js'", + "dev:prepareTemplates": "nodemon --exec 'yarn babel-node ./scripts/prepub/tasks/prepareTemplates.js' --ext js --watch './scripts/prepub/tasks/prepareTemplates.js' --watch '**/index_template.js'", + "dev:styleFactory": "nodemon --exec 'babel-node ./scripts/prepub/tasks/styleFactory.js' --ext js --watch './scripts/prepub/tasks/styleFactory.js'", + "dev:themeFactory": "nodemon --exec 'babel-node ./scripts/prepub/tasks/themeFactory.js' --ext js --watch './scripts/prepub/tasks/themeFactory.js'", "figma": "babel-node ./scripts/figma/updateData", "figma-ci-build": "yarn figma", "figma-ci-commit": "babel-node ./scripts/figma/tasks/commitChanges", "figma:dev:commit": "nodemon --exec 'babel-node ./scripts/figma/tasks/commitChanges'", - "figma:dev:icons": "nodemon --exec 'babel-node ./scripts/figma/updateIcons'", + "figma:dev:icons": "nodemon --exec 'babel-node ./scripts/figma/updateIcons' --ignore '*.svg' --ignore '*.json'", "figma:force": "yarn figma -u && babel-node ./scripts/tools/convertIcons", "lint": "eslint --quiet ./src ./scripts ./stories", "lint-ci": "yarn lint:js && yarn lint:styles", @@ -39,7 +39,7 @@ "publish": "yarn publish-ci --dry-run", "prepublish-ci": "yarn figma-ci-build && yarn prepublish:local && yarn figma-ci-commit", "publish-ci": "babel-node ./scripts/release --ci", - "prepublish:dev": "nodemon --exec 'babel-node ./scripts/prepub/dev.js' -w 'rollup.config.js' -e js,html,json,css,scss -w './src/style/**/*' -w './scripts/**/*' --ignore '*.json'", + "prepublish:dev": "nodemon --exec 'babel-node ./scripts/prepub/dev.js' --watch 'rollup.config.js' --ext js,html,json,css,scss --watch './src/style/**/*' --watch './scripts/**/*' --ignore '*.json'", "publish:disabled": "yarn publish:prerelease && npm publish ./dnb-ui-lib-v*.tgz --preid=ci --npm-tag=ci", "prepublish:local": "babel-node ./scripts/prepub/runPrepub.js", "publish:postpack": "yarn pack && nodemon --exec 'babel-node ./scripts/release/postpack.js' ", @@ -58,7 +58,7 @@ "prettier:other": "prettier --loglevel warn --write '{scripts,src}/**/*.{json,md}' --write '.babelrc' && yarn prettier:package", "prettier:package": "prettier-package-json --write ./package.json", "prettier:styles": "prettier --loglevel warn --parser scss --write 'src/**/*.scss'", - "umd:dev": "nodemon -x 'yarn umd' -e js,html,json,css,scss -w './src/components/**/*' -w './src/patterns/**/*' -w './src/style/**/*' -w './scripts/**/*' --ignore '*.json'" + "umd:dev": "nodemon -x 'yarn umd' --ext js,html,json,css,scss --watch './src/components/**/*' --watch './src/patterns/**/*' --watch './src/style/**/*' --watch './scripts/**/*' --ignore '*.json'" }, "dependencies": { "classnames": "^2.2.6", From 9133eff86ce50dbd0f40e8897c812e4f916eeb85 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 4 Jan 2019 12:01:33 +0100 Subject: [PATCH 2/2] fix: broken icons with optimized transform --- .../dnb-design-system-portal/.stylelintignore | 1 + packages/dnb-ui-lib/.stylelintignore | 1 + packages/dnb-ui-lib/assets/icons/add.svg | 2 +- .../dnb-ui-lib/assets/icons/add_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/bell_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/calendar.svg | 2 +- .../assets/icons/calendar_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/check.svg | 2 +- .../dnb-ui-lib/assets/icons/check_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/chevron_down.svg | 2 +- .../assets/icons/chevron_down_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/chevron_left.svg | 2 +- .../assets/icons/chevron_left_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/chevron_right.svg | 2 +- .../assets/icons/chevron_right_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/chevron_up.svg | 2 +- .../assets/icons/chevron_up_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/close.svg | 2 +- .../dnb-ui-lib/assets/icons/close_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/exclamation.svg | 2 +- .../assets/icons/exclamation_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/fullscreen.svg | 2 +- .../assets/icons/fullscreen_medium.svg | 2 +- .../dnb-ui-lib/assets/icons/hamburger.svg | 2 +- .../assets/icons/hamburger_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/logout.svg | 2 +- .../dnb-ui-lib/assets/icons/logout_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/more.svg | 2 +- .../dnb-ui-lib/assets/icons/more_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/question.svg | 2 +- .../assets/icons/question_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/save.svg | 2 +- .../dnb-ui-lib/assets/icons/save_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/search.svg | 2 +- .../dnb-ui-lib/assets/icons/search_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/subtract.svg | 2 +- .../assets/icons/subtract_medium.svg | 2 +- packages/dnb-ui-lib/assets/icons/trash.svg | 2 +- .../dnb-ui-lib/assets/icons/trash_medium.svg | 2 +- packages/dnb-ui-lib/package-scripts.js | 3 +- packages/dnb-ui-lib/package.json | 5 +- packages/dnb-ui-lib/scripts/figma/FigmaAPI.js | 7 ++- .../scripts/figma/helpers/docHelpers.js | 50 ++++++++------- packages/dnb-ui-lib/scripts/figma/index.js | 6 +- packages/dnb-ui-lib/scripts/figma/reset.js | 39 ++++++++++++ .../figma/tasks/componentsStyleConverter.js | 2 +- .../figma/tasks/extractSassVarsToJson.js | 2 +- .../figma/tasks/extractStylesFromFigmaDoc.js | 2 +- .../scripts/figma/tasks/iconsConverter.js | 62 +++++++++++-------- .../figma/tasks/makeStyleFromFigmaDoc.js | 2 +- .../scripts/figma/tasks/makeStylePrettier.js | 2 +- .../dnb-ui-lib/scripts/figma/updateAll.js | 7 +++ .../dnb-ui-lib/scripts/figma/updateData.js | 7 --- .../dnb-ui-lib/scripts/figma/updateIcons.js | 4 +- .../dnb-ui-lib/scripts/figma/updateStyles.js | 2 +- .../dnb-ui-lib/scripts/figma/version.lock | 2 +- .../scripts/prepub/updateAndPrepub.js | 4 +- packages/dnb-ui-lib/server/run.js | 6 +- .../__snapshots__/Button.test.js.snap | 4 ++ .../__snapshots__/IconPrimary.test.js.snap | 2 + .../__snapshots__/Modal.test.js.snap | 4 ++ packages/dnb-ui-lib/src/icons/add.js | 5 +- packages/dnb-ui-lib/src/icons/add_medium.js | 5 +- packages/dnb-ui-lib/src/icons/bell_medium.js | 2 +- packages/dnb-ui-lib/src/icons/calendar.js | 3 +- .../dnb-ui-lib/src/icons/calendar_medium.js | 3 +- packages/dnb-ui-lib/src/icons/check.js | 2 +- packages/dnb-ui-lib/src/icons/check_medium.js | 2 +- packages/dnb-ui-lib/src/icons/chevron_down.js | 3 +- .../src/icons/chevron_down_medium.js | 3 +- packages/dnb-ui-lib/src/icons/chevron_left.js | 3 +- .../src/icons/chevron_left_medium.js | 3 +- .../dnb-ui-lib/src/icons/chevron_right.js | 3 +- .../src/icons/chevron_right_medium.js | 3 +- packages/dnb-ui-lib/src/icons/chevron_up.js | 3 +- .../dnb-ui-lib/src/icons/chevron_up_medium.js | 3 +- packages/dnb-ui-lib/src/icons/close.js | 3 +- packages/dnb-ui-lib/src/icons/close_medium.js | 3 +- packages/dnb-ui-lib/src/icons/exclamation.js | 3 +- .../src/icons/exclamation_medium.js | 3 +- packages/dnb-ui-lib/src/icons/fullscreen.js | 11 +++- .../dnb-ui-lib/src/icons/fullscreen_medium.js | 11 +++- packages/dnb-ui-lib/src/icons/hamburger.js | 3 +- .../dnb-ui-lib/src/icons/hamburger_medium.js | 20 ++++-- packages/dnb-ui-lib/src/icons/icons.lock | 2 +- packages/dnb-ui-lib/src/icons/logout.js | 7 ++- .../dnb-ui-lib/src/icons/logout_medium.js | 3 +- packages/dnb-ui-lib/src/icons/more.js | 3 +- packages/dnb-ui-lib/src/icons/more_medium.js | 3 +- packages/dnb-ui-lib/src/icons/question.js | 3 +- .../dnb-ui-lib/src/icons/question_medium.js | 3 +- packages/dnb-ui-lib/src/icons/save.js | 3 +- packages/dnb-ui-lib/src/icons/save_medium.js | 3 +- packages/dnb-ui-lib/src/icons/search.js | 3 +- .../dnb-ui-lib/src/icons/search_medium.js | 3 +- packages/dnb-ui-lib/src/icons/subtract.js | 5 +- .../dnb-ui-lib/src/icons/subtract_medium.js | 3 +- packages/dnb-ui-lib/src/icons/trash.js | 4 +- packages/dnb-ui-lib/src/icons/trash_medium.js | 2 +- 99 files changed, 286 insertions(+), 167 deletions(-) create mode 100644 packages/dnb-ui-lib/scripts/figma/reset.js create mode 100644 packages/dnb-ui-lib/scripts/figma/updateAll.js delete mode 100644 packages/dnb-ui-lib/scripts/figma/updateData.js diff --git a/packages/dnb-design-system-portal/.stylelintignore b/packages/dnb-design-system-portal/.stylelintignore index 62a85463e19..3b3d2d61a61 100644 --- a/packages/dnb-design-system-portal/.stylelintignore +++ b/packages/dnb-design-system-portal/.stylelintignore @@ -1,3 +1,4 @@ *__tests__* *not_in_use* PortalStyle.js +scripts diff --git a/packages/dnb-ui-lib/.stylelintignore b/packages/dnb-ui-lib/.stylelintignore index 8edaa108567..34aa8d6b088 100644 --- a/packages/dnb-ui-lib/.stylelintignore +++ b/packages/dnb-ui-lib/.stylelintignore @@ -1,3 +1,4 @@ *__tests__* *not_in_use* src/components/slider/Slider.js +scripts diff --git a/packages/dnb-ui-lib/assets/icons/add.svg b/packages/dnb-ui-lib/assets/icons/add.svg index 3033b2e9505..620795ca6c2 100644 --- a/packages/dnb-ui-lib/assets/icons/add.svg +++ b/packages/dnb-ui-lib/assets/icons/add.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/add_medium.svg b/packages/dnb-ui-lib/assets/icons/add_medium.svg index 59b26594dc3..ff500e7a9da 100644 --- a/packages/dnb-ui-lib/assets/icons/add_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/add_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/bell_medium.svg b/packages/dnb-ui-lib/assets/icons/bell_medium.svg index 7fd73f751a4..f7e60d179a6 100644 --- a/packages/dnb-ui-lib/assets/icons/bell_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/bell_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/calendar.svg b/packages/dnb-ui-lib/assets/icons/calendar.svg index d70940d0776..151c66d87d7 100644 --- a/packages/dnb-ui-lib/assets/icons/calendar.svg +++ b/packages/dnb-ui-lib/assets/icons/calendar.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/calendar_medium.svg b/packages/dnb-ui-lib/assets/icons/calendar_medium.svg index 938d7f53713..a50832a9567 100644 --- a/packages/dnb-ui-lib/assets/icons/calendar_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/calendar_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/check.svg b/packages/dnb-ui-lib/assets/icons/check.svg index 4f0415b3078..a3d587c996e 100644 --- a/packages/dnb-ui-lib/assets/icons/check.svg +++ b/packages/dnb-ui-lib/assets/icons/check.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/check_medium.svg b/packages/dnb-ui-lib/assets/icons/check_medium.svg index e58a18d0f62..e73982069c2 100644 --- a/packages/dnb-ui-lib/assets/icons/check_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/check_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_down.svg b/packages/dnb-ui-lib/assets/icons/chevron_down.svg index 88a7a9c0c77..52a0777bfc8 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_down.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_down.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_down_medium.svg b/packages/dnb-ui-lib/assets/icons/chevron_down_medium.svg index cb4c672a423..db926064444 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_down_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_down_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_left.svg b/packages/dnb-ui-lib/assets/icons/chevron_left.svg index f165b1fe17d..7b8acee1c07 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_left.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_left.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_left_medium.svg b/packages/dnb-ui-lib/assets/icons/chevron_left_medium.svg index 69067ed4fc9..0191018084f 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_left_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_left_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_right.svg b/packages/dnb-ui-lib/assets/icons/chevron_right.svg index a97f3b5e4d1..7161deb6c61 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_right.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_right.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_right_medium.svg b/packages/dnb-ui-lib/assets/icons/chevron_right_medium.svg index 119d2f2abcb..31d042511f5 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_right_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_right_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_up.svg b/packages/dnb-ui-lib/assets/icons/chevron_up.svg index d8721dd460f..340d18054ae 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_up.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_up.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/chevron_up_medium.svg b/packages/dnb-ui-lib/assets/icons/chevron_up_medium.svg index c62ef39f9a8..5ca38982ae5 100644 --- a/packages/dnb-ui-lib/assets/icons/chevron_up_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/chevron_up_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/close.svg b/packages/dnb-ui-lib/assets/icons/close.svg index 0f6f0a50f28..231b91208ab 100644 --- a/packages/dnb-ui-lib/assets/icons/close.svg +++ b/packages/dnb-ui-lib/assets/icons/close.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/close_medium.svg b/packages/dnb-ui-lib/assets/icons/close_medium.svg index e561d6f5299..c6f3e002bb4 100644 --- a/packages/dnb-ui-lib/assets/icons/close_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/close_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/exclamation.svg b/packages/dnb-ui-lib/assets/icons/exclamation.svg index f12ef28706b..6c939f0a37c 100644 --- a/packages/dnb-ui-lib/assets/icons/exclamation.svg +++ b/packages/dnb-ui-lib/assets/icons/exclamation.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/exclamation_medium.svg b/packages/dnb-ui-lib/assets/icons/exclamation_medium.svg index 5b3e2667f39..117b98debd3 100644 --- a/packages/dnb-ui-lib/assets/icons/exclamation_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/exclamation_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/fullscreen.svg b/packages/dnb-ui-lib/assets/icons/fullscreen.svg index c4d1cfd690c..dec68dbea2f 100644 --- a/packages/dnb-ui-lib/assets/icons/fullscreen.svg +++ b/packages/dnb-ui-lib/assets/icons/fullscreen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/fullscreen_medium.svg b/packages/dnb-ui-lib/assets/icons/fullscreen_medium.svg index d1c4f70ce90..699ed01a8c6 100644 --- a/packages/dnb-ui-lib/assets/icons/fullscreen_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/fullscreen_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/hamburger.svg b/packages/dnb-ui-lib/assets/icons/hamburger.svg index 0c9b8509e47..c1ac3535c94 100644 --- a/packages/dnb-ui-lib/assets/icons/hamburger.svg +++ b/packages/dnb-ui-lib/assets/icons/hamburger.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/hamburger_medium.svg b/packages/dnb-ui-lib/assets/icons/hamburger_medium.svg index 11467d0579c..954be0597f7 100644 --- a/packages/dnb-ui-lib/assets/icons/hamburger_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/hamburger_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/logout.svg b/packages/dnb-ui-lib/assets/icons/logout.svg index 6d432c0a9dc..6c2cc66566b 100644 --- a/packages/dnb-ui-lib/assets/icons/logout.svg +++ b/packages/dnb-ui-lib/assets/icons/logout.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/logout_medium.svg b/packages/dnb-ui-lib/assets/icons/logout_medium.svg index 10acdcc6800..4b5e9783dea 100644 --- a/packages/dnb-ui-lib/assets/icons/logout_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/logout_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/more.svg b/packages/dnb-ui-lib/assets/icons/more.svg index e70c8aef485..055919dc6f7 100644 --- a/packages/dnb-ui-lib/assets/icons/more.svg +++ b/packages/dnb-ui-lib/assets/icons/more.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/more_medium.svg b/packages/dnb-ui-lib/assets/icons/more_medium.svg index 2fa19a26d10..3c0bfb27d65 100644 --- a/packages/dnb-ui-lib/assets/icons/more_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/more_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/question.svg b/packages/dnb-ui-lib/assets/icons/question.svg index e2e080ee975..e5d93869607 100644 --- a/packages/dnb-ui-lib/assets/icons/question.svg +++ b/packages/dnb-ui-lib/assets/icons/question.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/question_medium.svg b/packages/dnb-ui-lib/assets/icons/question_medium.svg index c0830de8610..f09a407d99a 100644 --- a/packages/dnb-ui-lib/assets/icons/question_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/question_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/save.svg b/packages/dnb-ui-lib/assets/icons/save.svg index 06820ca3b39..6a1d52a1694 100644 --- a/packages/dnb-ui-lib/assets/icons/save.svg +++ b/packages/dnb-ui-lib/assets/icons/save.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/save_medium.svg b/packages/dnb-ui-lib/assets/icons/save_medium.svg index 912889ff3cb..f2870dabae5 100644 --- a/packages/dnb-ui-lib/assets/icons/save_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/save_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/search.svg b/packages/dnb-ui-lib/assets/icons/search.svg index 6c372f1670d..04160f3a120 100644 --- a/packages/dnb-ui-lib/assets/icons/search.svg +++ b/packages/dnb-ui-lib/assets/icons/search.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/search_medium.svg b/packages/dnb-ui-lib/assets/icons/search_medium.svg index a13074de20b..54763c6f2f7 100644 --- a/packages/dnb-ui-lib/assets/icons/search_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/search_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/subtract.svg b/packages/dnb-ui-lib/assets/icons/subtract.svg index 758070f3a18..93742790733 100644 --- a/packages/dnb-ui-lib/assets/icons/subtract.svg +++ b/packages/dnb-ui-lib/assets/icons/subtract.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/subtract_medium.svg b/packages/dnb-ui-lib/assets/icons/subtract_medium.svg index f7e22b6f9f6..367627e6f62 100644 --- a/packages/dnb-ui-lib/assets/icons/subtract_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/subtract_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/trash.svg b/packages/dnb-ui-lib/assets/icons/trash.svg index 7de12a3866d..d22604f6dd1 100644 --- a/packages/dnb-ui-lib/assets/icons/trash.svg +++ b/packages/dnb-ui-lib/assets/icons/trash.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/assets/icons/trash_medium.svg b/packages/dnb-ui-lib/assets/icons/trash_medium.svg index 4d2ef3b6850..8410db4c3fe 100644 --- a/packages/dnb-ui-lib/assets/icons/trash_medium.svg +++ b/packages/dnb-ui-lib/assets/icons/trash_medium.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/dnb-ui-lib/package-scripts.js b/packages/dnb-ui-lib/package-scripts.js index ff296c6133d..bd9e86238ac 100644 --- a/packages/dnb-ui-lib/package-scripts.js +++ b/packages/dnb-ui-lib/package-scripts.js @@ -29,8 +29,7 @@ module.exports = { }, figma: { default: 'yarn figma', - dev: 'yarn figma:dev', - update: 'yarn figma:force' + dev: 'yarn figma:dev' }, sb: 'yarn story', test: { diff --git a/packages/dnb-ui-lib/package.json b/packages/dnb-ui-lib/package.json index 28e5fb90574..f6a311ae994 100644 --- a/packages/dnb-ui-lib/package.json +++ b/packages/dnb-ui-lib/package.json @@ -25,12 +25,13 @@ "dev:prepareTemplates": "nodemon --exec 'yarn babel-node ./scripts/prepub/tasks/prepareTemplates.js' --ext js --watch './scripts/prepub/tasks/prepareTemplates.js' --watch '**/index_template.js'", "dev:styleFactory": "nodemon --exec 'babel-node ./scripts/prepub/tasks/styleFactory.js' --ext js --watch './scripts/prepub/tasks/styleFactory.js'", "dev:themeFactory": "nodemon --exec 'babel-node ./scripts/prepub/tasks/themeFactory.js' --ext js --watch './scripts/prepub/tasks/themeFactory.js'", - "figma": "babel-node ./scripts/figma/updateData", + "figma": "babel-node ./scripts/figma/updateAll", "figma-ci-build": "yarn figma", "figma-ci-commit": "babel-node ./scripts/figma/tasks/commitChanges", "figma:dev:commit": "nodemon --exec 'babel-node ./scripts/figma/tasks/commitChanges'", "figma:dev:icons": "nodemon --exec 'babel-node ./scripts/figma/updateIcons' --ignore '*.svg' --ignore '*.json'", - "figma:force": "yarn figma -u && babel-node ./scripts/tools/convertIcons", + "figma:refetch": "yarn figma -u", + "figma:reset": "babel-node ./scripts/figma/reset && yarn build", "lint": "eslint --quiet ./src ./scripts ./stories", "lint-ci": "yarn lint:js && yarn lint:styles", "lint-staged": "lint-staged -d", diff --git a/packages/dnb-ui-lib/scripts/figma/FigmaAPI.js b/packages/dnb-ui-lib/scripts/figma/FigmaAPI.js index 2c3fae0efed..e0d4b807086 100644 --- a/packages/dnb-ui-lib/scripts/figma/FigmaAPI.js +++ b/packages/dnb-ui-lib/scripts/figma/FigmaAPI.js @@ -1,5 +1,5 @@ /** - * Node + * The main Figma Task runner * */ @@ -36,16 +36,17 @@ export const fetchFigmaIcons = async (args = {}) => { } } -export const fetchFigmaData = async ({ +export const fetchFigmaAll = async ({ figmaDoc = null, figmaFile = null, + ignoreBranchCheck = null, ...rest } = {}) => { try { // make sure we are on the develop branch const branchName = await getBranchName({ requiredBranch: 'develop' }) - if (!branchName) { + if (ignoreBranchCheck !== true && !branchName) { log.fail('> Figma: Could not continue, as we require another branch') return } diff --git a/packages/dnb-ui-lib/scripts/figma/helpers/docHelpers.js b/packages/dnb-ui-lib/scripts/figma/helpers/docHelpers.js index c129abb9c80..d480fe87637 100644 --- a/packages/dnb-ui-lib/scripts/figma/helpers/docHelpers.js +++ b/packages/dnb-ui-lib/scripts/figma/helpers/docHelpers.js @@ -1,5 +1,5 @@ /** - * Node + * Figma Task * */ @@ -328,30 +328,38 @@ export const safeFileToDisk = ( { file = '.tmp/file.json', url }, { errorExceptionType = ERROR_FATAL } ) => - new Promise(resolve => { + new Promise(async resolve => { const localFile = /\//.test(file) ? file : path.resolve(__dirname, `../.cache/${file}`) - const stream = fs.createWriteStream(localFile) - stream.on('error', err => { - stream.end() - new ErrorHandler( - 'Failed on createWriteStream', - err, - errorExceptionType - ) - }) - stream.on('end', (err, content) => { - stream.end() - console.log('\n\nerr', err, content) - new ErrorHandler('Failed on createWriteStream', err) - }) - stream.on('finish', () => { - stream.close() - resolve({ file: localFile }) - }) + const resetContent = fs.existsSync(localFile) + ? await fs.readFile(localFile, 'utf-8') + : null + const writeStream = fs.createWriteStream(localFile) + writeStream + .on('error', err => { + writeStream.end() + new ErrorHandler( + 'Failed on createWriteStream', + err, + errorExceptionType + ) + }) + .on('finish', async () => { + writeStream.close() + + // reset the file, if its empty + if (resetContent) { + const newContent = await fs.readFile(localFile, 'utf-8') + if (String(newContent).trim().length === 0) { + await fs.writeFile(localFile, resetContent) + } + } + + resolve({ localFile }) + }) https - .get(url, response => response.pipe(stream)) + .get(url, response => response.pipe(writeStream)) .on('error', async err => { try { await fs.unlink(localFile) diff --git a/packages/dnb-ui-lib/scripts/figma/index.js b/packages/dnb-ui-lib/scripts/figma/index.js index 4eb07c7c215..6157f918b1b 100644 --- a/packages/dnb-ui-lib/scripts/figma/index.js +++ b/packages/dnb-ui-lib/scripts/figma/index.js @@ -1,11 +1,11 @@ /** - * Figma API + * The main Figma Task runner * */ import { - fetchFigmaData, + fetchFigmaAll, fetchFigmaStyles, fetchFigmaIcons } from './FigmaAPI' -export { fetchFigmaData, fetchFigmaStyles, fetchFigmaIcons } +export { fetchFigmaAll, fetchFigmaStyles, fetchFigmaIcons } diff --git a/packages/dnb-ui-lib/scripts/figma/reset.js b/packages/dnb-ui-lib/scripts/figma/reset.js new file mode 100644 index 00000000000..64c4350dd3d --- /dev/null +++ b/packages/dnb-ui-lib/scripts/figma/reset.js @@ -0,0 +1,39 @@ +/** + * Figma Reset + * + * Use this to reset and redownload all content and styles + * + */ + +import fs from 'fs-extra' +import path from 'path' +import { log, ErrorHandler } from '../lib' +import { fetchFigmaAll } from './index' + +export const runFigmaReset = async () => { + log.start('Resetting Figma content and styles') + try { + const versionLockFile = path.resolve(__dirname, './version.lock') + if (fs.existsSync(versionLockFile)) { + await fs.unlink(versionLockFile) + } + const iconsLockFile = path.resolve( + __dirname, + '../../src/icons/icons.lock' + ) + if (fs.existsSync(iconsLockFile)) { + await fs.unlink(iconsLockFile) + } + } catch (e) { + log.fail(e) + new ErrorHandler(e) + } +} + +runFigmaReset().then(() => + fetchFigmaAll({ forceRefetch: true, ignoreBranchCheck: true }).then( + () => { + log.succeed('Resetting Figma is done') + } + ) +) diff --git a/packages/dnb-ui-lib/scripts/figma/tasks/componentsStyleConverter.js b/packages/dnb-ui-lib/scripts/figma/tasks/componentsStyleConverter.js index c104c313744..b00a16dcb21 100644 --- a/packages/dnb-ui-lib/scripts/figma/tasks/componentsStyleConverter.js +++ b/packages/dnb-ui-lib/scripts/figma/tasks/componentsStyleConverter.js @@ -1,5 +1,5 @@ /** - * Node + * Figma Task * */ diff --git a/packages/dnb-ui-lib/scripts/figma/tasks/extractSassVarsToJson.js b/packages/dnb-ui-lib/scripts/figma/tasks/extractSassVarsToJson.js index 83f07fb9c24..f6e65dcb34c 100644 --- a/packages/dnb-ui-lib/scripts/figma/tasks/extractSassVarsToJson.js +++ b/packages/dnb-ui-lib/scripts/figma/tasks/extractSassVarsToJson.js @@ -1,5 +1,5 @@ /** - * Task + * Figma Task * */ diff --git a/packages/dnb-ui-lib/scripts/figma/tasks/extractStylesFromFigmaDoc.js b/packages/dnb-ui-lib/scripts/figma/tasks/extractStylesFromFigmaDoc.js index e30f1f1f37b..b4b793a66d9 100644 --- a/packages/dnb-ui-lib/scripts/figma/tasks/extractStylesFromFigmaDoc.js +++ b/packages/dnb-ui-lib/scripts/figma/tasks/extractStylesFromFigmaDoc.js @@ -1,5 +1,5 @@ /** - * Task + * Figma Task * */ diff --git a/packages/dnb-ui-lib/scripts/figma/tasks/iconsConverter.js b/packages/dnb-ui-lib/scripts/figma/tasks/iconsConverter.js index ef61ce2925b..441b1b07afe 100644 --- a/packages/dnb-ui-lib/scripts/figma/tasks/iconsConverter.js +++ b/packages/dnb-ui-lib/scripts/figma/tasks/iconsConverter.js @@ -1,5 +1,5 @@ /** - * Node + * Figma Task * */ @@ -30,6 +30,7 @@ const iconsDest = path.resolve(__dirname, `../../../assets/icons`) export const IconsConverter = async ({ figmaDoc = null, figmaFile = null, + forceReconvert = null, ...rest }) => { if (!figmaFile) { @@ -37,7 +38,10 @@ export const IconsConverter = async ({ } if (figmaDoc === null) { - figmaDoc = await getFigmaDoc({ figmaFile }) + figmaDoc = await getFigmaDoc({ + figmaFile, + preventUpdate: forceReconvert + }) } // juce out, if no changes @@ -73,7 +77,7 @@ export const IconsConverter = async ({ const runFrameIconsFactory = async ({ frameDoc, figmaFile, - forceReconvert = null + forceRedownload = null }) => { if (/#skip/.test(frameDoc.name)) { return undefined @@ -145,8 +149,6 @@ const runFrameIconsFactory = async ({ } icons from the "${originalFrameName}" Canvas` ) - // console.log('\n\niconIdsToFetchFrom', iconIdsToFetchFrom, iconIdsFromDoc) - // go and load additional images const listOfAdditionalIconUrls = Object.entries( await getFigmaUrlByImageIds({ @@ -175,7 +177,7 @@ const runFrameIconsFactory = async ({ const iconName = prepareIconName(name, iconNameAdditions) // deifine the filePath - const filePath = path.resolve(iconsDest, iconName) + const file = path.resolve(iconsDest, iconName) // check if frame content exists in the lock file const lockFileFrameContent = @@ -192,22 +194,24 @@ const runFrameIconsFactory = async ({ } if ( - forceReconvert !== true && + forceRedownload !== true && // compare the current id with the one in the lock file // if the id is the same, and the file exists, this version is not changed - (lockFileFrameContent && lockFileFrameContent.id === id) && + lockFileFrameContent && + lockFileFrameContent.id === id && // and also compare for the frameId, as they may have been upadted (lockFileFrameContent && lockFileFrameContent.slug === md5(figmaFile + frameId)) && - fs.existsSync(filePath) + fs.existsSync(file) ) { log.text = `> Figma: File already exists: ${iconName}` } else { log.text = `> Figma: Saving file to disk: ${iconName}` - const { file } = await safeFileToDisk( + // console.log('\n\n has url?', file, url) + await safeFileToDisk( { - file: filePath, + file, url, id // id is not used for now }, @@ -216,13 +220,17 @@ const runFrameIconsFactory = async ({ } ) - await optimizeSVG({ file }) - ret.timestamp = Date.now() - log.info(`> Figma: Icon was prepared and saved: ${iconName}`) + log.info( + `> Figma: Icon was saved: ${iconName} (${ret.timestamp})` + ) } + await optimizeSVG({ file }) + + log.text = `> Figma: Icon was prepared: ${iconName}` + return ret } catch (e) { log.fail(e) @@ -266,17 +274,21 @@ const prepareIconName = (name, iconNameAdditions = []) => { const optimizeSVG = ({ file }) => { const transformSvg = async content => { const plugins = [ - { - removeAttrs: { - attrs: [ - 'fill' //remove all fills - if the instance has a defined background color, then things are not showing good. Then then have to allow this setting to be there - // 'svg:fill' - // 'svg:xmlns', - // 'svg:width', - // 'svg:height' - ] - } - }, + // { + // removeAttrs: { + // attrs: [ + // //remove all fills - if the instance has a defined background color, + // // then things are not showing good. + // // Then then have to allow this setting to be there! + // // 'fill' + // // 'svg:fill' + // // 'svg:xmlns', + // // 'svg:width', + // // 'svg:height' + // ] + // } + // }, + // { convertPathData: false }, // if we prefere to not transform any data paths, we have to disable this { cleanupIDs: false }, { removeViewBox: false }, { removeDimensions: true } diff --git a/packages/dnb-ui-lib/scripts/figma/tasks/makeStyleFromFigmaDoc.js b/packages/dnb-ui-lib/scripts/figma/tasks/makeStyleFromFigmaDoc.js index 1941c5e0f9b..db0b83df675 100644 --- a/packages/dnb-ui-lib/scripts/figma/tasks/makeStyleFromFigmaDoc.js +++ b/packages/dnb-ui-lib/scripts/figma/tasks/makeStyleFromFigmaDoc.js @@ -1,5 +1,5 @@ /** - * Task + * Figma Task * */ diff --git a/packages/dnb-ui-lib/scripts/figma/tasks/makeStylePrettier.js b/packages/dnb-ui-lib/scripts/figma/tasks/makeStylePrettier.js index deb0d3124c5..002614055ab 100644 --- a/packages/dnb-ui-lib/scripts/figma/tasks/makeStylePrettier.js +++ b/packages/dnb-ui-lib/scripts/figma/tasks/makeStylePrettier.js @@ -1,5 +1,5 @@ /** - * Task + * Figma Task * */ diff --git a/packages/dnb-ui-lib/scripts/figma/updateAll.js b/packages/dnb-ui-lib/scripts/figma/updateAll.js new file mode 100644 index 00000000000..b24f46602fc --- /dev/null +++ b/packages/dnb-ui-lib/scripts/figma/updateAll.js @@ -0,0 +1,7 @@ +/** + * Run only Figma Doc Task + * + */ + +import { fetchFigmaAll } from './index' +fetchFigmaAll({}) diff --git a/packages/dnb-ui-lib/scripts/figma/updateData.js b/packages/dnb-ui-lib/scripts/figma/updateData.js deleted file mode 100644 index c3da1c3e453..00000000000 --- a/packages/dnb-ui-lib/scripts/figma/updateData.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Node - * - */ - -import { fetchFigmaData } from './index' -fetchFigmaData({}) diff --git a/packages/dnb-ui-lib/scripts/figma/updateIcons.js b/packages/dnb-ui-lib/scripts/figma/updateIcons.js index 1754a6edd8d..5a5a225c42e 100644 --- a/packages/dnb-ui-lib/scripts/figma/updateIcons.js +++ b/packages/dnb-ui-lib/scripts/figma/updateIcons.js @@ -1,7 +1,7 @@ /** - * Node + * Run only Figma Icons Task * */ import { fetchFigmaIcons } from './index' -fetchFigmaIcons({ doRefetch: null, forceReconvert: null }) +fetchFigmaIcons({ doRefetch: null, forceReconvert: true }) diff --git a/packages/dnb-ui-lib/scripts/figma/updateStyles.js b/packages/dnb-ui-lib/scripts/figma/updateStyles.js index e57a188d309..07da53825e3 100644 --- a/packages/dnb-ui-lib/scripts/figma/updateStyles.js +++ b/packages/dnb-ui-lib/scripts/figma/updateStyles.js @@ -1,5 +1,5 @@ /** - * Node + * Run only Figma Styles Task * */ diff --git a/packages/dnb-ui-lib/scripts/figma/version.lock b/packages/dnb-ui-lib/scripts/figma/version.lock index 8f0cdbae26a..1869234a1a4 100644 --- a/packages/dnb-ui-lib/scripts/figma/version.lock +++ b/packages/dnb-ui-lib/scripts/figma/version.lock @@ -1 +1 @@ -{"1a3caba565dddc0a936aaddc29a82887":"101586535"} \ No newline at end of file +{"1a3caba565dddc0a936aaddc29a82887":"101675458"} \ No newline at end of file diff --git a/packages/dnb-ui-lib/scripts/prepub/updateAndPrepub.js b/packages/dnb-ui-lib/scripts/prepub/updateAndPrepub.js index 74fe9524743..3116d5c2f65 100644 --- a/packages/dnb-ui-lib/scripts/prepub/updateAndPrepub.js +++ b/packages/dnb-ui-lib/scripts/prepub/updateAndPrepub.js @@ -4,13 +4,13 @@ */ import { runPrepublishTasks, log } from './index' -import { fetchFigmaData } from '../figma' +import { fetchFigmaAll } from '../figma' export const run = async () => { const doRefetch = true log.start('Starting the prepublish process...') log.text = '> Figma: Start fetching figma data ...' - await fetchFigmaData({ doRefetch }) + await fetchFigmaAll({ doRefetch }) log.text = '> PrePublish: Start prepublishing ...' await runPrepublishTasks({ preventDelete: false, doRefetch }) } diff --git a/packages/dnb-ui-lib/server/run.js b/packages/dnb-ui-lib/server/run.js index 562636c8ea6..a3c138d6028 100644 --- a/packages/dnb-ui-lib/server/run.js +++ b/packages/dnb-ui-lib/server/run.js @@ -6,7 +6,7 @@ import express from 'express' // import fetch from 'node-fetch' import dotenv from 'dotenv' -import { fetchFigmaData } from '../scripts/figma' +import { fetchFigmaAll } from '../scripts/figma' import { runPrepublishTasks } from '../scripts/prepub' // import { yalcPublish } from '../scripts/prepub/yalc' @@ -26,14 +26,14 @@ app.use((req, res, next) => { }) app.get('/figma/update', async (request, response) => { - await fetchFigmaData({ doRefetch: true }) + await fetchFigmaAll({ doRefetch: true }) await runPrepublishTasks({ preventDelete: true }) console.log('> PrePublish: done!') response.send('{}') }) app.get('/figma/update/local', async (request, response) => { - await fetchFigmaData({ doRefetch: true }) + await fetchFigmaAll({ doRefetch: true }) await runPrepublishTasks({ preventDelete: true }) console.log('> PrePublish: done!') // await yalcPublish() diff --git a/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap b/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap index ea0044c348e..be3f59da98e 100644 --- a/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap +++ b/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap @@ -79,11 +79,13 @@ exports[`Button component have to match default button snapshot 1`] = ` > @@ -175,11 +177,13 @@ exports[`Button component have to match href="..." snapshot 1`] = ` > diff --git a/packages/dnb-ui-lib/src/components/icon-primary/__tests__/__snapshots__/IconPrimary.test.js.snap b/packages/dnb-ui-lib/src/components/icon-primary/__tests__/__snapshots__/IconPrimary.test.js.snap index 4bded2991df..8f8077de8fe 100644 --- a/packages/dnb-ui-lib/src/components/icon-primary/__tests__/__snapshots__/IconPrimary.test.js.snap +++ b/packages/dnb-ui-lib/src/components/icon-primary/__tests__/__snapshots__/IconPrimary.test.js.snap @@ -24,6 +24,7 @@ exports[`IconPrimary component have to match snapshot 1`] = ` width={null} > diff --git a/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap b/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap index c1a869cf1c9..235a9184570 100644 --- a/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap +++ b/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap @@ -140,11 +140,13 @@ exports[`Modal component have to match snapshot 1`] = ` > @@ -376,11 +378,13 @@ exports[`Modal component have to match snapshot 1`] = ` > diff --git a/packages/dnb-ui-lib/src/icons/add.js b/packages/dnb-ui-lib/src/icons/add.js index 388c879e30b..5b92bdd81d4 100644 --- a/packages/dnb-ui-lib/src/icons/add.js +++ b/packages/dnb-ui-lib/src/icons/add.js @@ -3,11 +3,12 @@ import React from 'react' const add = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/add_medium.js b/packages/dnb-ui-lib/src/icons/add_medium.js index 082655e70ce..fcb73078998 100644 --- a/packages/dnb-ui-lib/src/icons/add_medium.js +++ b/packages/dnb-ui-lib/src/icons/add_medium.js @@ -3,11 +3,12 @@ import React from 'react' const add_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/bell_medium.js b/packages/dnb-ui-lib/src/icons/bell_medium.js index 6f1835a4c90..b3e0dd44381 100644 --- a/packages/dnb-ui-lib/src/icons/bell_medium.js +++ b/packages/dnb-ui-lib/src/icons/bell_medium.js @@ -3,7 +3,7 @@ import React from 'react' const bell_medium = props => ( - + ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/calendar_medium.js b/packages/dnb-ui-lib/src/icons/calendar_medium.js index cfbda663d55..ec1c2d664db 100644 --- a/packages/dnb-ui-lib/src/icons/calendar_medium.js +++ b/packages/dnb-ui-lib/src/icons/calendar_medium.js @@ -3,11 +3,12 @@ import React from 'react' const calendar_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/check.js b/packages/dnb-ui-lib/src/icons/check.js index e7ac37fdc0b..d7dfe6b3026 100644 --- a/packages/dnb-ui-lib/src/icons/check.js +++ b/packages/dnb-ui-lib/src/icons/check.js @@ -3,7 +3,7 @@ import React from 'react' const check = props => ( - + ( - + ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_down_medium.js b/packages/dnb-ui-lib/src/icons/chevron_down_medium.js index 2631b1aeb8a..03fb2ad14a8 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_down_medium.js +++ b/packages/dnb-ui-lib/src/icons/chevron_down_medium.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_down_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_left.js b/packages/dnb-ui-lib/src/icons/chevron_left.js index 1d01d10c772..be24f47266f 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_left.js +++ b/packages/dnb-ui-lib/src/icons/chevron_left.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_left = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_left_medium.js b/packages/dnb-ui-lib/src/icons/chevron_left_medium.js index eb6529b5318..45a41ad942f 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_left_medium.js +++ b/packages/dnb-ui-lib/src/icons/chevron_left_medium.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_left_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_right.js b/packages/dnb-ui-lib/src/icons/chevron_right.js index cd5afe477ab..d9f437c6004 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_right.js +++ b/packages/dnb-ui-lib/src/icons/chevron_right.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_right = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_right_medium.js b/packages/dnb-ui-lib/src/icons/chevron_right_medium.js index 4666a08b73c..ede17f04f26 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_right_medium.js +++ b/packages/dnb-ui-lib/src/icons/chevron_right_medium.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_right_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_up.js b/packages/dnb-ui-lib/src/icons/chevron_up.js index 73059bdfe2a..3f4f879a6f7 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_up.js +++ b/packages/dnb-ui-lib/src/icons/chevron_up.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_up = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/chevron_up_medium.js b/packages/dnb-ui-lib/src/icons/chevron_up_medium.js index 050a1d72d39..f5203451736 100644 --- a/packages/dnb-ui-lib/src/icons/chevron_up_medium.js +++ b/packages/dnb-ui-lib/src/icons/chevron_up_medium.js @@ -3,11 +3,12 @@ import React from 'react' const chevron_up_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/close.js b/packages/dnb-ui-lib/src/icons/close.js index 5dcc53efc25..76c98eb88b8 100644 --- a/packages/dnb-ui-lib/src/icons/close.js +++ b/packages/dnb-ui-lib/src/icons/close.js @@ -3,11 +3,12 @@ import React from 'react' const close = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/close_medium.js b/packages/dnb-ui-lib/src/icons/close_medium.js index db57a025faa..691525ed32d 100644 --- a/packages/dnb-ui-lib/src/icons/close_medium.js +++ b/packages/dnb-ui-lib/src/icons/close_medium.js @@ -3,11 +3,12 @@ import React from 'react' const close_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/exclamation.js b/packages/dnb-ui-lib/src/icons/exclamation.js index 20441f92d02..7538555e254 100644 --- a/packages/dnb-ui-lib/src/icons/exclamation.js +++ b/packages/dnb-ui-lib/src/icons/exclamation.js @@ -3,11 +3,12 @@ import React from 'react' const exclamation = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/exclamation_medium.js b/packages/dnb-ui-lib/src/icons/exclamation_medium.js index 00bbf1257fc..e866f500b11 100644 --- a/packages/dnb-ui-lib/src/icons/exclamation_medium.js +++ b/packages/dnb-ui-lib/src/icons/exclamation_medium.js @@ -3,11 +3,12 @@ import React from 'react' const exclamation_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/fullscreen.js b/packages/dnb-ui-lib/src/icons/fullscreen.js index b3a7fa73d3c..8fbcea5b3d9 100644 --- a/packages/dnb-ui-lib/src/icons/fullscreen.js +++ b/packages/dnb-ui-lib/src/icons/fullscreen.js @@ -3,13 +3,18 @@ import React from 'react' const fullscreen = props => ( - - + + - + diff --git a/packages/dnb-ui-lib/src/icons/fullscreen_medium.js b/packages/dnb-ui-lib/src/icons/fullscreen_medium.js index d51d6db74af..cc90d955bb8 100644 --- a/packages/dnb-ui-lib/src/icons/fullscreen_medium.js +++ b/packages/dnb-ui-lib/src/icons/fullscreen_medium.js @@ -3,13 +3,18 @@ import React from 'react' const fullscreen_medium = props => ( - - + + - + diff --git a/packages/dnb-ui-lib/src/icons/hamburger.js b/packages/dnb-ui-lib/src/icons/hamburger.js index 082129c17ba..d0c9ae10ac2 100644 --- a/packages/dnb-ui-lib/src/icons/hamburger.js +++ b/packages/dnb-ui-lib/src/icons/hamburger.js @@ -3,11 +3,12 @@ import React from 'react' const hamburger = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/hamburger_medium.js b/packages/dnb-ui-lib/src/icons/hamburger_medium.js index c33ff1ea092..5307ebd99ce 100644 --- a/packages/dnb-ui-lib/src/icons/hamburger_medium.js +++ b/packages/dnb-ui-lib/src/icons/hamburger_medium.js @@ -3,12 +3,20 @@ import React from 'react' const hamburger_medium = props => ( - - + + + + + + + + + ) diff --git a/packages/dnb-ui-lib/src/icons/icons.lock b/packages/dnb-ui-lib/src/icons/icons.lock index 210e3d0757d..b32505fae88 100644 --- a/packages/dnb-ui-lib/src/icons/icons.lock +++ b/packages/dnb-ui-lib/src/icons/icons.lock @@ -1 +1 @@ -{"hamburger_medium.svg":{"id":"828:241","name":"hamburger","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/b34f/0117/842216e7e143d8bd9770122a441fdb85","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium"},"fullscreen_medium.svg":{"id":"850:86","name":"fullscreen","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/38d9/2c12/ebf51e3d78168e554a41c76b305c7096","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium"},"logout_medium.svg":{"id":"2038:18","name":"logout","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/564c/76c5/a2f240154fb268b71e78bdb456c3c31a","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium","timestamp":1546583415468},"trash_medium.svg":{"id":"1904:44","name":"trash","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/a0a9/fa3e/c6ae093c0fe79f1e4bb63804d5260200","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium","timestamp":1546583415833},"hamburger.svg":{"id":"548:105","name":"hamburger","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8bc4/b485/3c69f0cd7e89d1b54bcae9acc76ff936","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons"},"fullscreen.svg":{"id":"850:85","name":"fullscreen","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/dc1f/14aa/65e7ca2a7393155c307df7430716e1f4","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons"},"logout.svg":{"id":"2038:16","name":"logout","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/601e/8c08/17646f99fce7d75f1cfca0f1bd4dd05b","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons","timestamp":1546583427028},"trash.svg":{"id":"2038:6858","name":"trash","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/4d70/bf45/d097157b9f9f552cc86ce5d35e1c82b6","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons","timestamp":1546583427357},"exclamation_medium.svg":{"id":"828:256","name":"exclamation","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/5b44/cc7d/87cacf814895a20f6041d52eeff0515a","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"more_medium.svg":{"id":"828:254","name":"more","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8fdb/7c0c/e991230311f77b0305d2da2a63c3207c","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"search_medium.svg":{"id":"828:252","name":"search","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/fe62/b8ec/b2a8c8e2f49bc10cf12577fc399e32b9","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"question_medium.svg":{"id":"828:251","name":"question","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e654/18b0/84e49c2341646b89cd2176a879b8f31d","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"subtract_medium.svg":{"id":"828:249","name":"subtract","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/17b6/b7f4/2dc6218420ed4d0116c81964ebc943ce","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"add_medium.svg":{"id":"828:248","name":"add","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/ac1f/f17e/df400a4c94cb6a5374d42ebdd2b3e9a9","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"save_medium.svg":{"id":"828:247","name":"save","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e29b/c92e/d3be44b4637ae4d727d7e57f247efc34","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"close_medium.svg":{"id":"828:246","name":"close","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8ee2/d6c3/78b15fd1d54071094116bea360a7873c","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"chevron_left_medium.svg":{"id":"828:245","name":"chevron-left","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/3f2c/f909/1c2804eb5dff13d14f2dc24c1659ef78","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"chevron_right_medium.svg":{"id":"828:244","name":"chevron-right","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/370e/1ab4/7d39a36b108e201eb053ef445c8c1a91","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"chevron_down_medium.svg":{"id":"828:243","name":"chevron-down","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/0da4/2a7e/5bb7a294d0a27376ceca941b45da6ced","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"chevron_up_medium.svg":{"id":"1391:12","name":"chevron-up","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/05f7/6354/b56e4cf2ab4bae16697d6903f51b4d08","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium"},"bell_medium.svg":{"id":"1904:18","name":"bell","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/3d1b/3e94/3a48074d74939a2397080ef62dfcbeee","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546583429315},"calendar_medium.svg":{"id":"1904:30","name":"calendar","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/2816/fc13/5fc0753f7347df9a6f8252fbfaf67e3c","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546583429771},"check_medium.svg":{"id":"2058:35","name":"check","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/571d/4e26/b64c5c0f7f1bfe63a7a10efafc6a6be7","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546583430078},"exclamation.svg":{"id":"548:84","name":"exclamation","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e132/1e83/7920a77924428f83e9c2b685a79258f3","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"more.svg":{"id":"548:93","name":"more","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/42c1/6ccd/51769969a56c9eb303f9f299445924a9","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"search.svg":{"id":"548:117","name":"search","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e6a6/f567/15ab80c351b5a3ff4d11eadb33a2bbf9","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"question.svg":{"id":"548:121","name":"question","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/02a2/5fef/ea6e6aef3fc4b501823f48354c22baf5","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"subtract.svg":{"id":"548:132","name":"subtract","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/32cd/532a/48477f664a740e7f7becac07a2c217c8","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"add.svg":{"id":"548:135","name":"add","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/bc67/48d8/67273337a670189dd9ad0011ed7ea041","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"save.svg":{"id":"548:139","name":"save","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/df7d/1585/26e0f7d9aac87a0651d292e0be52b3fb","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"close.svg":{"id":"548:144","name":"close","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/d937/00b1/408f10f8b38c1f8b0001b94f1af56875","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"chevron_left.svg":{"id":"548:148","name":"chevron-left","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/1fe5/c93c/dd7d73ab0e453e8edab8e8265467b327","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"chevron_right.svg":{"id":"548:152","name":"chevron-right","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/d079/e314/8165adacf23f74690eac6de0e04e1790","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"chevron_up.svg":{"id":"1161:403","name":"chevron-up","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/aeb2/85e4/208f15da523d0ec834bd358b9291c979","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"chevron_down.svg":{"id":"548:156","name":"chevron-down","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/3168/b23d/938ddb61a27402e0a219791bd601eeb6","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons"},"check.svg":{"id":"2058:30","name":"check","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/5baa/e0bd/0f5b6a1a07156f190ba843aaedad9a2f","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546583433301},"calendar.svg":{"id":"2038:72","name":"calendar","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8928/5c68/2a3adc1a3ebac303b8bda1fd1e5712dc","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546583433654}} \ No newline at end of file +{"hamburger_medium.svg":{"id":"828:241","name":"hamburger","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e781/ac8e/e169b726620029d2a252093113ae0e6c","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium","timestamp":1546599207883},"fullscreen_medium.svg":{"id":"850:86","name":"fullscreen","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/38d9/2c12/ebf51e3d78168e554a41c76b305c7096","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium","timestamp":1546599208925},"logout_medium.svg":{"id":"2038:18","name":"logout","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/564c/76c5/a2f240154fb268b71e78bdb456c3c31a","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium","timestamp":1546599209831},"trash_medium.svg":{"id":"1904:44","name":"trash","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/a0a9/fa3e/c6ae093c0fe79f1e4bb63804d5260200","slug":"cbf00246c3420b5729f9f7c025ecfbbb","frame":"secondary_icons_medium","timestamp":1546599210590},"hamburger.svg":{"id":"548:105","name":"hamburger","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8bc4/b485/3c69f0cd7e89d1b54bcae9acc76ff936","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons","timestamp":1546599234290},"fullscreen.svg":{"id":"850:85","name":"fullscreen","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/dc1f/14aa/65e7ca2a7393155c307df7430716e1f4","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons","timestamp":1546599235119},"logout.svg":{"id":"2038:16","name":"logout","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/601e/8c08/17646f99fce7d75f1cfca0f1bd4dd05b","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons","timestamp":1546599235905},"trash.svg":{"id":"2038:6858","name":"trash","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/4d70/bf45/d097157b9f9f552cc86ce5d35e1c82b6","slug":"f76afaf9a754718646564d75921450b2","frame":"secondary_icons","timestamp":1546599236798},"exclamation_medium.svg":{"id":"828:256","name":"exclamation","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/5b44/cc7d/87cacf814895a20f6041d52eeff0515a","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599272757},"more_medium.svg":{"id":"828:254","name":"more","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8fdb/7c0c/e991230311f77b0305d2da2a63c3207c","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599273546},"bell_medium.svg":{"id":"1904:18","name":"bell","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/3d1b/3e94/3a48074d74939a2397080ef62dfcbeee","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599274436},"search_medium.svg":{"id":"828:252","name":"search","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/fe62/b8ec/b2a8c8e2f49bc10cf12577fc399e32b9","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599275344},"question_medium.svg":{"id":"828:251","name":"question","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e654/18b0/84e49c2341646b89cd2176a879b8f31d","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599276148},"calendar_medium.svg":{"id":"1904:30","name":"calendar","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/2816/fc13/5fc0753f7347df9a6f8252fbfaf67e3c","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599277001},"subtract_medium.svg":{"id":"828:249","name":"subtract","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/17b6/b7f4/2dc6218420ed4d0116c81964ebc943ce","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599277780},"add_medium.svg":{"id":"828:248","name":"add","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/7d8a/45f9/8dc32ce113625251ad69fb908b1e5e7d","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599278545},"save_medium.svg":{"id":"828:247","name":"save","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e29b/c92e/d3be44b4637ae4d727d7e57f247efc34","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599279349},"close_medium.svg":{"id":"828:246","name":"close","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8ee2/d6c3/78b15fd1d54071094116bea360a7873c","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599280176},"chevron_left_medium.svg":{"id":"828:245","name":"chevron-left","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/3f2c/f909/1c2804eb5dff13d14f2dc24c1659ef78","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599280953},"chevron_right_medium.svg":{"id":"828:244","name":"chevron-right","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/370e/1ab4/7d39a36b108e201eb053ef445c8c1a91","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599281722},"chevron_down_medium.svg":{"id":"828:243","name":"chevron-down","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/0da4/2a7e/5bb7a294d0a27376ceca941b45da6ced","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599282633},"chevron_up_medium.svg":{"id":"1391:12","name":"chevron-up","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/05f7/6354/b56e4cf2ab4bae16697d6903f51b4d08","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599283444},"check_medium.svg":{"id":"2058:35","name":"check","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/571d/4e26/b64c5c0f7f1bfe63a7a10efafc6a6be7","slug":"5f65bd20cf0e6825c8a5406e492ca23b","frame":"primary_icons_medium","timestamp":1546599284271},"exclamation.svg":{"id":"548:84","name":"exclamation","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e132/1e83/7920a77924428f83e9c2b685a79258f3","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599306492},"check.svg":{"id":"2058:30","name":"check","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/5baa/e0bd/0f5b6a1a07156f190ba843aaedad9a2f","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599307301},"more.svg":{"id":"548:93","name":"more","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/42c1/6ccd/51769969a56c9eb303f9f299445924a9","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599308112},"search.svg":{"id":"548:117","name":"search","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/e6a6/f567/15ab80c351b5a3ff4d11eadb33a2bbf9","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599308950},"question.svg":{"id":"548:121","name":"question","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/02a2/5fef/ea6e6aef3fc4b501823f48354c22baf5","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599309876},"calendar.svg":{"id":"2038:72","name":"calendar","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/8928/5c68/2a3adc1a3ebac303b8bda1fd1e5712dc","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599310696},"subtract.svg":{"id":"548:132","name":"subtract","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/f2cf/e35b/f47872bfab22a2e50812a3b47adf7f92","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599311483},"add.svg":{"id":"548:135","name":"add","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/18c9/df10/5b1f5c55217ba26a094a29d9d7a33428","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599312310},"save.svg":{"id":"548:139","name":"save","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/df7d/1585/26e0f7d9aac87a0651d292e0be52b3fb","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599313146},"close.svg":{"id":"548:144","name":"close","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/d937/00b1/408f10f8b38c1f8b0001b94f1af56875","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599313950},"chevron_left.svg":{"id":"548:148","name":"chevron-left","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/1fe5/c93c/dd7d73ab0e453e8edab8e8265467b327","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599314756},"chevron_right.svg":{"id":"548:152","name":"chevron-right","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/d079/e314/8165adacf23f74690eac6de0e04e1790","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599315569},"chevron_up.svg":{"id":"1161:403","name":"chevron-up","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/aeb2/85e4/208f15da523d0ec834bd358b9291c979","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599316427},"chevron_down.svg":{"id":"548:156","name":"chevron-down","url":"https://s3-us-west-2.amazonaws.com/figma-alpha-api/img/3168/b23d/938ddb61a27402e0a219791bd601eeb6","slug":"3d7caaada55565874ee26b98b982b9db","frame":"primary_icons","timestamp":1546599317248}} \ No newline at end of file diff --git a/packages/dnb-ui-lib/src/icons/logout.js b/packages/dnb-ui-lib/src/icons/logout.js index f881e5ee5c7..a6475ebbb37 100644 --- a/packages/dnb-ui-lib/src/icons/logout.js +++ b/packages/dnb-ui-lib/src/icons/logout.js @@ -3,18 +3,19 @@ import React from 'react' const logout = props => ( - + - + - + diff --git a/packages/dnb-ui-lib/src/icons/logout_medium.js b/packages/dnb-ui-lib/src/icons/logout_medium.js index a7b2ff055e4..9b98e0c2ab2 100644 --- a/packages/dnb-ui-lib/src/icons/logout_medium.js +++ b/packages/dnb-ui-lib/src/icons/logout_medium.js @@ -3,11 +3,12 @@ import React from 'react' const logout_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/more.js b/packages/dnb-ui-lib/src/icons/more.js index 82bd61936f2..c77f988f736 100644 --- a/packages/dnb-ui-lib/src/icons/more.js +++ b/packages/dnb-ui-lib/src/icons/more.js @@ -3,11 +3,12 @@ import React from 'react' const more = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/more_medium.js b/packages/dnb-ui-lib/src/icons/more_medium.js index 50a44588161..7b68770e48b 100644 --- a/packages/dnb-ui-lib/src/icons/more_medium.js +++ b/packages/dnb-ui-lib/src/icons/more_medium.js @@ -3,11 +3,12 @@ import React from 'react' const more_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/question.js b/packages/dnb-ui-lib/src/icons/question.js index 9e5cfacf5e5..f42ea6755ca 100644 --- a/packages/dnb-ui-lib/src/icons/question.js +++ b/packages/dnb-ui-lib/src/icons/question.js @@ -3,11 +3,12 @@ import React from 'react' const question = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/question_medium.js b/packages/dnb-ui-lib/src/icons/question_medium.js index 752e842afac..22f7c8b71ed 100644 --- a/packages/dnb-ui-lib/src/icons/question_medium.js +++ b/packages/dnb-ui-lib/src/icons/question_medium.js @@ -3,11 +3,12 @@ import React from 'react' const question_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/save.js b/packages/dnb-ui-lib/src/icons/save.js index 7c84effea9c..60b2b6109eb 100644 --- a/packages/dnb-ui-lib/src/icons/save.js +++ b/packages/dnb-ui-lib/src/icons/save.js @@ -3,11 +3,12 @@ import React from 'react' const save = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/save_medium.js b/packages/dnb-ui-lib/src/icons/save_medium.js index d9a79111fed..d46f8a0cc38 100644 --- a/packages/dnb-ui-lib/src/icons/save_medium.js +++ b/packages/dnb-ui-lib/src/icons/save_medium.js @@ -3,11 +3,12 @@ import React from 'react' const save_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/search.js b/packages/dnb-ui-lib/src/icons/search.js index 7631c0560c0..c6290668a10 100644 --- a/packages/dnb-ui-lib/src/icons/search.js +++ b/packages/dnb-ui-lib/src/icons/search.js @@ -3,11 +3,12 @@ import React from 'react' const search = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/search_medium.js b/packages/dnb-ui-lib/src/icons/search_medium.js index 7e322c48d63..5bb84035da2 100644 --- a/packages/dnb-ui-lib/src/icons/search_medium.js +++ b/packages/dnb-ui-lib/src/icons/search_medium.js @@ -3,11 +3,12 @@ import React from 'react' const search_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/subtract.js b/packages/dnb-ui-lib/src/icons/subtract.js index 80ea4f0fc38..9260035b82d 100644 --- a/packages/dnb-ui-lib/src/icons/subtract.js +++ b/packages/dnb-ui-lib/src/icons/subtract.js @@ -3,11 +3,12 @@ import React from 'react' const subtract = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/subtract_medium.js b/packages/dnb-ui-lib/src/icons/subtract_medium.js index 511265e3ff7..c3da0f25bd0 100644 --- a/packages/dnb-ui-lib/src/icons/subtract_medium.js +++ b/packages/dnb-ui-lib/src/icons/subtract_medium.js @@ -3,11 +3,12 @@ import React from 'react' const subtract_medium = props => ( - + ) diff --git a/packages/dnb-ui-lib/src/icons/trash.js b/packages/dnb-ui-lib/src/icons/trash.js index 7e29a45268e..8a43f0eeac8 100644 --- a/packages/dnb-ui-lib/src/icons/trash.js +++ b/packages/dnb-ui-lib/src/icons/trash.js @@ -3,8 +3,8 @@ import React from 'react' const trash = props => ( - - + + ( - +