Merge branch 'charlesmchen/timerIcons'

2018-12-07 09:15:11 -05:00 · 2018-12-07 09:15:11 -05:00 · faa6b3e4a5
parent d48cc08237 92ed5f54a4
commit faa6b3e4a5
20 changed files with 6 additions and 6 deletions
--- a/Signal/Images.xcassets/ic_timer.imageset/Contents.json
+++ b/Signal/Images.xcassets/ic_timer.imageset/Contents.json
@ -2,17 +2,17 @@
  "images" : [
    {
      "idiom" : "universal",
-      "filename" : "timer-48@1x.png",
+      "filename" : "timer-24@1x.png",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
-      "filename" : "timer-48@2x.png",
+      "filename" : "timer-24@2x.png",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
-      "filename" : "timer-48@3x.png",
+      "filename" : "timer-24@3x.png",
      "scale" : "3x"
    }
  ],
--- a/Signal/Images.xcassets/ic_timer.imageset/timer-24@1x.png
+++ b/Signal/Images.xcassets/ic_timer.imageset/timer-24@1x.png
--- a/Signal/Images.xcassets/ic_timer.imageset/timer-24@2x.png
+++ b/Signal/Images.xcassets/ic_timer.imageset/timer-24@2x.png
--- a/Signal/Images.xcassets/ic_timer.imageset/timer-24@3x.png
+++ b/Signal/Images.xcassets/ic_timer.imageset/timer-24@3x.png
--- a/Signal/Images.xcassets/ic_timer.imageset/timer-48@1x.png
+++ b/Signal/Images.xcassets/ic_timer.imageset/timer-48@1x.png
--- a/Signal/Images.xcassets/ic_timer.imageset/timer-48@2x.png
+++ b/Signal/Images.xcassets/ic_timer.imageset/timer-48@2x.png
--- a/Signal/Images.xcassets/ic_timer.imageset/timer-48@3x.png
+++ b/Signal/Images.xcassets/ic_timer.imageset/timer-48@3x.png
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/Contents.json
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/Contents.json
@ -2,17 +2,17 @@
  "images" : [
    {
      "idiom" : "universal",
-      "filename" : "timer-disabled-48@1x.png",
+      "filename" : "timer-disabled-24@1x.png",
      "scale" : "1x"
    },
    {
      "idiom" : "universal",
-      "filename" : "timer-disabled-48@2x.png",
+      "filename" : "timer-disabled-24@2x.png",
      "scale" : "2x"
    },
    {
      "idiom" : "universal",
-      "filename" : "timer-disabled-48@3x.png",
+      "filename" : "timer-disabled-24@3x.png",
      "scale" : "3x"
    }
  ],
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-24@1x.png
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-24@1x.png
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-24@2x.png
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-24@2x.png
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-24@3x.png
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-24@3x.png
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-48@1x.png
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-48@1x.png
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-48@2x.png
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-48@2x.png
--- a/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-48@3x.png
+++ b/Signal/Images.xcassets/ic_timer_disabled.imageset/timer-disabled-48@3x.png
--- a/Signal/Images.xcassets/system_message_disappearing_messages.imageset/timer-20@1x.png
+++ b/Signal/Images.xcassets/system_message_disappearing_messages.imageset/timer-20@1x.png
--- a/Signal/Images.xcassets/system_message_disappearing_messages.imageset/timer-20@2x.png
+++ b/Signal/Images.xcassets/system_message_disappearing_messages.imageset/timer-20@2x.png
--- a/Signal/Images.xcassets/system_message_disappearing_messages.imageset/timer-20@3x.png
+++ b/Signal/Images.xcassets/system_message_disappearing_messages.imageset/timer-20@3x.png
--- a/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@1x.png
+++ b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@1x.png
--- a/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@2x.png
+++ b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@2x.png
--- a/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@3x.png
+++ b/Signal/Images.xcassets/system_message_disappearing_messages_disabled.imageset/timer-disabled-20@3x.png