Browse Source

clear up icon licensing, replace unlicensed icons

Felix Niklas 9 years ago
parent
commit
c84207280f

+ 115 - 115
LICENSE-ICONS-3RD-PARTY.json

@@ -1,4 +1,59 @@
 {
+    "trash.svg": {
+        "author": "Filip Malinowski",
+        "url": "https:\/\/thenounproject.com\/term\/trash\/16505\/",
+        "license": "CC 3.0 Attribution"
+    },
+    "email.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "email-button.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "paperclip.svg": {
+        "author": "Cheesefork",
+        "url": "https:\/\/thenounproject.com\/search\/?q=attachment&i=197956",
+        "license": "CC 3.0 Attribution"
+    },
+    "cog.svg": {
+        "author": "Melvin Salas",
+        "url": "https:\/\/thenounproject.com\/term\/gear\/17369\/",
+        "license": "CC 3.0 Attribution"
+    },
+    "team.svg": {
+        "author": "R\u00e9my M\u00e9dard",
+        "url": "https:\/\/thenounproject.com\/catalarem\/uploads\/?i=2554",
+        "license": "CC 3.0 Attribution"
+    },
+    "important.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "note.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "pen.svg": {
+        "author": "Dmitry Baranovskiy",
+        "url": "https:\/\/thenounproject.com\/search\/?q=edit&i=5039",
+        "license": "CC 3.0 Attribution"
+    },
+    "package.svg": {
+        "author": "Michael Wallner",
+        "url": "https:\/\/thenounproject.com\/search\/?q=package&i=25152",
+        "license": "CC 3.0 Attribution"
+    },
+    "organization.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
     "eyedropper.svg": {
         "author": "Felix Niklas",
         "url": "",
@@ -25,9 +80,9 @@
         "license": "MIT"
     },
     "user.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
+        "author": "R\u00e9my M\u00e9dard",
+        "url": "https:\/\/thenounproject.com\/search\/?q=user&i=10314",
+        "license": "CC 3.0 Attribution"
     },
     "twitter.svg": {
         "author": "Twitter",
@@ -39,15 +94,10 @@
         "url": "twitter.com",
         "license": ""
     },
-    "trash.svg": {
-        "author": "Felix Niklas",
-        "url": "",
-        "license": "MIT"
-    },
     "total-tickets.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "tools.svg": {
         "author": "Michael Kussmaul",
@@ -59,35 +109,30 @@
         "url": "",
         "license": "MIT"
     },
-    "team.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
     "task-state.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "switchView.svg": {
-        "author": "",
+        "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "stopwatch.svg": {
-        "author": "",
+        "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "status.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "status-modified-outer-circle.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "split.svg": {
         "author": "Felix Niklas",
@@ -95,14 +140,14 @@
         "license": "MIT"
     },
     "signout.svg": {
-        "author": "",
+        "author": "Felix Niklas",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "report.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "reply.svg": {
         "author": "Felix Niklas",
@@ -115,9 +160,9 @@
         "license": "MIT"
     },
     "reopening.svg": {
-        "author": "",
+        "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "reload.svg": {
         "author": "Anand A Nair",
@@ -125,51 +170,36 @@
         "license": "CC 3.0 Attribution"
     },
     "received-calls.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
+        "author": "Michael Zenaty",
+        "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+        "license": "CC 3.0 Attribution"
     },
     "radio.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "radio-checked.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "plus.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "plus-small.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "phone.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
+        "author": "Michael Zenaty",
+        "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+        "license": "CC 3.0 Attribution"
     },
     "person.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
-    "pen.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
-    "paperclip.svg": {
-        "author": "Felix Niklas",
-        "url": "",
-        "license": "MIT"
-    },
-    "package.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
@@ -180,59 +210,49 @@
         "license": "MIT"
     },
     "outbound-calls.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
-    "organization.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
+        "author": "Michael Zenaty",
+        "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+        "license": "CC 3.0 Attribution"
     },
     "one-ticket.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
-    },
-    "note.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "mood-supergood.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "mood-super-bad.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "mood-ok.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "mood-good.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "mood-bad.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "minus.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "minus-small.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "message.svg": {
         "author": "Felix Niklas",
@@ -247,42 +267,42 @@
     "magnifier.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "long-arrow-right.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "logotype.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "logo.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "lock.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "lock-open.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "loading.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "list.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "linkedin-button.svg": {
         "author": "Linkedin",
@@ -302,12 +322,7 @@
     "in-process.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
-    },
-    "important.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "help.svg": {
         "author": "Felix Niklas",
@@ -315,9 +330,9 @@
         "license": "MIT"
     },
     "group.svg": {
-        "author": "",
+        "author": "Felix Niklas",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "google-button.svg": {
         "author": "Google",
@@ -327,7 +342,7 @@
     "full-logo.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "facebook.svg": {
         "author": "Facebook",
@@ -339,20 +354,10 @@
         "url": "",
         "license": ""
     },
-    "email.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
-    "email-button.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
     "dropdown-list.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "download.svg": {
         "author": "Felix Niklas",
@@ -362,7 +367,7 @@
     "diagonal-cross.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "dashboard.svg": {
         "author": "Anton Gajdosik",
@@ -374,25 +379,20 @@
         "url": "",
         "license": "MIT"
     },
-    "cog.svg": {
-        "author": "",
-        "url": "",
-        "license": ""
-    },
     "cloud.svg": {
-        "author": "Felix Niklas",
-        "url": "",
-        "license": "MIT"
+        "author": "Kirill Ulitin",
+        "url": "https:\/\/thenounproject.com\/search\/?q=cloud&i=84976",
+        "license": "CC 3.0 Attribution"
     },
     "small-dot.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "clock.svg": {
-        "author": "",
+        "author": "Felix Niklas",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "clipboard.svg": {
         "author": "Felix Niklas",
@@ -402,17 +402,17 @@
     "checkmark.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "checkbox.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "checkbox-checked.svg": {
         "author": "Zammad",
         "url": "",
-        "license": ""
+        "license": "MIT"
     },
     "chat.svg": {
         "author": "Felix Niklas",

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

@@ -53,7 +53,7 @@
 .icon-outbound-calls { width: 17px; height: 17px; }
 .icon-overviews { width: 24px; height: 24px; }
 .icon-package { width: 16px; height: 16px; }
-.icon-paperclip { width: 31px; height: 28px; }
+.icon-paperclip { width: 28px; height: 28px; }
 .icon-pen { width: 16px; height: 16px; }
 .icon-person { width: 24px; height: 24px; }
 .icon-phone { width: 17px; height: 17px; }

+ 0 - 4
app/assets/stylesheets/zammad.scss

@@ -4246,8 +4246,6 @@ footer {
     }
 
     .article-meta-icon {
-      width: 16px;
-      height: 16px;
       fill: white;
       vertical-align: top;
       margin: 2px 3px 0 0;
@@ -4522,8 +4520,6 @@ footer {
   }
 
   .editControls-icon .icon {
-    width: 16px;
-    height: 16px;
     fill: hsl(210,2%,78%);
   }
 

+ 9 - 12
contrib/edit-icon-license-list.php

@@ -10,6 +10,7 @@ if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQ
 
 ?>
 <!doctype html>
+<meta charset="utf-8">
 <title>Zammad Icons</title>
 <style>
   html {
@@ -115,7 +116,7 @@ if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQ
 </style>
 
 <div class="controls">
-  <input type="radio" value="off" name="filter" checked id="off"><label for="off">No Filter</label>
+  <input type="radio" value="off" name="filter" id="off"><label for="off">No Filter</label>
   <input type="radio" value="empty_author" name="filter" id="author"><label for="author">No Author</label>
   <input type="radio" value="empty_license" name="filter" id="license"><label for="license">No License</label>
 </div>
@@ -191,19 +192,14 @@ if ($sortByImageName) {
   var filter = "off"
   var filterTimeout
 
-  $('input').on({
-    input: storeAuthors,
-    blur: onBlur,
-    focus: onFocus
-  })
-
-  function onBlur(){
-    filterTimeout = setTimeout(applyFilter, 500)
+  if(localStorage.getItem('icon-list-filter')){
+    filter = localStorage.getItem('icon-list-filter')
+    applyFilter()
   }
+  
+  $('[name="filter"][value="'+ filter +'"]').prop('checked', true)
 
-  function onFocus(){
-    clearTimeout(filterTimeout)
-  }
+  $('input').on('input', storeAuthors)
 
   function storeAuthors(){
     var iconList = {}
@@ -221,6 +217,7 @@ if ($sortByImageName) {
 
   $('[name="filter"]').change(function(){
     filter = this.value
+    localStorage.setItem('icon-list-filter', filter)
     applyFilter()
   })
 

BIN
contrib/icon-sprite.sketch


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


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


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


+ 2 - 2
public/assets/images/icons/email-button.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="29px" height="22px" viewBox="0 0 29 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">
-    <!-- Generator: Sketch 3.4 (15575) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.5.2 (25235) - http://www.bohemiancoding.com/sketch -->
     <title>email-button</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="email-button" sketch:type="MSArtboardGroup" fill="#FFFFFF">
-            <path d="M25.5086484,18.3149449 C25.8146823,17.9649376 26,17.5077401 26,17.0081158 L26,5.99188419 C26,5.57003752 25.8674188,5.17881924 25.6419541,4.85677054 L14.5,14 L3.35735204,4.85620115 C3.13207326,5.17854842 3,5.5700978 3,5.99188419 L3,17.0081158 C3,17.5078518 3.18606043,17.9646049 3.49218432,18.3143008 L11.6549714,12 L12,12.2923145 L3.82364829,18.6171082 C4.15469946,18.8578739 4.56203526,19 5.00086422,19 L23.9991358,19 C24.439573,19 24.8467726,18.8580775 25.1772629,18.617813 L17,12.2923145 L17.3450286,12 L25.5086484,18.3149449 Z M4.00595392,4.26365716 C4.29900312,4.09596268 4.63869667,4 5.00086422,4 L23.9991358,4 C24.3601255,4 24.6998037,4.09617742 24.9932362,4.26432456 L14.5000004,12.9116819 L4.00595392,4.26365716 Z" id="email" sketch:type="MSShapeGroup"></path>
+            <path d="M3.692327,4 L25.3063956,4 L14.4948188,13.2789684 L3.692327,4 Z M26,5.55434383 L26,19 L3,19 L3,5.55530843 L13.9696218,14.9778358 L14.4960016,15.4299778 L15.0225136,14.9779923 L26,5.55434383 Z" id="mail" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>

+ 2 - 2
public/assets/images/icons/email.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" 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.4 (15575) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.5.2 (25235) - http://www.bohemiancoding.com/sketch -->
     <title>email</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="email" sketch:type="MSArtboardGroup" fill="#50E3C2">
-            <path d="M11.324675,9 L8.5,11.592593 L5.675325,9 L1,14 L16,14 L11.324675,9 L11.324675,9 Z M17,4 L12,8.591837 L17,14 L17,4 L17,4 Z M0,4 L0,14 L5,8.646465 L0,4 L0,4 Z M17,3 L0,3 L8.449102,10 L17,3 L17,3 Z" id="email-channel-white" sketch:type="MSShapeGroup"></path>
+            <path d="M0.511719955,3 L16.4855552,3 L8.48895668,9.79842908 L0.511719955,3 Z M17,4.13985214 L17,14 L-7.21644966e-16,14 L-7.21644966e-16,4.14055952 L8.10798135,11.0504129 L8.49704462,11.3819837 L8.88620571,11.0505277 L17,4.13985214 Z" id="mail" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>

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