Skip to content

Commit

Permalink
SFO-4335 Add remaining icons needed to upgrade ffe-icons
Browse files Browse the repository at this point in the history
  • Loading branch information
wkillerud committed Sep 12, 2016
1 parent 5338355 commit c4e3f18
Show file tree
Hide file tree
Showing 32 changed files with 98 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules/
dist/
dist/symbol
.idea/
gemini-report/

Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Changelog

## Version 5.1.0

* Added a bunch of new icons
* campingbil-ikon
* fritidshus-ikon
* handlevogn-ikon
* hus-enebolig-ikon
* hus-horisontaldelt-ikon
* hus-ikon
* hus-kjedet-ikon
* hus-leilighet-ikon
* hus-rekkehus-ikon
* hus-vertikaldelt-ikon
* katt-ikon
* lommebok-ikon
* mobil-ikon
* motorsykkel-ikon
* nokkelhull-ikon
* person-brukket-arm-ikon
* robat-ikon
* seilbat-ikon
* snoscooter-ikon
* sofa-ikon
* sporsmalstegn-ikon
* sykebil-ikon
* traktor-ikon
* ung-caps-ikon

## Version 5.0.0

* A vengeful lumberjack has swung the axe against tre-ikon, spire-ikon, and blad-ikon. It was decided the icons did not fit the brand and should not be used by anyone.
Expand Down
25 changes: 25 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash -e

main() {
npm install
npm run compile

rm -rf target/
mkdir -p target/archive

./run_visual-tests.sh

cp -R dist target/archive
}

_move_gemini_files() {
testRes=$?

cp -R gemini-report/ target/archive

exit ${testRes}
}

trap "_move_gemini_files" INT TERM EXIT

main "$@"
32 changes: 6 additions & 26 deletions buildCI.sh
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
#!/bin/bash -e

main() {
npm install
npm run start

rm -rf target/
mkdir -p target/archive

./run_visual-tests.sh

cp -R dist target/archive

if should_publish; then
npm run has-published -s || npm publish
fi
}
# Runs build.sh before checking should_publish

function should_publish() {
[[ $GIT_BRANCH =~ ^(origin/)?master$ ]]
}

_move_gemini_files() {
testRes=$?

cp -R gemini-report/ target/archive

exit ${testRes}
}

trap "_move_gemini_files" INT TERM EXIT
source build.sh

main "$@"
if should_publish; then
npm run has-published -s || npm publish
bob ci job build --jobname ffe-design-system_build_deploy
fi
1 change: 1 addition & 0 deletions icons/campingbil-ikon.svg
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/fritidshus-ikon.svg
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/handlevogn-ikon.svg
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/hus-enebolig-ikon.svg
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/hus-horisontaldelt-ikon.svg
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/hus-ikon.svg
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/hus-kjedet-ikon.svg
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/hus-leilighet-ikon.svg
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/hus-rekkehus-ikon.svg
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/hus-vertikaldelt-ikon.svg
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/katt-ikon.svg
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/lommebok-ikon.svg
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/mobil-ikon.svg
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/motorsykkel-ikon.svg
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/nokkelhull-ikon.svg
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/person-brukket-arm-ikon.svg
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/robat-ikon.svg
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/seilbat-ikon.svg
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 c4e3f18

Please sign in to comment.