diff --git a/CHANGELOG.md b/CHANGELOG.md index ba8cc8014e..a019b3f4fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Version 5.2.0 + +*Added a few new icons + * hus-hake-ikon.svg + * hus-hjerte-ikon-svg + * kr-hake-ikon.svg + ## Version 5.1.0 * Added a bunch of new icons diff --git a/README.md b/README.md index 9668094236..05687c72b1 100644 --- a/README.md +++ b/README.md @@ -116,16 +116,16 @@ if you get stuck. Also before starting, verify your SVG meets the criteria listed in *icons/_ICON_REQUIREMENTS.md* -If you haven't already, fork this repository and clone it on your machine. - 1. Fetch the latest `master` branch in ffe-icons, and create a feature branch from there. 2. Clean up the SVG markup [^3]. 3. Add the icon SVG to the `icons/` folder [^1]. 4. Verify that the icon looks OK relative to the others (padding etc) [^2]. 5. Update `CHANGELOG.md` with a new entry for the next version. 6. Update package.json with the new version -7. Commit your changes to the feature branch, and push the changes to `origin`. -8. Create a pull request from your repos feature branch to ffe-icons `master`. +7. Update the baseline-screenshot so the visual regression testing doesn't fail (see below) +8. Commit your changes to the feature branch, and push the changes to `origin`. +9. Make sure you have at least one successful build on jenkins (feature branches are built automatically) +10. Create a pull request from your repos feature branch to ffe-icons `master`. ## Visual regression testing See [readme for ffe-core](***REMOVED***). diff --git a/icons/hus-hake-ikon.svg b/icons/hus-hake-ikon.svg new file mode 100755 index 0000000000..edd3df1058 --- /dev/null +++ b/icons/hus-hake-ikon.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/hus-hjerte-ikon.svg b/icons/hus-hjerte-ikon.svg new file mode 100755 index 0000000000..2be52c1a8c --- /dev/null +++ b/icons/hus-hjerte-ikon.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/kr-hake-ikon.svg b/icons/kr-hake-ikon.svg new file mode 100755 index 0000000000..2befb535a1 --- /dev/null +++ b/icons/kr-hake-ikon.svg @@ -0,0 +1,3 @@ + + + diff --git a/package.json b/package.json index 54909394e0..352b10e123 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffe-icons", - "version": "5.1.0", + "version": "5.2.0", "description": "Felles Front End Icons", "main": "index.js", "scripts": { diff --git a/visual-tests/baseline-screenshots/dist/plain/firefox.png b/visual-tests/baseline-screenshots/dist/plain/firefox.png index ad5c590bf6..b5ef757cde 100644 Binary files a/visual-tests/baseline-screenshots/dist/plain/firefox.png and b/visual-tests/baseline-screenshots/dist/plain/firefox.png differ