Home Explore Help
Sign In
SMusatov
/
zammad
mirror of https://github.com/zammad/zammad.git
1
0
Fork 0
Files
Browse Source

Merge branch 'develop' of github.com:martini/zammad into develop

Martin Edenhofer 8 years ago
parent
1794b98362 46ff5ae572
commit
36fd9d20b9
10 changed files with 33 additions and 33 deletions
Split View Show Diff Stats
  1. 1 1
      LICENSE-ICONS-3RD-PARTY.json
  2. 1 1
      app/assets/stylesheets/svg-dimensions.css
  3. 1 1
      app/views/layouts/application.html.erb
  4. BIN
      contrib/icon-sprite.sketch
  5. 0 0
      public/assets/images/icons.svg
  6. 6 6
      public/assets/images/icons/arrow-down.svg
  7. 6 6
      public/assets/images/icons/arrow-left.svg
  8. 6 6
      public/assets/images/icons/arrow-right.svg
  9. 6 6
      public/assets/images/icons/arrow-up.svg
  10. 6 6
      public/assets/images/icons/chat.svg

+ 1 - 1
LICENSE-ICONS-3RD-PARTY.json
View File 

@@ -244,7 +244,7 @@
 
         "url": "",
 
         "license": "MIT"
 
     },
 
-    "mood-super-bad.svg": {
 
+    "mood-superbad.svg": {
 
         "author": "Zammad",
 
         "url": "",
 
         "license": "MIT"

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

@@ -47,7 +47,7 @@
 
 .icon-mood-bad { width: 60px; height: 59px; }
 
 .icon-mood-good { width: 60px; height: 59px; }
 
 .icon-mood-ok { width: 60px; height: 59px; }
 
-.icon-mood-super-bad { width: 60px; height: 59px; }
 
+.icon-mood-superbad { width: 60px; height: 59px; }
 
 .icon-mood-supergood { width: 60px; height: 59px; }
 
 .icon-mute { width: 16px; height: 16px; }
 
 .icon-note { width: 16px; height: 16px; }

+ 1 - 1
app/views/layouts/application.html.erb
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 <head>
 
   <meta charset="utf-8">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
+  <meta name="viewport" content="width=1024">
 
   <title><%= Setting.get('product_name') %></title>
 
   <%= stylesheet_link_tag "application", :media => 'all' %>
 
   <%= stylesheet_link_tag "application-print", :media => 'print' %>

BIN
contrib/icon-sprite.sketch
View File


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


+ 6 - 6
public/assets/images/icons/arrow-down.svg
View File 

@@ -1,12 +1,12 @@
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<svg width="13px" height="7px" viewBox="0 0 13 7" 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 -->
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<svg width="13px" height="7px" viewBox="0 0 13 7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 
+    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
 
     <title>arrow-down</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="arrow-down" sketch:type="MSArtboardGroup" fill="#50E3C2">
 
-            <path d="M6.553517,4.21400561 L2.24634,-0.000207393944 L0.846482,1.42821861 L5.846482,6.32821861 L6.553517,7.02111261 L7.253518,6.32111261 L12.153518,1.42111261 L10.739304,0.00689860606 L6.553517,4.21400561 L6.553517,4.21400561 Z" sketch:type="MSShapeGroup"></path>
 
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
 
+        <g id="arrow-down" fill="#50E3C2">
 
+            <polygon points="7.203553 3.45693561 2.98934 7.76411261 4.417766 9.16397061 9.317766 4.16397061 10.01066 3.45693561 9.31066 2.75693461 4.41066 -2.14306539 2.996446 -0.728851394"></polygon>
 
         </g>
 
     </g>
 
 </svg>

+ 6 - 6
public/assets/images/icons/arrow-left.svg
View File 

@@ -1,12 +1,12 @@
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<svg width="7px" height="13px" viewBox="0 0 7 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.4 (15575) - http://www.bohemiancoding.com/sketch -->
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<svg width="7px" height="13px" viewBox="0 0 7 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 
+    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
 
     <title>arrow-left</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="arrow-left" sketch:type="MSArtboardGroup" fill="#50E3C2">
 
-            <path d="M7.08012822,2.201647 L5.65170254,0.801789 L0.751702536,5.801789 L0.0588082339,6.508824 L0.758808596,7.208825 L5.6588086,12.108825 L7.07302216,10.694611 L2.96591535,6.508824 L7.08012822,2.201647 Z" id="arrow-left-black" sketch:type="MSShapeGroup"></path>
 
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
 
+        <g id="arrow-left" fill="#50E3C2">
 
+            <polygon id="arrow-left-black" points="7.08012822 2.201647 5.65170254 0.801789 0.751702536 5.801789 0.0588082339 6.508824 0.758808596 7.208825 5.6588086 12.108825 7.07302216 10.694611 2.96591535 6.508824"></polygon>
 
         </g>
 
     </g>
 
 </svg>

+ 6 - 6
public/assets/images/icons/arrow-right.svg
View File 

@@ -1,12 +1,12 @@
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<svg width="7px" height="13px" viewBox="0 0 7 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.4 (15575) - http://www.bohemiancoding.com/sketch -->
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<svg width="7px" height="13px" viewBox="0 0 7 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 
+    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
 
     <title>arrow-right</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="arrow-right" sketch:type="MSArtboardGroup" fill="#50E3C2">
 
-            <path d="M0,10.700142 L1.42842564,12.1 L6.32842564,7.1 L7.02131994,6.392965 L6.32131964,5.692964 L1.42131964,0.792964001 L0.00710606,2.207178 L4.21421294,6.392965 L0,10.700142 Z" id="arrow-right-black" sketch:type="MSShapeGroup"></path>
 
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
 
+        <g id="arrow-right" fill="#50E3C2">
 
+            <polygon id="arrow-right-black" points="0 10.700142 1.42842564 12.1 6.32842564 7.1 7.02131994 6.392965 6.32131964 5.692964 1.42131964 0.792964001 0.00710606 2.207178 4.21421294 6.392965"></polygon>
 
         </g>
 
     </g>
 
 </svg>

+ 6 - 6
public/assets/images/icons/arrow-up.svg
View File 

@@ -1,12 +1,12 @@
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<svg width="13px" height="7px" viewBox="0 0 13 7" 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 -->
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<svg width="13px" height="7px" viewBox="0 0 13 7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 
+    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
 
     <title>arrow-up</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="arrow-up" sketch:type="MSArtboardGroup" fill="#50E3C2">
 
-            <path d="M10.807178,7 L12.207036,5.571574 L7.20703601,0.671574 L6.50000101,-0.02132 L5.80000001,0.67868 L0.900000013,5.57868 L2.31421401,6.992894 L6.50000101,2.885787 L10.807178,7 Z" sketch:type="MSShapeGroup"></path>
 
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
 
+        <g id="arrow-up" fill="#50E3C2">
 
+            <polygon points="10.064178 -0.76432 8.63575201 -2.164178 3.73575201 2.835822 3.04285801 3.542857 3.74285801 4.242858 8.64285801 9.142858 10.057072 7.728644 5.94996501 3.542857"></polygon>
 
         </g>
 
     </g>
 
 </svg>

+ 6 - 6
public/assets/images/icons/chat.svg
View File 

@@ -1,12 +1,12 @@
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<svg width="24px" height="24px" viewBox="0 0 24 24" 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 -->
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 
+    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
 
     <title>chat</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="chat" sketch:type="MSArtboardGroup" fill="#50E3C2">
 
-            <path d="M2,5.00585866 C2,3.89805351 2.89821238,3 3.99079514,3 L20.0092049,3 C21.1086907,3 22,3.89706013 22,5.00585866 L22,14.9941413 C22,16.1019465 21.1017876,17 20.0092049,17 L3.99079514,17 C2.89130934,17 2,16.1029399 2,14.9941413 L2,5.00585866 Z M12,17 L18,21 L18,17 L12,17 Z" id="Chat" sketch:type="MSShapeGroup"></path>
 
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
 
+        <g id="chat" fill="#50E3C2">
 
+            <path d="M2,5.00585866 C2,3.89805351 2.89821238,3 3.99079514,3 L20.0092049,3 C21.1086907,3 22,3.89706013 22,5.00585866 L22,14.9941413 C22,16.1019465 21.1017876,17 20.0092049,17 L3.99079514,17 C2.89130934,17 2,16.1029399 2,14.9941413 L2,5.00585866 Z M12,17 L18,21 L18,17 L12,17 Z" id="Chat"></path>
 
         </g>
 
     </g>
 
 </svg>

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