From 22b2f974e587138bee38562dc1660fd4303b0ea6 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Thu, 22 Jul 2021 13:32:40 -0500
Subject: [PATCH] Use different timeline timer icon in dark mode
---
...sabled-24.svg => timer-disabled-outline-24.svg} | 0
images/icons/v2/timer-disabled-solid-16.svg | 1 +
.../v2/{timer-24.svg => timer-outline-24.svg} | 0
images/icons/v2/timer-solid-16.svg | 1 +
stylesheets/_modules.scss | 14 ++++++++++----
stylesheets/components/ConversationHeader.scss | 2 +-
6 files changed, 13 insertions(+), 5 deletions(-)
rename images/icons/v2/{timer-disabled-24.svg => timer-disabled-outline-24.svg} (100%)
create mode 100644 images/icons/v2/timer-disabled-solid-16.svg
rename images/icons/v2/{timer-24.svg => timer-outline-24.svg} (100%)
create mode 100644 images/icons/v2/timer-solid-16.svg
diff --git a/images/icons/v2/timer-disabled-24.svg b/images/icons/v2/timer-disabled-outline-24.svg
similarity index 100%
rename from images/icons/v2/timer-disabled-24.svg
rename to images/icons/v2/timer-disabled-outline-24.svg
diff --git a/images/icons/v2/timer-disabled-solid-16.svg b/images/icons/v2/timer-disabled-solid-16.svg
new file mode 100644
index 000000000..1dd76d243
--- /dev/null
+++ b/images/icons/v2/timer-disabled-solid-16.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v2/timer-24.svg b/images/icons/v2/timer-outline-24.svg
similarity index 100%
rename from images/icons/v2/timer-24.svg
rename to images/icons/v2/timer-outline-24.svg
diff --git a/images/icons/v2/timer-solid-16.svg b/images/icons/v2/timer-solid-16.svg
new file mode 100644
index 000000000..89b22b9dc
--- /dev/null
+++ b/images/icons/v2/timer-solid-16.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 57f3793dd..9f49dd039 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -2397,22 +2397,28 @@ $timer-icons: '55', '50', '45', '40', '35', '30', '25', '20', '15', '10', '05',
opacity: 0.6;
@include light-theme {
- @include color-svg('../images/icons/v2/timer-24.svg', $color-gray-60);
+ @include color-svg(
+ '../images/icons/v2/timer-outline-24.svg',
+ $color-gray-60
+ );
}
@include dark-theme {
- @include color-svg('../images/icons/v2/timer-24.svg', $color-gray-05);
+ @include color-svg(
+ '../images/icons/v2/timer-solid-16.svg',
+ $color-gray-05
+ );
}
&--disabled {
@include light-theme {
@include color-svg(
- '../images/icons/v2/timer-disabled-24.svg',
+ '../images/icons/v2/timer-disabled-outline-24.svg',
$color-gray-60
);
}
@include dark-theme {
@include color-svg(
- '../images/icons/v2/timer-disabled-24.svg',
+ '../images/icons/v2/timer-disabled-solid-16.svg',
$color-gray-05
);
}
diff --git a/stylesheets/components/ConversationHeader.scss b/stylesheets/components/ConversationHeader.scss
index 0b317e300..b7a48e360 100644
--- a/stylesheets/components/ConversationHeader.scss
+++ b/stylesheets/components/ConversationHeader.scss
@@ -158,7 +158,7 @@
}
&__expiration {
- @include icon-element('../images/icons/v2/timer-24.svg');
+ @include icon-element('../images/icons/v2/timer-outline-24.svg');
margin-right: 12px;
}