From 649248a537ae490a942a189f8f34defb7653d0c8 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Sun, 18 Jun 2017 20:49:14 -0700
Subject: [PATCH] Fix paths for all newly-added icons

FREEBIE
---
 stylesheets/_conversation.scss | 12 +++++-----
 stylesheets/_global.scss       |  6 ++---
 stylesheets/_index.scss        |  2 +-
 stylesheets/_ios.scss          |  2 +-
 stylesheets/android-dark.scss  | 20 ++++++++--------
 stylesheets/manifest.css       | 42 +++++++++++++++++-----------------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 37225cb8dd9b..7799add43e3a 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -22,7 +22,7 @@
   }
 }
 .conversation-title .verified-icon {
-  @include color-svg('/images/verified-check.svg', white);
+  @include color-svg('../images/verified-check.svg', white);
   display: inline-block;
   width: 1.25em;
   height: 1.25em;
@@ -135,10 +135,10 @@
     display: inline-block;
 
     &.verified {
-      @include color-svg('/images/verified-check.svg', $grey_d);
+      @include color-svg('../images/verified-check.svg', $grey_d);
     }
     &.shield {
-      @include color-svg('/images/shield.svg', $grey_d);
+      @include color-svg('../images/shield.svg', $grey_d);
     }
   }
 
@@ -781,13 +781,13 @@ li.entry .error-icon-container {
   display: inline-block;
 
   &.verified {
-    @include color-svg('/images/verified-check.svg', $grey_d);
+    @include color-svg('../images/verified-check.svg', $grey_d);
   }
   &.shield {
-    @include color-svg('/images/shield.svg', $grey_d);
+    @include color-svg('../images/shield.svg', $grey_d);
   }
   &.clock {
-    @include color-svg('/images/clock.svg', $grey_d);
+    @include color-svg('../images/clock.svg', $grey_d);
   }
 }
 
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 1c7b064310c5..c960f31644c9 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -361,7 +361,7 @@ $avatar-size: 44px;
     height: 18px;
     display: inline-block;
     vertical-align: text-bottom;
-    @include color-svg('/images/warning.svg', black);
+    @include color-svg('../images/warning.svg', black);
   }
 
   .dismiss {
@@ -371,7 +371,7 @@ $avatar-size: 44px;
 
     height: 23px;
     width: 23px;
-    @include color-svg('/images/x.svg', black);
+    @include color-svg('../images/x.svg', black);
   }
 }
 
@@ -409,7 +409,7 @@ $avatar-size: 44px;
   }
 
   .verified-icon {
-      @include color-svg('/images/verified-check.svg', $grey);
+      @include color-svg('../images/verified-check.svg', $grey);
       display: inline-block;
       width: 1.25em;
       height: 1.25em;
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 54794a606e92..817a1717b4b0 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -96,7 +96,7 @@
   color: $grey_d;
   border-color: rgba(0,0,0,0.05);
   .verified-icon {
-    @include color-svg('/images/verified-check.svg', $grey_d);
+    @include color-svg('../images/verified-check.svg', $grey_d);
   }
 }
 
diff --git a/stylesheets/_ios.scss b/stylesheets/_ios.scss
index 013772f971fd..8d6b866809ed 100644
--- a/stylesheets/_ios.scss
+++ b/stylesheets/_ios.scss
@@ -67,7 +67,7 @@ $ios-border-color: rgba(0,0,0,0.1);
       line-height: $header-height;
 
       .verified-icon {
-        @include color-svg('/images/verified-check.svg', #454545);
+        @include color-svg('../images/verified-check.svg', #454545);
       }
     }
 
diff --git a/stylesheets/android-dark.scss b/stylesheets/android-dark.scss
index 0476d010f208..6b2cc0b01a9c 100644
--- a/stylesheets/android-dark.scss
+++ b/stylesheets/android-dark.scss
@@ -56,10 +56,10 @@ $text-dark_l2: darken($text-dark, 30%);
   }
   .key-verification .icon {
     &.verified {
-      @include color-svg('/images/verified-check.svg', $text-dark);
+      @include color-svg('../images/verified-check.svg', $text-dark);
     }
     &.shield {
-      @include color-svg('/images/shield.svg', $text-dark);
+      @include color-svg('../images/shield.svg', $text-dark);
     }
   }
   .menu-list {
@@ -87,7 +87,7 @@ $text-dark_l2: darken($text-dark, 30%);
   .contact-details .number {
     color: $text-dark_l2;
     .verified-icon {
-       @include color-svg('/images/verified-check.svg', $text-dark_l2);
+       @include color-svg('../images/verified-check.svg', $text-dark_l2);
     }
   }
   .group-member-list .members .contact, .new-group-update .members .contact, .attachment-previews img {
@@ -108,13 +108,13 @@ $text-dark_l2: darken($text-dark, 30%);
       background-color: $grey-dark;
     }
     .shield {
-      @include color-svg('/images/shield.svg', $text-dark);
+      @include color-svg('../images/shield.svg', $text-dark);
     }
     .verified {
-      @include color-svg('/images/verified-check.svg', $text-dark);
+      @include color-svg('../images/verified-check.svg', $text-dark);
     }
     .clock {
-      @include color-svg('/images/clock.svg', $text-dark);
+      @include color-svg('../images/clock.svg', $text-dark);
     }
   }
 
@@ -122,7 +122,7 @@ $text-dark_l2: darken($text-dark, 30%);
     background-color: $grey-dark !important;
     color: $text-dark;
     .verified-icon {
-      @include color-svg('/images/verified-check.svg', $text-dark);
+      @include color-svg('../images/verified-check.svg', $text-dark);
     }
   }
   .sent .status {
@@ -142,7 +142,7 @@ $text-dark_l2: darken($text-dark, 30%);
     transform: rotateZ(-45deg);
   }
   .capture-audio .microphone:before {
-      @include color-svg('/images/microphone.svg', white);
+      @include color-svg('../images/microphone.svg', white);
   }
   .conversations {
     background-color: $grey-dark_l2;
@@ -263,7 +263,7 @@ $text-dark_l2: darken($text-dark, 30%);
       background-color: $grey_l4;
 
       .icon {
-        @include color-svg('/images/down.svg', black);
+        @include color-svg('../images/down.svg', black);
       }
       .icon:hover {
 	      background-color: white;
@@ -272,7 +272,7 @@ $text-dark_l2: darken($text-dark, 30%);
       &.new-messages  {
         background-color: $blue;
         .icon {
-          @include color-svg('/images/down.svg', white);
+          @include color-svg('../images/down.svg', white);
         }
       	&:hover {
       	  background-color: #1472bd;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index aadff92a582f..c1375f99e06d 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -352,7 +352,7 @@ button.hamburger {
     height: 18px;
     display: inline-block;
     vertical-align: text-bottom;
-    -webkit-mask: url("/images/warning.svg") no-repeat center;
+    -webkit-mask: url("../images/warning.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: black; }
   .banner .dismiss {
@@ -361,7 +361,7 @@ button.hamburger {
     top: 3px;
     height: 23px;
     width: 23px;
-    -webkit-mask: url("/images/x.svg") no-repeat center;
+    -webkit-mask: url("../images/x.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: black; }
 
@@ -388,7 +388,7 @@ button.hamburger {
   .contact-details.not-clickable {
     cursor: default; }
   .contact-details .verified-icon {
-    -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+    -webkit-mask: url("../images/verified-check.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #616161;
     display: inline-block;
@@ -937,7 +937,7 @@ img.emoji.jumbo {
   color: #454545;
   border-color: rgba(0, 0, 0, 0.05); }
   .inactive .conversation-header .verified-icon {
-    -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+    -webkit-mask: url("../images/verified-check.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #454545; }
 
@@ -1102,7 +1102,7 @@ input.search {
   padding: 0 5px 0 4px; }
 
 .conversation-title .verified-icon {
-  -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+  -webkit-mask: url("../images/verified-check.svg") no-repeat center;
   -webkit-mask-size: 100%;
   background-color: white;
   display: inline-block;
@@ -1189,11 +1189,11 @@ input.search {
   vertical-align: text-bottom;
   display: inline-block; }
   .key-verification .icon.verified {
-    -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+    -webkit-mask: url("../images/verified-check.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #454545; }
   .key-verification .icon.shield {
-    -webkit-mask: url("/images/shield.svg") no-repeat center;
+    -webkit-mask: url("../images/shield.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #454545; }
 
@@ -1712,15 +1712,15 @@ li.entry .error-icon-container {
   vertical-align: text-bottom;
   display: inline-block; }
   .advisory .icon.verified {
-    -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+    -webkit-mask: url("../images/verified-check.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #454545; }
   .advisory .icon.shield {
-    -webkit-mask: url("/images/shield.svg") no-repeat center;
+    -webkit-mask: url("../images/shield.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #454545; }
   .advisory .icon.clock {
-    -webkit-mask: url("/images/clock.svg") no-repeat center;
+    -webkit-mask: url("../images/clock.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #454545; }
 
@@ -1847,7 +1847,7 @@ li.entry .error-icon-container {
   .ios .conversation-header .conversation-title {
     line-height: 64px; }
     .ios .conversation-header .conversation-title .verified-icon {
-      -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+      -webkit-mask: url("../images/verified-check.svg") no-repeat center;
       -webkit-mask-size: 100%;
       background-color: #454545; }
   .ios .conversation-header .avatar {
@@ -2241,11 +2241,11 @@ li.entry .error-icon-container {
     background-color: #030303;
     border-color: #292929; }
   .android-dark .key-verification .icon.verified {
-    -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+    -webkit-mask: url("../images/verified-check.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #CCCCCC; }
   .android-dark .key-verification .icon.shield {
-    -webkit-mask: url("/images/shield.svg") no-repeat center;
+    -webkit-mask: url("../images/shield.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #CCCCCC; }
   .android-dark .menu-list {
@@ -2270,7 +2270,7 @@ li.entry .error-icon-container {
   .android-dark .contact-details .number {
     color: #807f7f; }
     .android-dark .contact-details .number .verified-icon {
-      -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+      -webkit-mask: url("../images/verified-check.svg") no-repeat center;
       -webkit-mask-size: 100%;
       background-color: #807f7f; }
   .android-dark .group-member-list .members .contact, .android-dark .new-group-update .members .contact, .android-dark .attachment-previews img {
@@ -2317,22 +2317,22 @@ li.entry .error-icon-container {
   .android-dark .message-list .advisory .content {
     background-color: #333333; }
   .android-dark .message-list .advisory .shield {
-    -webkit-mask: url("/images/shield.svg") no-repeat center;
+    -webkit-mask: url("../images/shield.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #CCCCCC; }
   .android-dark .message-list .advisory .verified {
-    -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+    -webkit-mask: url("../images/verified-check.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #CCCCCC; }
   .android-dark .message-list .advisory .clock {
-    -webkit-mask: url("/images/clock.svg") no-repeat center;
+    -webkit-mask: url("../images/clock.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: #CCCCCC; }
   .android-dark .inactive .conversation-header {
     background-color: #333333 !important;
     color: #CCCCCC; }
     .android-dark .inactive .conversation-header .verified-icon {
-      -webkit-mask: url("/images/verified-check.svg") no-repeat center;
+      -webkit-mask: url("../images/verified-check.svg") no-repeat center;
       -webkit-mask-size: 100%;
       background-color: #CCCCCC; }
   .android-dark .sent .status {
@@ -2355,7 +2355,7 @@ li.entry .error-icon-container {
     background-color: white;
     transform: rotateZ(-45deg); }
   .android-dark .capture-audio .microphone:before {
-    -webkit-mask: url("/images/microphone.svg") no-repeat center;
+    -webkit-mask: url("../images/microphone.svg") no-repeat center;
     -webkit-mask-size: 100%;
     background-color: white; }
   .android-dark .conversations {
@@ -2512,7 +2512,7 @@ li.entry .error-icon-container {
   .android-dark .discussion-container .scroll-down-button-view button {
     background-color: #8d8d8d; }
     .android-dark .discussion-container .scroll-down-button-view button .icon {
-      -webkit-mask: url("/images/down.svg") no-repeat center;
+      -webkit-mask: url("../images/down.svg") no-repeat center;
       -webkit-mask-size: 100%;
       background-color: black; }
     .android-dark .discussion-container .scroll-down-button-view button .icon:hover {
@@ -2520,7 +2520,7 @@ li.entry .error-icon-container {
     .android-dark .discussion-container .scroll-down-button-view button.new-messages {
       background-color: #2090ea; }
       .android-dark .discussion-container .scroll-down-button-view button.new-messages .icon {
-        -webkit-mask: url("/images/down.svg") no-repeat center;
+        -webkit-mask: url("../images/down.svg") no-repeat center;
         -webkit-mask-size: 100%;
         background-color: white; }
       .android-dark .discussion-container .scroll-down-button-view button.new-messages:hover {