Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BPK-2714]: New flight-landing, flight-takeoff and aircraft icons. #347

Merged
merged 1 commit into from
Jul 12, 2019
Merged

[BPK-2714]: New flight-landing, flight-takeoff and aircraft icons. #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Backpack/Icon/Assets/BpkIconIOS.ttf
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions Backpack/Icon/Assets/iconMapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"add-circle": "EAAF",
"adult": "EA04",
"aircon": "EA05",
"aircraft": "EADA",
"airline--multiple": "EA06",
"airline": "EA07",
"airports": "EA08",
Expand Down Expand Up @@ -78,6 +79,8 @@
"filter": "EACD",
"flag": "EA40",
"flask": "EAAC",
"flight-landing": "EADB",
"flight-takeoff": "EADC",
"flight": "EA41",
"food": "EA42",
"gears-automatic-circle": "EAB5",
Expand Down
3 changes: 3 additions & 0 deletions Backpack/Icon/Classes/Generated/BPKIconNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ FOUNDATION_EXPORT BPKIconName const BPKIconNameAccount;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAddCircle;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAdult;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAircon;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAircraft;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAirlineMultiple;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAirline;
FOUNDATION_EXPORT BPKIconName const BPKIconNameAirports;
Expand Down Expand Up @@ -100,6 +101,8 @@ FOUNDATION_EXPORT BPKIconName const BPKIconNameFastTrain;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFilter;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFlag;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFlask;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFlightLanding;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFlightTakeoff;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFlight;
FOUNDATION_EXPORT BPKIconName const BPKIconNameFood;
FOUNDATION_EXPORT BPKIconName const BPKIconNameGearsAutomaticCircle;
Expand Down
3 changes: 3 additions & 0 deletions Backpack/Icon/Classes/Generated/BPKIconNames.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
BPKIconName const BPKIconNameAddCircle = @"add-circle";
BPKIconName const BPKIconNameAdult = @"adult";
BPKIconName const BPKIconNameAircon = @"aircon";
BPKIconName const BPKIconNameAircraft = @"aircraft";
BPKIconName const BPKIconNameAirlineMultiple = @"airline--multiple";
BPKIconName const BPKIconNameAirline = @"airline";
BPKIconName const BPKIconNameAirports = @"airports";
Expand Down Expand Up @@ -98,6 +99,8 @@
BPKIconName const BPKIconNameFilter = @"filter";
BPKIconName const BPKIconNameFlag = @"flag";
BPKIconName const BPKIconNameFlask = @"flask";
BPKIconName const BPKIconNameFlightLanding = @"flight-landing";
BPKIconName const BPKIconNameFlightTakeoff = @"flight-takeoff";
BPKIconName const BPKIconNameFlight = @"flight";
BPKIconName const BPKIconNameFood = @"food";
BPKIconName const BPKIconNameGearsAutomaticCircle = @"gears-automatic-circle";
Expand Down
7 changes: 7 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

> Place your changes below this line.

**Added:**
- Backpack/Icon
- New icons:
- Added `flight-landing` as `BPKIconNameFlightLanding`.
- Added `flight-takeoff` as `BPKIconNameFlightTakeoff`.
- Added `aircraft` as `BPKIconNameAircraft`.

## How to write a good changelog entry

1. Add 'Breaking', 'Added' or 'Fixed' in bold depending on if the change will be major, minor or patch according to [semver](semver.org).
Expand Down
54 changes: 51 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"homepage": "https://github.com/Skyscanner/backpack-ios#readme",
"devDependencies": {
"bpk-svgs": "^6.8.0",
"bpk-svgs": "^6.9.0",
"bpk-tokens": "^27.6.0",
"del": "^5.0.0",
"eslint-config-skyscanner-with-prettier": "^0.8.0",
Expand Down