Merge pull request #6 from jwplayer/wip.DES-624.new-icons

New Icons for Split and Undo
jwplayer · Nov 7, 2018 · d232079 · d232079
2 parents 137c409 + 24fcfd6
commit d232079
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -36,6 +36,9 @@ module.exports = function (grunt) {
     },
     player: {
       files: { 'icons/sprites/icons-player.svg' : ['icons/player/**/*.svg'] }
+    },
+    logos: {
+      files: { 'icons/sprites/logos.svg' : ['icons/logos/**/*.svg'] }
     }
   };
 

diff --git a/icons/dashboard/split.svg b/icons/dashboard/split.svg
diff --git a/icons/dashboard/undo - redo.svg b/icons/dashboard/undo - redo.svg
diff --git a/icons/logos/jw-logo-full.svg b/icons/logos/jw-logo-full.svg
diff --git a/icons/logos/jw-logo-mark.svg b/icons/logos/jw-logo-mark.svg
diff --git a/icons/sprites/icons-dashboard.svg b/icons/sprites/icons-dashboard.svg
diff --git a/icons/sprites/logos.svg b/icons/sprites/logos.svg
diff --git a/styles/hook.css b/styles/hook.css
@@ -39,6 +39,14 @@
   width: 32px;
   height: 32px;
 }
+.ds-logo-full {
+  width: 104px;
+  height: 38px;
+}
+.ds-logo-mark {
+  width: 24px;
+  height: 25px;
+}
 /* Data Patterns - Palettes */
 .data-palette-a1 {
   fill: #f7bdad;

diff --git a/styles/hook.min.css b/styles/hook.min.css
diff --git a/styles/icons.less b/styles/icons.less
@@ -19,3 +19,13 @@
     height: 32px;
   }
 }
+.ds-logo {
+  &-full {
+    width: 104px;
+    height: 38px;
+  }
+  &-mark {
+    width: 24px;
+    height: 25px;
+  }
+}