Skip to content

Commit

Permalink
Merge branch 'FRONT-3362-add-logos' of https://github.com/ec-europa/e…
Browse files Browse the repository at this point in the history 
…uropa-component-library into FRONT-3362-add-logos
  • Loading branch information
@emeryro
emeryro committed Jan 12, 2022
2 parents 055bab0 + a841afe commit d7115a2
Show file tree
Hide file tree
Showing 14 changed files with 99 additions and 46 deletions.
Binary file added cms-images/ec_ph_st_thumb_l_734px.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms-images/ec_ph_stan_dark_l_734px.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms-images/ec_ph_stan_image_l_734px.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cms-images/ec_ph_stan_light_l_734px.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 7 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
},
"devDependencies": {
"@babel/eslint-parser": "7.16.5",
"@babel/plugin-transform-runtime": "7.16.7",
"@babel/plugin-proposal-export-default-from": "7.16.7",
"@babel/plugin-transform-runtime": "7.16.7",
"@size-limit/preset-big-lib": "4.12.0",
"babel-jest": "26.6.3",
"classnames": "2.3.1",
Expand All @@ -54,13 +54,13 @@
"lerna": "4.0.0",
"lerna-changelog": "2.2.0",
"lint-staged": "12.1.5",
"netlify-cli": "8.6.1",
"netlify-cli": "8.6.5",
"node-fetch": "2.6.1",
"npm-run-all": "4.1.5",
"patch-package": "6.4.7",
"postinstall-postinstall": "2.1.0",
"prettier": "2.5.1",
"prop-types": "15.8.0",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"rimraf": "3.0.2",
Expand All @@ -69,8 +69,8 @@
"stylelint": "14.2.0",
"stylelint-config-css-modules": "2.3.0",
"stylelint-config-prettier": "9.0.3",
"stylelint-config-standard-scss": "3.0.0",
"stylelint-config-standard": "24.0.0",
"stylelint-config-standard-scss": "3.0.0",
"stylelint-order": "5.0.0",
"stylelint-scss": "4.1.0",
"stylelint-selector-bem-pattern": "2.1.1",
Expand All @@ -84,6 +84,9 @@
"hosted-git-info": ">=3.0.8",
"lodash": ">=4.17.21",
"ua-parser-js": ">=0.7.24",
"immer": ">=9.0.6",
"merge": ">=2.1.1",
"browserslist": ">=4.16.5",
"xmlhttprequest-ssl": ">=1.6.2",
"handlebars": ">=4.7.7",
"normalize-url": ">=4.5.1 <5.0.0",
Expand Down
14 changes: 14 additions & 0 deletions src/implementations/twig/components/icon/__snapshots__/icon.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,20 @@ exports[`Icon All icons - icon tag renders correctly 1`] = `
</jest>
`;

exports[`Icon All icons - icon trash renders correctly 1`] = `
<jest>
<svg
aria-hidden="true"
class="ecl-icon ecl-icon--m"
focusable="false"
>
<use
xlink:href="/icons.svg#trash"
/>
</svg>
</jest>
`;

exports[`Icon All icons - icon video renders correctly 1`] = `
<jest>
<svg
Expand Down
7 changes: 7 additions & 0 deletions src/implementations/vanilla/components/unordered-list/_unordered-list.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ $_divider-color: null !default;
.ecl-unordered-list {
padding-left: map.get(theme.$spacing, 'm');
}

> .ecl-unordered-list__item {
margin-left: 0;
padding-left: 0;
}
}

// Dividers
Expand All @@ -53,7 +58,9 @@ $_divider-color: null !default;
> .ecl-unordered-list__item {
border-bottom: 1px solid $_divider-color;
margin-bottom: map.get(theme.$spacing, 'm');
margin-left: 0;
padding-bottom: map.get(theme.$spacing, 'm');
padding-left: 0;
}

> .ecl-unordered-list__item:last-child {
Expand Down
2 changes: 1 addition & 1 deletion src/playground/addons/storybook-addon-code/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@storybook/components": "6.4.9",
"@storybook/theming": "6.4.9",
"js-beautify": "1.14.0",
"prop-types": "15.8.0",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-dom": "17.0.2"
}
Expand Down
2 changes: 1 addition & 1 deletion src/playground/addons/storybook-addon-notes/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"he": "1.2.0",
"marked": "2.1.3",
"prismjs": "1.25.0",
"prop-types": "15.8.0",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-dom": "17.0.2"
}
Expand Down
5 changes: 5 additions & 0 deletions src/resources/icons-ec/src/all/trash.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/resources/icons-eu/src/all/trash.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/tools/builder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
},
"dependencies": {
"@babel/core": "7.16.7",
"@babel/eslint-parser": "7.16.5",
"@babel/preset-env": "7.16.7",
"@babel/runtime": "7.16.7",
"@rollup/plugin-replace": "2.4.2",
"autoprefixer": "10.4.1",
"@babel/eslint-parser": "7.16.5",
"browser-sync": "2.27.7",
"commander": "8.3.0",
"cssnano": "4.1.10",
"globby": "11.0.4",
"ncp": "2.0.0",
"postcss": "8.4.5",
"postcss-banner": "3.0.2",
"rollup": "2.62.0",
"rollup": "2.63.0",
"rollup-plugin-babel": "4.4.0",
"rollup-plugin-commonjs": "10.1.0",
"rollup-plugin-node-resolve": "5.2.0",
"rollup-plugin-svg": "2.0.0",
"rollup-plugin-uglify": "6.0.4",
"sass": "1.45.2"
"sass": "1.46.0"
},
"engines": {
"node": ">=12.0.0"
Expand Down
6 changes: 3 additions & 3 deletions src/website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
"object-assign": "4.1.1",
"prismjs": "1.25.0",
"promise": "8.1.0",
"prop-types": "15.8.0",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-helmet": "6.1.0",
"react-hot-loader": "4.13.0",
"react-router-dom": "5.3.0",
"slugify": "1.6.4",
"slugify": "1.6.5",
"svg4everybody": "2.1.9"
},
"devDependencies": {
Expand Down Expand Up @@ -83,7 +83,7 @@
"remark-frontmatter": "2.0.0",
"remark-unwrap-images": "2.1.0",
"rimraf": "3.0.2",
"sass": "1.45.2",
"sass": "1.46.0",
"sass-loader": "10.1.0",
"serve": "11.3.2",
"style-loader": "2.0.0",
Expand Down
86 changes: 52 additions & 34 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3271,10 +3271,10 @@
call-me-maybe "^1.0.1"
glob-to-regexp "^0.3.0"

"@netlify/build@^26.0.2":
version "26.0.2"
resolved "https://registry.yarnpkg.com/@netlify/build/-/build-26.0.2.tgz#61d3193a2ea3b7c34973b805a479ced6e56e1c93"
integrity sha512-Ecq5zVAwiBvWew3alc8UVap8JMaAGNsFnOaL90Veuf/87kT6Y+otJfAeFLiuMqaa3ByBqLqn13BwaYqEqtczEw==
"@netlify/build@^26.1.0":
version "26.1.0"
resolved "https://registry.yarnpkg.com/@netlify/build/-/build-26.1.0.tgz#72860e5c90e95a8733731f54e1805a9333bd708b"
integrity sha512-BZEC/8jUizGkZboc7RGGTC23KcFUH9MawpfH5ecFVM30gzL3LEdAOFZS/xvgffC3s5s2vsnZenslICowUpJueA==
dependencies:
"@bugsnag/js" "^7.0.0"
"@netlify/cache-utils" "^4.0.0"
Expand Down Expand Up @@ -3534,6 +3534,11 @@
resolved "https://registry.yarnpkg.com/@netlify/open-api/-/open-api-2.7.0.tgz#d8147396a0c41b5e9de1f52889004ad2a1d59163"
integrity sha512-WzedpLK6XFs67naFDX1K3QWk3GKlUQVCuIlMuXb0dWvJvfB71R/Njk1bq0FqVllIWw2RRCQMkCIywEABbnB2Yg==

"@netlify/open-api@^2.8.0":
version "2.8.0"
resolved "https://registry.yarnpkg.com/@netlify/open-api/-/open-api-2.8.0.tgz#e59537ae9aa8342c2aa64952d42e5e089c8422f4"
integrity sha512-lfNB/QYDgaP07pwm/nWEaWPvRAAGyhxvJqNzvxMijc7A4uwquMjlbYve8yYyd0LJXPwgBpGobwiQj5RA76xzUQ==

"@netlify/plugin-edge-handlers@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-3.0.0.tgz#c81b3449b509ebaed075c535013441f85e9db372"
Expand Down Expand Up @@ -13029,10 +13034,10 @@ ignore@^5.2.0:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==

immer@8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656"
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
immer@8.0.1, immer@>=9.0.6:
version "9.0.7"
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.7.tgz#b6156bd7db55db7abc73fd2fdadf4e579a701075"
integrity sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA==

immutable@^3:
version "3.8.2"
Expand Down Expand Up @@ -15776,10 +15781,10 @@ merge2@^1.2.3, merge2@^1.3.0:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==

merge@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
merge@>=2.1.1, merge@^1.2.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==

methods@~1.1.2:
version "1.1.2"
Expand Down Expand Up @@ -16390,12 +16395,12 @@ nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==

netlify-cli@8.6.1:
version "8.6.1"
resolved "https://registry.yarnpkg.com/netlify-cli/-/netlify-cli-8.6.1.tgz#bf0ac9cd8cd3d65caf8b84a90770e51f563bff94"
integrity sha512-O4l+JJyuOujVfuK4lCuYQ+Uo6keOocts1A373tD++fEDdPlcRTopo3QwUy/dQyYQe8f+eGR1tq4od8snNNwr3w==
netlify-cli@8.6.5:
version "8.6.5"
resolved "https://registry.yarnpkg.com/netlify-cli/-/netlify-cli-8.6.5.tgz#3c1e4a91a2ae104a0ca55e2d70bcbdfbeff1a5d0"
integrity sha512-ok4f10W8jLPNSn0vSXd+YIrhjhUX0/sNa97L8B1umNlhfFueIDmbpRuUQyN6zYyOMv3Xkl/QS6g+Rlamu9rWcA==
dependencies:
"@netlify/build" "^26.0.2"
"@netlify/build" "^26.1.0"
"@netlify/config" "^17.0.2"
"@netlify/framework-info" "^7.0.0"
"@netlify/local-functions-proxy" "^1.1.1"
Expand Down Expand Up @@ -16464,7 +16469,7 @@ netlify-cli@8.6.1:
minimist "^1.2.5"
mock-require "^3.0.3"
multiparty "^4.2.1"
netlify "^10.1.0"
netlify "^10.1.1"
netlify-headers-parser "^6.0.0"
netlify-redirect-parser "^13.0.0"
netlify-redirector "^0.2.1"
Expand Down Expand Up @@ -16573,6 +16578,19 @@ netlify@^10.1.0:
p-wait-for "^3.2.0"
qs "^6.9.6"

netlify@^10.1.1:
version "10.1.1"
resolved "https://registry.yarnpkg.com/netlify/-/netlify-10.1.1.tgz#dbd8b978cc4615d3b7ffd4db26ccf469febd3c34"
integrity sha512-aXW+R0rhTpLWK9aa51QETcPI+U2WuMUWA7wPr0thBCsMy/q4tsuAUC3f9OXYXcR3AzRkLOTwqmAfzWb+zKmqGg==
dependencies:
"@netlify/open-api" "^2.8.0"
lodash.camelcase "^4.3.0"
micro-api-client "^3.3.0"
node-fetch "^2.6.1"
omit.js "^2.0.2"
p-wait-for "^3.2.0"
qs "^6.9.6"

nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
Expand Down Expand Up @@ -18909,10 +18927,10 @@ promzard@^0.3.0:
dependencies:
read "1"

prop-types@15.8.0:
version "15.8.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588"
integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g==
prop-types@15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
dependencies:
loose-envify "^1.4.0"
object-assign "^4.1.1"
Expand Down Expand Up @@ -20319,10 +20337,10 @@ rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
dependencies:
estree-walker "^0.6.1"

rollup@2.62.0:
version "2.62.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.62.0.tgz#9e640b419fc5b9e0241844f6d55258bd79986ecc"
integrity sha512-cJEQq2gwB0GWMD3rYImefQTSjrPYaC6s4J9pYqnstVLJ1CHa/aZNVkD4Epuvg4iLeMA4KRiq7UM7awKK6j7jcw==
rollup@2.63.0:
version "2.63.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.63.0.tgz#fe2f7fec2133f3fab9e022b9ac245628d817c6bb"
integrity sha512-nps0idjmD+NXl6OREfyYXMn/dar3WGcyKn+KBzPdaLecub3x/LrId0wUcthcr8oZUAcZAR8NKcfGGFlNgGL1kQ==
optionalDependencies:
fsevents "~2.3.2"

Expand Down Expand Up @@ -20456,10 +20474,10 @@ sass-loader@10.1.0:
schema-utils "^3.0.0"
semver "^7.3.2"

sass@1.45.2:
version "1.45.2"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.2.tgz#130b428c1692201cfa181139835d6fc378a33323"
integrity sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g==
sass@1.46.0:
version "1.46.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.46.0.tgz#923117049525236026a7ede69715580eb0fac751"
integrity sha512-Z4BYTgioAOlMmo4LU3Ky2txR8KR0GRPLXxO38kklaYxgo7qMTgy+mpNN4eKsrXDTFlwS5vdruvazG4cihxHRVQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down Expand Up @@ -20904,10 +20922,10 @@ slide@^1.1.6:
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=

slugify@1.6.4:
version "1.6.4"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.4.tgz#33d84cc9e859ca3852e6537af6a5ff5bb9e439aa"
integrity sha512-Pcz296CK0uGnTf4iNQId79Uv6/5G16t0g0x3OsxWS8qVSOW+JXNnNHKVcuDiMgEGTWyK6zjlWXo2dvzV/FLf9Q==
slugify@1.6.5:
version "1.6.5"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.5.tgz#c8f5c072bf2135b80703589b39a3d41451fbe8c8"
integrity sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==

smart-buffer@^4.1.0:
version "4.2.0"
Expand Down

0 comments on commit d7115a2

Please sign in to comment.