Skip to content

Commit

Permalink
Added hus-hake-ikon, hus-hjerte-ikon and kr-hake-ikon
Browse files Browse the repository at this point in the history
  • Loading branch information
Hanna Kamperud committed Sep 13, 2016
1 parent 91b5336 commit 0f43b3e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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***).
Expand Down
3 changes: 3 additions & 0 deletions icons/hus-hake-ikon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/hus-hjerte-ikon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/kr-hake-ikon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-icons",
"version": "5.1.0",
"version": "5.2.0",
"description": "Felles Front End Icons",
"main": "index.js",
"scripts": {
Expand Down
Binary file modified visual-tests/baseline-screenshots/dist/plain/firefox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0f43b3e

Please sign in to comment.