From bbc492cbfe21ec89b2d783a4b64d2cb8cf6dbcdd Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil.celtics@gmail.com>
Date: Fri, 16 Feb 2018 23:21:52 +0530
Subject: [PATCH] used favicon as shield icon

---
 packages/rocketchat-api/server/v1/misc.js   |  2 +-
 packages/rocketchat-assets/server/assets.js | 10 -------
 public/images/shield/shield-icon.svg        | 32 ---------------------
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 public/images/shield/shield-icon.svg

diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
index 7b671c44853..113caff2a5c 100644
--- a/packages/rocketchat-api/server/v1/misc.js
+++ b/packages/rocketchat-api/server/v1/misc.js
@@ -96,7 +96,7 @@ RocketChat.API.v1.addRoute('shield.svg', { authRequired: false }, {
 				    <path fill="#4c1" d="M${ leftSize } 0h${ rightSize }v${ height }H${ leftSize }z"/>
 				    <path fill="url(#b)" d="M0 0h${ width }v${ height }H0z"/>
 				  </g>
-				    ${ hideIcon ? '' : '<image x="5" y="3" width="14" height="14" xlink:href="/assets/shield.svg"/>' }
+				    ${ hideIcon ? '' : '<image x="5" y="3" width="14" height="14" xlink:href="/assets/favicon.svg"/>' }
 				  <g fill="#fff" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
 						${ name ? `<text x="${ iconSize }" y="15" fill="#010101" fill-opacity=".3">${ name }</text>
 				    <text x="${ iconSize }" y="14">${ name }</text>` : '' }
diff --git a/packages/rocketchat-assets/server/assets.js b/packages/rocketchat-assets/server/assets.js
index 1bcd5ae6517..69bce7af9e0 100644
--- a/packages/rocketchat-assets/server/assets.js
+++ b/packages/rocketchat-assets/server/assets.js
@@ -153,16 +153,6 @@ const assets = {
 			width: undefined,
 			height: undefined
 		}
-	},
-	shield: {
-		label: 'shield (svg)',
-		defaultUrl: 'images/shield/shield-icon.svg',
-		constraints: {
-			type: 'image',
-			extensions: ['svg'],
-			width: undefined,
-			height: undefined
-		}
 	}
 };
 
diff --git a/public/images/shield/shield-icon.svg b/public/images/shield/shield-icon.svg
deleted file mode 100644
index 98ea9318a49..00000000000
--- a/public/images/shield/shield-icon.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path fill="#C1272D" d="M502.586,255.322c0-25.236-7.55-49.436-22.445-71.932c-13.373-20.195-32.109-38.072-55.687-53.132
-	C378.937,101.182,319.108,85.168,256,85.168c-21.079,0-41.855,1.781-62.009,5.31c-12.504-11.702-27.139-22.232-42.627-30.56
-	C68.618,19.818,0,58.975,0,58.975s63.798,52.409,53.424,98.35c-28.542,28.313-44.01,62.453-44.01,97.998
-	c0,0.113,0.006,0.226,0.006,0.34c0,0.113-0.006,0.226-0.006,0.339c0,35.545,15.469,69.685,44.01,97.999
-	C63.798,399.94,0,452.35,0,452.35s68.618,39.156,151.363-0.943c15.488-8.327,30.124-18.857,42.627-30.56
-	c20.154,3.528,40.931,5.31,62.009,5.31c63.108,0,122.937-16.014,168.454-45.091c23.577-15.06,42.313-32.937,55.687-53.132
-	c14.896-22.496,22.445-46.695,22.445-71.932c0-0.113-0.006-0.226-0.006-0.339C502.58,255.548,502.586,255.436,502.586,255.322z"/>
-<path fill="#FFFFFF" d="M256,120.847c116.854,0,211.586,60.509,211.586,135.154c0,74.641-94.731,135.155-211.586,135.155
-	c-26.019,0-50.937-3.009-73.959-8.495c-23.396,28.147-74.868,67.28-124.869,54.629c16.265-17.47,40.361-46.988,35.201-95.603
-	c-29.968-23.322-47.959-53.163-47.959-85.686C44.414,181.356,139.145,120.847,256,120.847"/>
-<g>
-	<g>
-		<circle fill="#C1272D" cx="256" cy="260.352" r="28.105"/>
-	</g>
-	<g>
-		<circle fill="#C1272D" cx="353.728" cy="260.352" r="28.104"/>
-	</g>
-	<g>
-		<circle fill="#C1272D" cx="158.272" cy="260.352" r="28.105"/>
-	</g>
-</g>
-<g>
-	<path fill="#CCCCCC" d="M256,373.373c-26.019,0-50.937-2.607-73.959-7.362c-20.659,21.54-63.209,50.496-107.307,49.43
-		c-5.806,8.805-12.121,16.006-17.562,21.85c50,12.651,101.473-26.481,124.869-54.629c23.023,5.486,47.941,8.495,73.959,8.495
-		c115.917,0,210.048-59.55,211.551-133.364C466.048,321.765,371.917,373.373,256,373.373z"/>
-</g>
-</svg>