From 149a80cd7ed1083d19052022e318fae4c298ecb6 Mon Sep 17 00:00:00 2001 From: Jed Fox <git@jedfox.com> Date: Tue, 7 Feb 2023 14:27:35 -0500 Subject: [PATCH] =?UTF-8?q?Fix=20coloring=20of=20the=20=E2=80=9CSplit=20Tr?= =?UTF-8?q?ansaction=E2=80=9D=20button=20in=20the=20category=20picker=20(#?= =?UTF-8?q?640)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CategorySelect.js | 6 +++++- packages/loot-design/src/svg/v0/Delete.js | 2 +- packages/loot-design/src/svg/v0/Delete.svg | 4 ++-- packages/loot-design/src/svg/v0/Merge.js | 4 ++-- packages/loot-design/src/svg/v0/Split.js | 4 ++-- packages/loot-design/src/svg/v0/merge.svg | 14 +++++++------- packages/loot-design/src/svg/v0/split.svg | 18 +++++++++--------- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/packages/loot-design/src/components/CategorySelect.js b/packages/loot-design/src/components/CategorySelect.js index 279c61f46..82246304c 100644 --- a/packages/loot-design/src/components/CategorySelect.js +++ b/packages/loot-design/src/components/CategorySelect.js @@ -66,7 +66,11 @@ export function CategoryList({ data-testid="split-transaction-button" > <Text style={{ lineHeight: 0 }}> - <Split width={10} height={10} style={{ marginRight: 5 }} /> + <Split + width={10} + height={10} + style={{ marginRight: 5, color: 'inherit' }} + /> </Text> Split Transaction </View> diff --git a/packages/loot-design/src/svg/v0/Delete.js b/packages/loot-design/src/svg/v0/Delete.js index 7dc6fb047..a9e23e08f 100644 --- a/packages/loot-design/src/svg/v0/Delete.js +++ b/packages/loot-design/src/svg/v0/Delete.js @@ -12,7 +12,7 @@ const SvgDelete = props => ( > <path fill="none" - stroke="#000" + stroke="currentColor" strokeWidth={4} strokeLinecap="round" strokeMiterlimit={10} diff --git a/packages/loot-design/src/svg/v0/Delete.svg b/packages/loot-design/src/svg/v0/Delete.svg index 5c4d29bae..ac8514601 100644 --- a/packages/loot-design/src/svg/v0/Delete.svg +++ b/packages/loot-design/src/svg/v0/Delete.svg @@ -7,7 +7,7 @@ > <line fill="none" - stroke="black" + stroke="currentColor" strokeWidth="4" strokeLinecap="round" strokeMiterlimit="10" @@ -18,7 +18,7 @@ /> <line fill="none" - stroke="black" + stroke="currentColor" strokeWidth="4" strokeLinecap="round" strokeMiterlimit="10" diff --git a/packages/loot-design/src/svg/v0/Merge.js b/packages/loot-design/src/svg/v0/Merge.js index f122eabc3..26f2b26f5 100644 --- a/packages/loot-design/src/svg/v0/Merge.js +++ b/packages/loot-design/src/svg/v0/Merge.js @@ -13,11 +13,11 @@ const SvgMerge = props => ( > <path d="M24 29h5.333M8 29H2.667M16 21l-8 8M16 21l8 8M16 2.667v18.666M16 2.667 8 9.333M16 2.667l8 6.666" - stroke="#000" + fill="none" + stroke="currentColor" strokeWidth={3.5} strokeMiterlimit={10} strokeLinecap="round" - fill="currentColor" /> </svg> ); diff --git a/packages/loot-design/src/svg/v0/Split.js b/packages/loot-design/src/svg/v0/Split.js index 6147dbc94..3763ba73b 100644 --- a/packages/loot-design/src/svg/v0/Split.js +++ b/packages/loot-design/src/svg/v0/Split.js @@ -13,11 +13,11 @@ const SvgSplit = props => ( > <path d="m30 9-4-4M30 9l-4 4M6 5 2 9M2 9l4 4M10 9H3M22 9h7M16 15l6-6M16 15l-6-6M16 28V15" - stroke="#000" + fill="none" + stroke="currentColor" strokeWidth={3.5} strokeMiterlimit={10} strokeLinecap="round" - fill="currentColor" /> </svg> ); diff --git a/packages/loot-design/src/svg/v0/merge.svg b/packages/loot-design/src/svg/v0/merge.svg index 4597e914c..b39ba942b 100644 --- a/packages/loot-design/src/svg/v0/merge.svg +++ b/packages/loot-design/src/svg/v0/merge.svg @@ -1,9 +1,9 @@ <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M24 29H29.3333" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M8.00002 29H2.66669" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 21L8 29" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 21L24 29" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 2.66669V21.3334" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 2.66669L8 9.33335" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 2.66669L24 9.33335" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M24 29H29.3333" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M8.00002 29H2.66669" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 21L8 29" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 21L24 29" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 2.66669V21.3334" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 2.66669L8 9.33335" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 2.66669L24 9.33335" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> </svg> diff --git a/packages/loot-design/src/svg/v0/split.svg b/packages/loot-design/src/svg/v0/split.svg index 4b0c9e677..4d75d0ce4 100644 --- a/packages/loot-design/src/svg/v0/split.svg +++ b/packages/loot-design/src/svg/v0/split.svg @@ -1,11 +1,11 @@ <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M30 9L26 5" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M30 9L26 13" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M6 5L2 9" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M2 9L6 13" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M10 9H3" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M22 9H29" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 15L22 9" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 15L10 9" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> -<path d="M16 28L16 15" stroke="black" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M30 9L26 5" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M30 9L26 13" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M6 5L2 9" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M2 9L6 13" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M10 9H3" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M22 9H29" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 15L22 9" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 15L10 9" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> +<path d="M16 28L16 15" fill="none" stroke="currentColor" stroke-width="3.5" stroke-miterlimit="10" stroke-linecap="round"/> </svg> -- GitLab