From e4d24abd8edddc5b41fa7cbc66810fb3ad98672f Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Tue, 26 May 2015 18:48:35 +0200
Subject: [PATCH] fix org icon

---
 .../app/views/layout_ref/organization_profile.jst.eco       | 4 ++--
 .../javascripts/app/views/layout_ref/user_profile.jst.eco   | 2 +-
 .../app/views/organization_profile/index.jst.eco            | 2 +-
 .../app/views/organization_profile/object.jst.eco           | 2 +-
 app/assets/javascripts/app/views/user_profile/index.jst.eco | 2 +-
 .../javascripts/app/views/widget/organization.jst.eco       | 4 +++-
 app/assets/stylesheets/zammad.css.scss                      | 6 ++++--
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
index 0d632731c..fce6fc5f1 100644
--- a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
@@ -1,4 +1,4 @@
-<div class="flex profile">
+<div class="profile">
 
   <div class="profile-window">
     <div class="profile-section vertical centered">
@@ -16,7 +16,7 @@
         </ul>
       </div>
       <div class="profile-organizationIcon">
-        <div class="organization icon"></div>
+        <svg class="icon-organization"><use xlink:href="#icon-organization" /></svg>
       </div>
       <h1>Steuerbüro C. Kaik</h1>
     </div>
diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
index 0ff260cb9..538952c7e 100644
--- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
@@ -1,4 +1,4 @@
-<div class="flex profile">
+<div class="profile">
 
   <div class="profile-window">
     <div class="profile-section vertical centered">
diff --git a/app/assets/javascripts/app/views/organization_profile/index.jst.eco b/app/assets/javascripts/app/views/organization_profile/index.jst.eco
index 97263221b..79fadb99a 100644
--- a/app/assets/javascripts/app/views/organization_profile/index.jst.eco
+++ b/app/assets/javascripts/app/views/organization_profile/index.jst.eco
@@ -1,4 +1,4 @@
-<div class="flex profile">
+<div class="profile">
   <div class="profile-window">
     <div class="js-object-container"></div>
     <div class="profile-section js-ticket-stats"></div>
diff --git a/app/assets/javascripts/app/views/organization_profile/object.jst.eco b/app/assets/javascripts/app/views/organization_profile/object.jst.eco
index d2752a419..413d80186 100644
--- a/app/assets/javascripts/app/views/organization_profile/object.jst.eco
+++ b/app/assets/javascripts/app/views/organization_profile/object.jst.eco
@@ -1,7 +1,7 @@
 <div class="profile-section vertical centered">
   <div class="align-right profile-action js-action"></div>
   <div class="profile-organizationIcon">
-    <div class="organization icon"></div>
+    <svg class="icon-organization"><use xlink:href="#icon-organization" /></svg>
   </div>
   <h1><%= @organization.displayName() %></h1>
 </div>
diff --git a/app/assets/javascripts/app/views/user_profile/index.jst.eco b/app/assets/javascripts/app/views/user_profile/index.jst.eco
index 97263221b..79fadb99a 100644
--- a/app/assets/javascripts/app/views/user_profile/index.jst.eco
+++ b/app/assets/javascripts/app/views/user_profile/index.jst.eco
@@ -1,4 +1,4 @@
-<div class="flex profile">
+<div class="profile">
   <div class="profile-window">
     <div class="js-object-container"></div>
     <div class="profile-section js-ticket-stats"></div>
diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco
index e86f14687..41b39320e 100644
--- a/app/assets/javascripts/app/views/widget/organization.jst.eco
+++ b/app/assets/javascripts/app/views/widget/organization.jst.eco
@@ -1,6 +1,8 @@
 <div class="sidebar-block">
     <div class="avatar organizationInfo-avatar size-50">
-      <a href="<%- @organization.uiUrl() %>" class="organization icon"></a>
+      <a href="<%- @organization.uiUrl() %>">
+        <svg class="icon-organization"><use xlink:href="#icon-organization" /></svg>
+      </a>
     </div>
     <h3 title="<%- @Ti( 'Name') %>"><%= @organization.displayName() %></h3>
 </div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index fb9feb823..dca515e01 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -4620,6 +4620,7 @@ label + .wizard-buttonList {
 .profile {
   padding: 60px;
   overflow: auto;
+  flex: 1;
   
   h1 {
     margin: 18px 0 0;
@@ -4752,8 +4753,9 @@ label + .wizard-buttonList {
   border-radius: 100%;
   opacity: 0.4;
   
-  .icon {
-    transform: scale(1.6);
+  svg {
+    width: 32px;
+    height: 32px;
   }
 }