From 08b4fb374b668582c676a836ad0ffc9bcae34473 Mon Sep 17 00:00:00 2001
From: sonnyprince <sonny.prince.sp@gmail.com>
Date: Thu, 30 Aug 2018 13:14:11 +0100
Subject: [PATCH] v1.7.0 - Icon updates (#29)

* v1.6.0 - addition of cash and clock icon, update fill of sort amount and offer and update map pin icon

* v1.7.0 - version bump post rebase

* v1.7.0 - remove width and height attr of map pin icon

* v1.7.0 - remove fill attrs from offer and sortAmount. add viewbox attr to cash and clock. update changelog

* v1.7.0 - remove of fill from mappin

* v1.7.0 - remove of cash and clock icon fill

* v1.7.0 - remove width and height attr of sort amount icon
---
 CHANGELOG.md                       | 12 ++++++++++++
 package.json                       |  2 +-
 src/img/icons/general/cash.svg     |  1 +
 src/img/icons/general/clock.svg    |  1 +
 src/img/icons/tools/mapPin.svg     |  4 +++-
 src/img/icons/tools/sortAmount.svg |  2 +-
 6 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 src/img/icons/general/cash.svg
 create mode 100644 src/img/icons/general/clock.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd66696..6bfa7c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+v1.7.0
+------------------------------
+*August 30, 2018*
+
+### Added
+- Cash Icon
+- Clock Icon
+
+### Changed
+- Remove path fill from sort amount icon
+- Updated Map Pin icon
+
 
 v1.6.0
 ------------------------------
diff --git a/package.json b/package.json
index 8f2ee23..2c18071 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@justeat/f-icons",
   "description": "Common icons for use in Fozzie projects.",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "files": [
     "src"
   ],
diff --git a/src/img/icons/general/cash.svg b/src/img/icons/general/cash.svg
new file mode 100644
index 0000000..d219cf6
--- /dev/null
+++ b/src/img/icons/general/cash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M11.25 16.667a2.083 2.083 0 1 1 0-4.167 2.083 2.083 0 0 1 0 4.167zm0-.834a1.25 1.25 0 1 0 0-2.5 1.25 1.25 0 0 0 0 2.5zm-6.258-4.166V17.5H17.5v-5.833H4.992zm-.417-.834h13.342c.23 0 .416.187.416.417v6.667c0 .23-.186.416-.416.416H4.575a.417.417 0 0 1-.417-.416V11.25c0-.23.187-.417.417-.417zm-1.872-1.45l.824 1.41a.417.417 0 0 1-.72.42l-1.033-1.77a.417.417 0 0 1 .15-.57l11.524-6.725a.417.417 0 0 1 .57.15l3.367 5.758a.417.417 0 0 1-.15.57l-2.258 1.317a.417.417 0 1 1-.42-.72l1.898-1.106-2.946-5.039L2.703 9.383zm8.682.41a.417.417 0 0 1-.72-.419 1.25 1.25 0 1 0-2.163 0 .417.417 0 0 1-.72.418 2.083 2.083 0 1 1 3.603 0z"/></svg>
\ No newline at end of file
diff --git a/src/img/icons/general/clock.svg b/src/img/icons/general/clock.svg
new file mode 100644
index 0000000..d08d7c3
--- /dev/null
+++ b/src/img/icons/general/clock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M12.795 12.205a.417.417 0 1 1-.59.59l-2.622-2.622V6.25a.417.417 0 1 1 .834 0v3.577l2.378 2.378zM10 17.5a7.5 7.5 0 1 1 0-15 7.5 7.5 0 0 1 0 15zm0-.833a6.667 6.667 0 1 0 0-13.334 6.667 6.667 0 0 0 0 13.334z"/></svg>
\ No newline at end of file
diff --git a/src/img/icons/tools/mapPin.svg b/src/img/icons/tools/mapPin.svg
index 125dc39..2ac82cf 100644
--- a/src/img/icons/tools/mapPin.svg
+++ b/src/img/icons/tools/mapPin.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 46.9 58.3"><path d="M23.4 58.2L7.1 39.6c-8.3-9.4-9-23.7 0-32.7 9-9 23.7-9 32.7 0 9 9 8.3 22.7 0 32.7L23.4 58.2zm0-43.6c-4.8 0-8.7 3.9-8.7 8.7 0 4.8 3.9 8.7 8.7 8.7 4.8 0 8.7-3.9 8.7-8.7 0-4.8-3.9-8.7-8.7-8.7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+    <path fill-rule="nonzero" d="M10 10.833a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zM10 10a1.667 1.667 0 1 0 0-3.333A1.667 1.667 0 0 0 10 10zm4.716-6.485a6.633 6.633 0 0 1 2.034 4.657c0 2.256-1.23 4.621-3.268 6.974a25.286 25.286 0 0 1-3.228 3.101.417.417 0 0 1-.508 0 23.028 23.028 0 0 1-1.014-.857 25.286 25.286 0 0 1-2.214-2.244C4.48 12.793 3.25 10.428 3.25 8.163A6.628 6.628 0 0 1 10 1.667a6.628 6.628 0 0 1 4.716 1.848zM10.711 16.77c.73-.655 1.46-1.385 2.14-2.17 1.92-2.215 3.066-4.418 3.066-6.42a5.795 5.795 0 0 0-5.909-5.68 5.806 5.806 0 0 0-4.147 1.616 5.79 5.79 0 0 0-1.778 4.056c0 2.01 1.146 4.213 3.065 6.428a24.463 24.463 0 0 0 2.845 2.776c.226-.174.463-.377.718-.606z"/>
+</svg>
diff --git a/src/img/icons/tools/sortAmount.svg b/src/img/icons/tools/sortAmount.svg
index 1a5db2e..849595a 100644
--- a/src/img/icons/tools/sortAmount.svg
+++ b/src/img/icons/tools/sortAmount.svg
@@ -1 +1 @@
-<svg width="16" height="10" viewBox="0 0 16 10" xmlns="http://www.w3.org/2000/svg"><path d="M.44.89a.44.44 0 0 1 0-.89h15.12a.44.44 0 0 1 0 .89H.44zm0 4.44a.44.44 0 0 1 0-.89h9.78a.44.44 0 1 1 0 .9H.44zm0 4.45a.44.44 0 0 1 0-.9H4.9a.44.44 0 1 1 0 .9H.44z" fill="#000" fill-rule="nonzero"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 10" xmlns="http://www.w3.org/2000/svg"><path d="M.44.89a.44.44 0 0 1 0-.89h15.12a.44.44 0 0 1 0 .89H.44zm0 4.44a.44.44 0 0 1 0-.89h9.78a.44.44 0 1 1 0 .9H.44zm0 4.45a.44.44 0 0 1 0-.9H4.9a.44.44 0 1 1 0 .9H.44z" fill-rule="nonzero"/></svg>
\ No newline at end of file