From 5bd60d1748b3e92dd271d512bbd928004d5ed144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 1 Dec 2014 15:01:51 +0100
Subject: [PATCH] [Backport] :man: + :hocho: :wavy_dash: -> :boy:

This reverts commit 95b75e9b1d2fa8c14321de0d84d2c55d28e0d3d6.

Conflicts:
	app/partials/register.jade
	app/svg/logo.svg
---
 app/coffee/modules/nav.coffee     | 30 ++++++++++++++----------------
 app/partials/forgot-password.jade |  2 +-
 app/partials/login.jade           |  2 +-
 app/partials/register.jade        |  2 +-
 app/svg/logo.svg                  | 30 ++++++++++++++----------------
 app/svg/logo_back.svg             | 23 -----------------------
 6 files changed, 31 insertions(+), 58 deletions(-)
 delete mode 100644 app/svg/logo_back.svg

diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee
index adc7e401..3350caa7 100644
--- a/app/coffee/modules/nav.coffee
+++ b/app/coffee/modules/nav.coffee
@@ -281,30 +281,28 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location, $
 
     mainTemplate = _.template("""
     <div class="logo-container logo">
-        <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" version="1.1" preserveAspectRatio="xMidYMid meet">
+        <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134.2 134.3" version="1.1" preserveAspectRatio="xMidYMid meet">
             <style>
                 path {
                     fill:#f5f5f5;
                     opacity:0.7;
                 }
-                .moustache {
-                    fill:#000;
-                }
             </style>
-            <g transform="translate(0,-52.362183)">
-                <g transform="matrix(1.1783562,0,0,1.1783562,2450.4425,-1298.9778)">
-                    <path transform="matrix(-0.1406648,0.99005728,-0.99005728,0.14066481,0,0)" d="m1114.3 1212.6 263 0 0 263-263 0z" />
-                    <path transform="matrix(0.1406648,-0.99005728,0.99005728,-0.14066481,0,0)" d="m-1640.3-1738.9 263 0 0 263-263 0z" />
-                    <path transform="matrix(0.99005728,0.1406648,0.14066481,0.99005728,0,0)" d="m-2199.2 1599.4 263 0 0 263-263 0z" />
-                    <path transform="matrix(-0.99005728,-0.1406648,-0.14066481,-0.99005728,0,0)" d="m1673.2-2125.1 263 0 0 263-263 0z" />
-                    <path transform="matrix(-0.60061118,-0.79954125,0.60061117,-0.79954125,0,0)" d="m132.1-2623.1 263 0 0 263-263 0z" />
-                    <path transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061117,0,0)" d="m2079.7-535.4 263 0 0 263-263 0z" />
-                    <path transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" d="m-658.4 2097.4 263 0 0 263-263 0z" />
-                    <path transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061117,0,0)" d="m-2606.2 10.1 263 0 0 263-263 0z" />
-                    <path transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" d="m-130.2 2210.7 141.4 0 0 141.4-141.4 0z" />
+            <g transform="translate(-307.87667,-465.22863)">
+                <g class="bottom">
+                    <path transform="matrix(-0.14066483,0.99005727,-0.99005727,0.14066483,0,0)" d="m561.8-506.6 42 0 0 42-42 0z" />
+                    <path transform="matrix(0.14066483,-0.99005727,0.99005727,-0.14066483,0,0)" d="m-645.7 422.6 42 0 0 42-42 0z" />
+                    <path transform="matrix(0.99005727,0.14066483,0.14066483,0.99005727,0,0)" d="m266.6 451.9 42 0 0 42-42 0z" />
+                    <path transform="matrix(-0.99005727,-0.14066483,-0.14066483,-0.99005727,0,0)" d="m-350.6-535.9 42 0 0 42-42 0z" />
+                </g>
+                <g class="top">
+                    <path transform="matrix(-0.60061118,-0.79954125,0.60061118,-0.79954125,0,0)" d="m-687.1-62.7 42 0 0 42-42 0z" />
+                    <path transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061118,0,0)" d="m166.6-719.6 42 0 0 42-42 0z" />
+                    <path transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" d="m603.1-21.3 42 0 0 42-42 0z" />
+                    <path transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061118,0,0)" d="m-250.7 635.8 42 0 0 42-42 0z" />
+                    <path transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" d="m630.3 100 22.6 0 0 22.6-22.6 0z" />
                 </g>
             </g>
-            <path class="moustache" d="m197.1 669.9c0 0-11.5 83.8 58.5 113.8 60.9 26.1 109.3 13 144.4 0.7 35.1-12.4 98.9-66.3 98.9-66.3 0 0 92.3 74.1 154.1 80.6 61.8 6.5 100.4-9.5 119-28 45.1-44.9 34.5-102.8 34.5-102.8 0 0-43.6 31.9-88.4 11.7-44.9-20.2-63.7-73.6-109.8-90.5-46.2-16.9-78.1 0.8-91.8 13.1-13.7 12.4-15.6 16.9-15.6 16.9 0 0-28-31.2-63.1-33.8-35.1-2.6-59.8 15.6-91 46.2-31.2 30.6-48.1 54-83.9 55.3-35.8 1.3-65.7-16.9-65.7-16.9z" />
         </svg>
         <span class="item">taiga<sup>[beta]</sup></span>
     </div>
diff --git a/app/partials/forgot-password.jade b/app/partials/forgot-password.jade
index 0fd58df7..f5504c25 100644
--- a/app/partials/forgot-password.jade
+++ b/app/partials/forgot-password.jade
@@ -8,7 +8,7 @@ block content
     div.wrapper
         div.login-main
             div.login-container
-                img.logo-svg(src="/svg/logo.svg", alt="TAIGA loves Movember!")
+                img.logo-svg(src="/svg/logo.svg", alt="TAIGA")
                 h1.logo Taiga
                 h2.tagline LOVE YOUR PROJECT
 
diff --git a/app/partials/login.jade b/app/partials/login.jade
index 96457b86..8883998b 100644
--- a/app/partials/login.jade
+++ b/app/partials/login.jade
@@ -8,7 +8,7 @@ block content
     div.wrapper
         div.login-main
             div.login-container
-                img.logo-svg(src="/svg/logo.svg", alt="TAIGA loves Movember!")
+                img.logo-svg(src="/svg/logo.svg", alt="TAIGA")
                 h1.logo Taiga
                 h2.tagline LOVE YOUR PROJECT
 
diff --git a/app/partials/register.jade b/app/partials/register.jade
index a42c56be..d35a733a 100644
--- a/app/partials/register.jade
+++ b/app/partials/register.jade
@@ -8,7 +8,7 @@ block content
     div.wrapper
         div.login-main
             div.login-container
-                img.logo-svg(src="/svg/logo.svg", alt="TAIGA loves Movember!")
+                img.logo-svg(src="/svg/logo.svg", alt="TAIGA")
                 h1.logo Taiga
                 h2.tagline LOVE YOUR PROJECT
 
diff --git a/app/svg/logo.svg b/app/svg/logo.svg
index 4ca67830..346d8115 100644
--- a/app/svg/logo.svg
+++ b/app/svg/logo.svg
@@ -1,25 +1,23 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" version="1.1" preserveAspectRatio="xMidYMid meet">
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134.2 134.3" version="1.1" preserveAspectRatio="xMidYMid meet">
     <style>
         path {
             fill:#f5f5f5;
             opacity:0.7;
         }
-        .moustache {
-            fill:#000;
-        }
     </style>
-    <g transform="translate(0,-52.362183)">
-        <g transform="matrix(1.1783562,0,0,1.1783562,2450.4425,-1298.9778)">
-            <path transform="matrix(-0.1406648,0.99005728,-0.99005728,0.14066481,0,0)" d="m1114.3 1212.6 263 0 0 263-263 0z" />
-            <path transform="matrix(0.1406648,-0.99005728,0.99005728,-0.14066481,0,0)" d="m-1640.3-1738.9 263 0 0 263-263 0z" />
-            <path transform="matrix(0.99005728,0.1406648,0.14066481,0.99005728,0,0)" d="m-2199.2 1599.4 263 0 0 263-263 0z" />
-            <path transform="matrix(-0.99005728,-0.1406648,-0.14066481,-0.99005728,0,0)" d="m1673.2-2125.1 263 0 0 263-263 0z" />
-            <path transform="matrix(-0.60061118,-0.79954125,0.60061117,-0.79954125,0,0)" d="m132.1-2623.1 263 0 0 263-263 0z" />
-            <path transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061117,0,0)" d="m2079.7-535.4 263 0 0 263-263 0z" />
-            <path transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" d="m-658.4 2097.4 263 0 0 263-263 0z" />
-            <path transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061117,0,0)" d="m-2606.2 10.1 263 0 0 263-263 0z" />
-            <path transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" d="m-130.2 2210.7 141.4 0 0 141.4-141.4 0z" />
+    <g transform="translate(-307.87667,-465.22863)">
+        <g class="bottom">
+            <path transform="matrix(-0.14066483,0.99005727,-0.99005727,0.14066483,0,0)" d="m561.8-506.6 42 0 0 42-42 0z" />
+            <path transform="matrix(0.14066483,-0.99005727,0.99005727,-0.14066483,0,0)" d="m-645.7 422.6 42 0 0 42-42 0z" />
+            <path transform="matrix(0.99005727,0.14066483,0.14066483,0.99005727,0,0)" d="m266.6 451.9 42 0 0 42-42 0z" />
+            <path transform="matrix(-0.99005727,-0.14066483,-0.14066483,-0.99005727,0,0)" d="m-350.6-535.9 42 0 0 42-42 0z" />
+        </g>
+        <g class="top">
+            <path transform="matrix(-0.60061118,-0.79954125,0.60061118,-0.79954125,0,0)" d="m-687.1-62.7 42 0 0 42-42 0z" />
+            <path transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061118,0,0)" d="m166.6-719.6 42 0 0 42-42 0z" />
+            <path transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" d="m603.1-21.3 42 0 0 42-42 0z" />
+            <path transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061118,0,0)" d="m-250.7 635.8 42 0 0 42-42 0z" />
+            <path transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" d="m630.3 100 22.6 0 0 22.6-22.6 0z" />
         </g>
     </g>
-    <path class="moustache" d="m197.1 669.9c0 0-11.5 83.8 58.5 113.8 60.9 26.1 109.3 13 144.4 0.7 35.1-12.4 98.9-66.3 98.9-66.3 0 0 92.3 74.1 154.1 80.6 61.8 6.5 100.4-9.5 119-28 45.1-44.9 34.5-102.8 34.5-102.8 0 0-43.6 31.9-88.4 11.7-44.9-20.2-63.7-73.6-109.8-90.5-46.2-16.9-78.1 0.8-91.8 13.1-13.7 12.4-15.6 16.9-15.6 16.9 0 0-28-31.2-63.1-33.8-35.1-2.6-59.8 15.6-91 46.2-31.2 30.6-48.1 54-83.9 55.3-35.8 1.3-65.7-16.9-65.7-16.9z" />
 </svg>
diff --git a/app/svg/logo_back.svg b/app/svg/logo_back.svg
deleted file mode 100644
index 346d8115..00000000
--- a/app/svg/logo_back.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134.2 134.3" version="1.1" preserveAspectRatio="xMidYMid meet">
-    <style>
-        path {
-            fill:#f5f5f5;
-            opacity:0.7;
-        }
-    </style>
-    <g transform="translate(-307.87667,-465.22863)">
-        <g class="bottom">
-            <path transform="matrix(-0.14066483,0.99005727,-0.99005727,0.14066483,0,0)" d="m561.8-506.6 42 0 0 42-42 0z" />
-            <path transform="matrix(0.14066483,-0.99005727,0.99005727,-0.14066483,0,0)" d="m-645.7 422.6 42 0 0 42-42 0z" />
-            <path transform="matrix(0.99005727,0.14066483,0.14066483,0.99005727,0,0)" d="m266.6 451.9 42 0 0 42-42 0z" />
-            <path transform="matrix(-0.99005727,-0.14066483,-0.14066483,-0.99005727,0,0)" d="m-350.6-535.9 42 0 0 42-42 0z" />
-        </g>
-        <g class="top">
-            <path transform="matrix(-0.60061118,-0.79954125,0.60061118,-0.79954125,0,0)" d="m-687.1-62.7 42 0 0 42-42 0z" />
-            <path transform="matrix(-0.79954125,0.60061118,-0.79954125,-0.60061118,0,0)" d="m166.6-719.6 42 0 0 42-42 0z" />
-            <path transform="matrix(0.60061118,0.79954125,-0.60061118,0.79954125,0,0)" d="m603.1-21.3 42 0 0 42-42 0z" />
-            <path transform="matrix(0.79954125,-0.60061118,0.79954125,0.60061118,0,0)" d="m-250.7 635.8 42 0 0 42-42 0z" />
-            <path transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" d="m630.3 100 22.6 0 0 22.6-22.6 0z" />
-        </g>
-    </g>
-</svg>