Skip to content

Commit

Permalink
Merge branch 'feat_fill_country'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/utils/const.ts
#	src/utils/utils.ts
  • Loading branch information
ben-29 committed Mar 27, 2024
2 parents 89a7d82 + f21832d commit ead01ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions pnpm-lock.yaml

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

4 changes: 2 additions & 2 deletions src/utils/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ export const HIKE_COLOR = pink;
export const SWIM_COLOR = gold;
export const ROWING_COLOR = cyan;
export const ROAD_TRIP_COLOR = purple;
export const FLIGHT_COLOR = wpink;
export const FLIGHT_COLOR = dark_vanilla;
export const PROVINCE_FILL_COLOR = '#47b8e0';
export const COUNTRY_FILL_COLOR = dark_vanilla;
export const KAYAKING_COLOR = red;
export const SNOWBOARD_COLOR = wpink;
export const SNOWBOARD_COLOR = dark_vanilla;
export const TRAIL_RUN_COLOR = IKB;

0 comments on commit ead01ab

Please sign in to comment.