From fb03bcc705376e8cda1611d31a8cec681589b21b Mon Sep 17 00:00:00 2001 From: kboonstra Date: Fri, 18 Oct 2024 18:36:16 +0100 Subject: [PATCH 1/7] add british pound icons --- resources/icons/16px/british-pound.svg | 3 +++ resources/icons/20px/british-pound.svg | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 resources/icons/16px/british-pound.svg create mode 100644 resources/icons/20px/british-pound.svg diff --git a/resources/icons/16px/british-pound.svg b/resources/icons/16px/british-pound.svg new file mode 100644 index 0000000000..6180b9f5e6 --- /dev/null +++ b/resources/icons/16px/british-pound.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/20px/british-pound.svg b/resources/icons/20px/british-pound.svg new file mode 100644 index 0000000000..4e2ba30cf8 --- /dev/null +++ b/resources/icons/20px/british-pound.svg @@ -0,0 +1,3 @@ + + + From 849ee7e99a9fb57317522461889a1ef91bb6d15d Mon Sep 17 00:00:00 2001 From: kboonstra Date: Fri, 18 Oct 2024 18:49:47 +0100 Subject: [PATCH 2/7] add icon to icons.json --- packages/icons/icons.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/icons/icons.json b/packages/icons/icons.json index 2ba917549c..af300a812d 100644 --- a/packages/icons/icons.json +++ b/packages/icons/icons.json @@ -4506,5 +4506,12 @@ "tags": "shape, 3d, object, vehicle, military, flight, jet, fly, aircraft, aerospace", "group": "interface", "codepoint": 62340 + }, + { + "displayName": "British Pound", + "iconName": "british-pound", + "tags": "currency, money", + "group": "miscellaneous", + "codepoint": 62341 } ] From 398f33f69b7b4f5f246b996ef586024fe9c99106 Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Tue, 22 Oct 2024 17:58:18 -0400 Subject: [PATCH 3/7] Remove unnecessary svg properties --- resources/icons/16px/british-pound.svg | 4 ++-- resources/icons/20px/british-pound.svg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/icons/16px/british-pound.svg b/resources/icons/16px/british-pound.svg index 6180b9f5e6..e59573df06 100644 --- a/resources/icons/16px/british-pound.svg +++ b/resources/icons/16px/british-pound.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/icons/20px/british-pound.svg b/resources/icons/20px/british-pound.svg index 4e2ba30cf8..e29a6911a3 100644 --- a/resources/icons/20px/british-pound.svg +++ b/resources/icons/20px/british-pound.svg @@ -1,3 +1,3 @@ - - + + From 513d3720e42b43929808f6b7b72ce89efc7e4d7d Mon Sep 17 00:00:00 2001 From: kboonstra Date: Thu, 24 Oct 2024 17:28:15 +0100 Subject: [PATCH 4/7] Replace with reviewed icons --- resources/icons/16px/british-pound.svg | 4 ++++ resources/icons/20px/british-pound.svg | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/resources/icons/16px/british-pound.svg b/resources/icons/16px/british-pound.svg index e59573df06..fdfbde8e71 100644 --- a/resources/icons/16px/british-pound.svg +++ b/resources/icons/16px/british-pound.svg @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= + +>>>>>>> fec54ce62 (Replace with reviewed icons) diff --git a/resources/icons/20px/british-pound.svg b/resources/icons/20px/british-pound.svg index e29a6911a3..20084a514f 100644 --- a/resources/icons/20px/british-pound.svg +++ b/resources/icons/20px/british-pound.svg @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= + +>>>>>>> fec54ce62 (Replace with reviewed icons) From 55b8cc613d08e75b7af89258e56dead505b0f8fd Mon Sep 17 00:00:00 2001 From: kboonstra Date: Thu, 24 Oct 2024 17:32:55 +0100 Subject: [PATCH 5/7] Fix merge issues --- resources/icons/16px/british-pound.svg | 4 ---- resources/icons/20px/british-pound.svg | 4 ---- 2 files changed, 8 deletions(-) diff --git a/resources/icons/16px/british-pound.svg b/resources/icons/16px/british-pound.svg index fdfbde8e71..e59573df06 100644 --- a/resources/icons/16px/british-pound.svg +++ b/resources/icons/16px/british-pound.svg @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> fec54ce62 (Replace with reviewed icons) diff --git a/resources/icons/20px/british-pound.svg b/resources/icons/20px/british-pound.svg index 20084a514f..e29a6911a3 100644 --- a/resources/icons/20px/british-pound.svg +++ b/resources/icons/20px/british-pound.svg @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> fec54ce62 (Replace with reviewed icons) From 86ca9ad15b2166650ac7d38ac5f9fe2a33b5a5bc Mon Sep 17 00:00:00 2001 From: kboonstra Date: Thu, 24 Oct 2024 17:35:21 +0100 Subject: [PATCH 6/7] Replace with reviewed icons --- resources/icons/16px/british-pound.svg | 2 +- resources/icons/20px/british-pound.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/icons/16px/british-pound.svg b/resources/icons/16px/british-pound.svg index e59573df06..5c3426303e 100644 --- a/resources/icons/16px/british-pound.svg +++ b/resources/icons/16px/british-pound.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/icons/20px/british-pound.svg b/resources/icons/20px/british-pound.svg index e29a6911a3..d160af0a9a 100644 --- a/resources/icons/20px/british-pound.svg +++ b/resources/icons/20px/british-pound.svg @@ -1,3 +1,3 @@ - + From e453baa17cdfc518c13752db1fb8e7933da2ea3f Mon Sep 17 00:00:00 2001 From: Gregory Douglas Date: Mon, 28 Oct 2024 10:33:21 -0400 Subject: [PATCH 7/7] Remove fill --- resources/icons/16px/british-pound.svg | 2 +- resources/icons/20px/british-pound.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/icons/16px/british-pound.svg b/resources/icons/16px/british-pound.svg index 5c3426303e..c7ebf0db40 100644 --- a/resources/icons/16px/british-pound.svg +++ b/resources/icons/16px/british-pound.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/icons/20px/british-pound.svg b/resources/icons/20px/british-pound.svg index d160af0a9a..b1c4b7de7b 100644 --- a/resources/icons/20px/british-pound.svg +++ b/resources/icons/20px/british-pound.svg @@ -1,3 +1,3 @@ - +