Skip to content

Commit

Permalink
Merge pull request #71 in FFE/ffe-icons from PPM-662-new-illustration…
Browse files Browse the repository at this point in the history
…s to master

* commit '44b96229badcd9f1621df5df5876867673018edc':
  PPM-662. New icons for pensjonsveileder
  • Loading branch information
ivarni committed Oct 11, 2016
2 parents aaacaa0 + dc505c2 commit 5e52151
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 6.0.0
* Breaking: kontorbygg-ikon renamed to kontorbygg-solid-ikon in order to be consistent with how other icons are named. Anyone who where using the `kontorbygg-ikon` and wants to keep using the version with a fill should change to `kontorbygg-solid-ikon`.
* Add new icons
* kontorbygg-ikon (replaces old solid one with a non-solid version)
* skyskraper-ikon
* personer-ikon

## 5.3.1
* No change

Expand Down
2 changes: 1 addition & 1 deletion icons/kontorbygg-ikon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/kontorbygg-solid-ikon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/personer-ikon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/skyskraper-ikon.svg
Loading
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.3.1",
"version": "6.0.0",
"description": "Felles Front End Icons",
"main": "index.js",
"scripts": {
Expand Down
Binary file modified visual-tests/baseline-screenshots/dist/plain/firefox.png
Loading
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 5e52151

Please sign in to comment.