From e07b61c2c8e66c848dcd3431268765b8f577f0d5 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Fri, 14 Nov 2014 11:13:14 +0100
Subject: [PATCH] combine auth provider icons and add mail

---
 app/assets/images/facebook.svg         |  1 -
 app/assets/images/google.svg           |  1 -
 app/assets/images/provider.svg         | 31 ++++++++++++++++++++++++++
 app/assets/images/twitter.svg          |  1 -
 app/assets/stylesheets/zammad.css.scss | 17 +++++++++-----
 5 files changed, 42 insertions(+), 9 deletions(-)
 delete mode 100644 app/assets/images/facebook.svg
 delete mode 100644 app/assets/images/google.svg
 create mode 100644 app/assets/images/provider.svg
 delete mode 100644 app/assets/images/twitter.svg

diff --git a/app/assets/images/facebook.svg b/app/assets/images/facebook.svg
deleted file mode 100644
index 8169576b4..000000000
--- a/app/assets/images/facebook.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 29 22" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient y1="0%" x2="0" y2="100%" id="0"><stop stop-color="#fff" offset="0%"/><stop stop-color="#e6eaf1" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path d="m0 17h29v5h-29v-5" fill="#778eba"/><path d="m17.919 22v-10.06h-2.919v-3.97h2.977v-4.04c0-2.084 1.598-3.935 4.052-3.935h4.971v3.808h-3.863c-1.071 0-1.193.038-1.193 1.033l-.008 3.132h3.552l-.386 3.97h-3.225l.101 10.06h-4.058" fill="url(#0)"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/google.svg b/app/assets/images/google.svg
deleted file mode 100644
index fd0188ca2..000000000
--- a/app/assets/images/google.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 29 22" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient y1="0%" x2="0" y2="100%" id="0"><stop stop-color="#fff" offset="0%"/><stop stop-color="#fae7e3" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd" transform="translate(2)"><path d="m21.06 8.04v-3.044h-2.01v3.044h-3.044v1.911h3.044v3.044h2.01v-3.044h2.944v-1.911h-2.944" fill="#fdf4f2"/><path d="m11.12 12.664c-.606-.436-1.766-1.496-1.766-2.119 0-.73.205-1.09 1.288-1.949 1.11-.88 1.895-2.118 1.895-3.558 0-1.714-.752-3.384-2.163-3.935h2.127l1.502-1.102h-6.71c-3.01 0-5.839 2.314-5.839 4.995 0 2.739 2.051 4.95 5.111 4.95.213 0 .42-.004.622-.019-.199.386-.341.821-.341 1.273 0 .761.403 1.379.913 1.882-.385 0-.757.011-1.163.011-3.726 0-6.594 2.41-6.594 4.908 0 2.461 3.144 4 6.869 4 4.248 0 6.594-2.447 6.594-4.908 0-1.973-.573-3.155-2.346-4.428m-3.607-3.665c-1.633-.051-3.185-1.896-3.466-4.12-.282-2.225.813-3.928 2.445-3.878 1.632.051 3.185 1.836 3.466 4.061.281 2.225-.813 3.988-2.445 3.937m-1.226 12c-2.488 0-4.284-1.612-4.284-3.549 0-1.898 2.228-3.478 4.716-3.451.58.006 1.121.102 1.612.265 1.35.962 2.319 1.505 2.592 2.6.051.222.079.451.079.684 0 1.937-1.219 3.45-4.716 3.45" fill="url(#0)"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/images/provider.svg b/app/assets/images/provider.svg
new file mode 100644
index 000000000..3e3bd0313
--- /dev/null
+++ b/app/assets/images/provider.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="116px" height="22px" viewBox="0 0 116 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>provider</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#E9F7FC" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#E6EAF1" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FAE7E3" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M83.1721449,4.16251918 C84.188671,3.53766761 84.9695138,2.54822003 85.3370757,1.36915194 C84.3855914,1.94785719 83.3318657,2.36795104 82.2102213,2.59436492 C81.3121358,1.61303769 80.0324498,1 78.6162028,1 C75.8969898,1 73.6922188,3.26055863 73.6922188,6.04888204 C73.6922188,6.444612 73.7357786,6.83000606 73.8197791,7.19952678 C69.7275179,6.98898768 66.0994204,4.97883517 63.6708483,1.92410889 C63.2470063,2.66979412 63.0041247,3.53705345 63.0041247,4.46239352 C63.0041247,6.21413866 63.8734096,7.75952899 65.1946151,8.6649334 C64.3874919,8.63872417 63.6282485,8.41157273 62.9644048,8.03343948 C62.963845,8.05448004 62.963845,8.07564401 62.963845,8.09693282 C62.963845,10.5431759 64.6611346,12.5837205 66.913665,13.0478671 C66.500503,13.1632882 66.0655009,13.2249362 65.6164574,13.2249362 C65.2991766,13.2249362 64.9907762,13.1931895 64.6900542,13.1343712 C65.3166968,15.140216 67.1350661,16.5999632 69.2897968,16.6405692 C67.6046286,17.9948625 65.4815784,18.8020738 63.1745661,18.8020738 C62.7771233,18.8020738 62.3852024,18.7780786 62,18.7314416 C64.179091,20.1641186 66.7672635,21 69.5479176,21 C78.6047223,21 83.5575069,13.3065198 83.5575069,6.63423251 C83.5575069,6.41532625 83.5527071,6.19764974 83.5432277,5.98095903 C84.5051514,5.26923458 85.3398759,4.38007085 86,3.36749057 C85.1171145,3.76912675 84.1680301,4.0404529 83.1721449,4.16251918 Z" id="twitter" fill="url(#linearGradient-1)" sketch:type="MSShapeGroup"></path>
+        <g id="facebook" sketch:type="MSLayerGroup">
+            <path d="M0,17 L29,17 L29,22 L0,22 L0,17 Z" id="bar" fill="#778EBA" sketch:type="MSShapeGroup"></path>
+            <path d="M17.9191655,22 L17.9191655,11.9437767 L15,11.9437767 L15,7.97364464 L17.9773243,7.97364464 L17.9773243,3.93510204 C17.9773243,1.85079647 19.5752523,0 22.028952,0 L27,0 L27,3.80793996 L23.1369773,3.80793996 C22.0660533,3.80793996 21.9436541,3.84603385 21.9436541,4.84117843 L21.9356322,7.97364464 L25.4873949,7.97364464 L25.1013409,11.9437767 L21.8759692,11.9437767 L21.9768096,22 L17.9191655,22 Z" id="f" fill="url(#linearGradient-2)" sketch:type="MSShapeGroup"></path>
+        </g>
+        <path d="M115.508648,18.3149449 C115.814682,17.9649376 116,17.5077401 116,17.0081158 L116,5.99188419 C116,5.57003752 115.867419,5.17881924 115.641954,4.85677054 L104.5,14 L93.357352,4.85620115 L93.357352,4.85620115 C93.1320733,5.17854842 93,5.5700978 93,5.99188419 L93,17.0081158 C93,17.5078518 93.1860604,17.9646049 93.4921843,18.3143008 L93.4921843,18.3143008 L101.654971,12 L102,12.2923145 L93.8236483,18.6171082 C94.1546995,18.8578739 94.5620353,19 95.0008642,19 L113.999136,19 C114.439573,19 114.846773,18.8580775 115.177263,18.617813 L107,12.2923145 L107.345029,12 L115.508648,18.3149449 Z M94.0059539,4.26365716 C94.2990031,4.09596268 94.6386967,4 95.0008642,4 L113.999136,4 C114.360126,4 114.699804,4.09617742 114.993236,4.26432456 L104.5,12.9116819 L94.0059539,4.26365716 L94.0059539,4.26365716 Z" id="email" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <g id="google+" sketch:type="MSLayerGroup" transform="translate(34.000000, 0.000000)">
+            <path d="M21.0555555,8.04444444 L21.0555555,5.00000001 L19.0444444,5.00000001 L19.0444444,8.04444444 L16,8.04444444 L16,9.95555556 L19.0444444,9.95555556 L19.0444444,13 L21.0555555,13 L21.0555555,9.95555556 L24,9.95555556 L24,8.04444444 L21.0555555,8.04444444 Z" id="plus" fill="#FDF4F2" sketch:type="MSShapeGroup"></path>
+            <path d="M11.1171842,12.6636942 C10.5107183,12.2277942 9.35097104,11.1675267 9.35097104,10.5445368 C9.35097104,9.81408747 9.55638253,9.45423576 10.6387952,8.595386 C11.7486142,7.71504434 12.5338993,6.4773308 12.5338993,5.03764841 C12.5338993,3.32380642 11.7819902,1.65322379 10.3709734,1.10214919 L12.4983525,1.10214919 L14,0 L7.29034384,0 C4.28216459,0 1.45117649,2.31396223 1.45117649,4.9946646 C1.45117649,7.73378087 3.50176377,9.94469215 6.5620421,9.94469215 C6.77478001,9.94469215 6.98154824,9.94028355 7.18397488,9.92540454 C6.98534713,10.3117078 6.84343141,10.7465057 6.84343141,11.1981113 C6.84343141,11.9591453 7.24665659,12.5766244 7.75652208,13.0803066 C7.3714773,13.0803066 6.99918595,13.0916036 6.59351863,13.0916036 C2.86762027,13.0916036 0,15.5011773 0,17.9997495 C0,20.4605731 3.14358259,22 6.86948095,22 C11.1171842,22 13.4632709,19.5526777 13.4632709,17.0915786 C13.4632709,15.118456 12.8899097,13.9366765 11.1171842,12.6636942 L11.1171842,12.6636942 Z M7.51045921,8.99892878 C5.87768413,8.94839543 4.32589428,7.10339638 4.04423994,4.87886531 C3.76232931,2.65353634 4.85716767,0.950562585 6.48943018,1.00109593 C8.1216927,1.05216121 9.67399511,2.83731814 9.95590574,5.06211518 C10.2373038,7.28744415 9.14246545,9.04972809 7.51045921,8.99892878 L7.51045921,8.99892878 Z M6.28402936,21 C3.79643544,21 2,19.3879579 2,17.4511994 C2,15.5530848 4.22837673,13.9729776 6.71597064,14.0003504 C7.2962607,14.006791 7.83723572,14.1023274 8.32841167,14.2652223 C9.6787524,15.2267583 10.6474751,15.7699202 10.9208457,16.8656365 C10.9722174,17.0878391 11,17.3164824 11,17.5499561 C11,19.4867146 9.78123362,21 6.28402936,21 L6.28402936,21 Z" id="g" fill="url(#linearGradient-3)" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/assets/images/twitter.svg b/app/assets/images/twitter.svg
deleted file mode 100644
index 3c466d6cb..000000000
--- a/app/assets/images/twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 29 22" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient y1="0%" x2="0" y2="100%" id="0"><stop stop-color="#fff" offset="0%"/><stop stop-color="#e9f7fc" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path d="m24.17 4.163c1.017-.625 1.797-1.614 2.165-2.793-.951.579-2.01.999-3.127 1.225-.898-.981-2.178-1.594-3.594-1.594-2.719 0-4.924 2.261-4.924 5.05 0 .396.044.781.128 1.151-4.092-.211-7.72-2.221-10.149-5.275-.424.746-.667 1.613-.667 2.538 0 1.752.869 3.297 2.19 4.203-.807-.026-1.566-.253-2.23-.631-.001.021-.001.042-.001.063 0 2.446 1.697 4.487 3.95 4.951-.413.115-.848.177-1.297.177-.317 0-.626-.032-.926-.091.627 2.01 2.445 3.466 4.6 3.506-1.685 1.354-3.808 2.162-6.115 2.162-.397 0-.789-.024-1.175-.071 2.179 1.433 4.767 2.269 7.548 2.269 9.06 0 14.01-7.693 14.01-14.366 0-.219-.005-.437-.014-.653.962-.712 1.797-1.601 2.457-2.613-.883.402-1.832.673-2.828.795" fill="url(#0)"/></g></svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index f311fe747..4cdb79efd 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -840,18 +840,23 @@ ol.tabs li {
 .provider_icon {
   width: 29px;
   height: 22px;
+  background: image_url("provider.svg") no-repeat;
 }
 
-  .facebook .provider_icon {
-    background-image: image_url("facebook.svg");
+  .facebook.provider_icon {
+    background-position: 0 0;
   }
 
-  .google .provider_icon {
-    background-image: image_url("google.svg");
+  .google.provider_icon {
+    background-position: -30px 0;
   }
 
-  .twitter .provider_icon {
-    background-image: image_url("twitter.svg");
+  .twitter.provider_icon {
+    background-position: -60px 0;
+  }
+
+  .email.provider_icon {
+    background-position: -90px 0;
   }
 
 .icon {