Browse Source

replace icon-close by icon-diagonal-cross

Felix Niklas 9 years ago
parent
commit
2158807fd0

+ 1 - 1
app/assets/javascripts/app/views/agent_user_create.jst.eco

@@ -3,7 +3,7 @@
   <div class="modal-content">
     <div class="modal-header">
       <div class="modal-close js-close">
-        <svg class="close-icon"><use xlink:href="#icon-close" /></svg>
+        <svg class="icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
       </div>
       <h1 class="modal-title"><%- @T( @head ) %></h1>
     </div>

+ 1 - 1
app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco

@@ -6,7 +6,7 @@
         <div class="modal-content">
           <div class="modal-header">
             <div class="modal-close js-close">
-              <svg class="close-icon"><use xlink:href="#icon-close" /></svg>
+              <svg class="icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
             </div>
             <h1 class="modal-title">Edit Customer</h1>
           </div>

+ 1 - 1
app/assets/javascripts/app/views/modal.jst.eco

@@ -4,7 +4,7 @@
       <div class="modal-header">
   <% if @close: %>
         <div class="modal-close js-close">
-          <svg class="close-icon"><use xlink:href="#icon-close" /></svg>
+          <svg class="icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
         </div>
   <% end %>
         <h1 class="modal-title"><%- @T( @head ) %></h1>

+ 1 - 1
app/assets/javascripts/app/views/navigation.jst.eco

@@ -3,7 +3,7 @@
     <input id="global-search" type="search" autocomplete="off">
     <svg class="icon-magnifier"><use xlink:href="#icon-magnifier" /></svg>
     <div class="empty-search">
-      <svg class="icon-close"><use xlink:href="#icon-close" /></svg>
+      <svg class="icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
     </div>
   </div>
   <svg class="icon-logo js-toggleNavigation"><use xlink:href="#icon-logo" /></svg>

+ 1 - 1
app/assets/javascripts/app/views/task_widget_tasks.jst.eco

@@ -11,7 +11,7 @@
     <div class="nav-tab-name u-textTruncate flex"><%= item.data.head %></div>
     <div class="nav-tab-close js-close" title="<%- @Ti('close') %>">
       <div class="nav-tab-close-inner">
-        <svg class="icon"><use xlink:href="#icon-close" /></svg>
+        <svg class="icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
       </div>
     </div>
   </a>

+ 1 - 1
app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco

@@ -4,7 +4,7 @@
   <div class="align-right horizontal center js-close u-clickable">
     <%- @T('Back to my view') %>
     <div class="switchBackToUser-close">
-      <svg class="icon"><use xlink:href="#icon-close" /></svg>
+      <svg class="icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
     </div>
   </div>
 </div>

+ 0 - 1
app/assets/stylesheets/svg-dimensions.css

@@ -6,7 +6,6 @@
 .icon-checkbox { width: 10px; height: 10px; }
 .icon-checkmark { width: 16px; height: 14px; }
 .icon-clock { width: 16px; height: 16px; }
-.icon-close { width: 13px; height: 13px; }
 .icon-cloud { width: 16px; height: 16px; }
 .icon-cog { width: 20px; height: 20px; }
 .icon-dashboard { width: 24px; height: 24px; }

+ 5 - 9
app/assets/stylesheets/zammad.css.scss

@@ -1698,7 +1698,7 @@ footer {
       background-color: #972e29;
     }
 
-    .nav-tab-close .icon {
+    .nav-tab-close svg {
       width: 13px;
       height: 13px;
       fill: white;
@@ -1706,7 +1706,7 @@ footer {
       transform: scale(0.7);
     }
 
-    .nav-tab-close:hover .icon {
+    .nav-tab-close:hover svg {
       opacity: 1;
     } 
 
@@ -1758,7 +1758,7 @@ footer {
     justify-content: center;
   }
 
-  .empty-search .icon-close {
+  .empty-search .icon-diagonal-cross {
     fill: white;
     opacity: 0.5;
   }
@@ -3819,10 +3819,8 @@ footer {
     align-items: center;
     justify-content: center;
     
-    .icon {
+    svg {
       fill: white;
-      width: 13px;
-      height: 13px;
     }
   }
 
@@ -3869,10 +3867,8 @@ footer {
     @extend .u-clickable;
   }
 
-  .modal-close .close-icon {
+  .modal-close .icon-diagonal-cross {
     opacity: 0.18;
-    width: 13px;
-    height: 13px;
   }
 
   .modal-body {

File diff suppressed because it is too large
+ 0 - 0
public/assets/images/icons.svg


+ 0 - 12
public/assets/images/icons/close.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="13px" height="13px" viewBox="0 0 13 13" 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">
-    <!-- Generator: Sketch 3.3.2 (12043) - http://www.bohemiancoding.com/sketch -->
-    <title>close</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="close" sketch:type="MSArtboardGroup" fill="#50E3C2">
-            <path d="M6.51832931,5.11243489 L11.3036762,0.293623582 C11.6905483,-0.0959532292 12.3199849,-0.0981462527 12.7095624,0.288725564 C13.0991398,0.675597381 13.1013329,1.3050339 12.7144609,1.69461171 L7.92423256,6.51833794 L12.7088296,11.3029347 C13.0970567,11.6911625 13.0970567,12.320603 12.7088296,12.7088298 C12.3206025,13.0970566 11.691162,13.0970566 11.3029349,12.7088298 L6.52323648,7.92913105 L1.77916681,12.7063763 C1.39229479,13.0959531 0.76285807,13.0981471 0.373280663,12.7112743 C-0.0162967445,12.3244025 -0.0184898675,11.694966 0.368382148,11.3053882 L5.11733323,6.523228 L0.291170323,1.69706519 C-0.0970567743,1.30883839 -0.0970567743,0.679397892 0.291170323,0.291170099 C0.679397321,-0.0970566998 1.30883782,-0.0970566998 1.69706492,0.291170099 L6.51832931,5.11243489 L6.51832931,5.11243489 Z" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>

Some files were not shown because too many files changed in this diff