Merge branch 'develop'

contactlab · Sep 19, 2017 · 4233dfe · 4233dfe
2 parents 391d74c + 53c4e73
commit 4233dfe
Show file tree

Hide file tree

Showing 21 changed files with 8,610 additions and 5,318 deletions.
diff --git a/demo/index.html b/demo/index.html
diff --git a/demo/svg/index.html b/demo/svg/index.html
@@ -10,7 +10,17 @@
 <body>
 
   <div class="clearfix mhl ptl">
-        <h1 class="mvm mtn fgc1">Grid Size: 0</h1>
+        <h1 class="mvm mtn fgc1">Grid Size: 24px</h1>
+        <div class="glyph fs1">
+            <div class="clearfix pbs">
+                <svg class="ikn ikn-camera"><use xlink:href="../../dist/ikonograph.svg#camera"></use></svg><span class="name"> ikn-camera</span>
+            </div>
+        </div>
+        <div class="glyph fs1">
+            <div class="clearfix pbs">
+                <svg class="ikn ikn-camera-full"><use xlink:href="../../dist/ikonograph.svg#camera-full"></use></svg><span class="name"> ikn-camera-full</span>
+            </div>
+        </div>
         <div class="glyph fs1">
             <div class="clearfix pbs">
                 <svg class="ikn ikn-linkedin"><use xlink:href="../../dist/ikonograph.svg#linkedin"></use></svg><span class="name"> ikn-linkedin</span>

diff --git a/demo/webcomponent/index.html b/demo/webcomponent/index.html
@@ -13,6 +13,16 @@
 
 <div class="clearfix mhl ptl">
     <h1 class="mvm mtn fgc1">Grid Size: 24px</h1>
+    <div class="glyph fs1">
+        <div class="clearfix pbs">
+          <ikn-icon icon="camera"></ikn-icon><span class="name">camera</span>
+        </div>
+    </div>
+    <div class="glyph fs1">
+        <div class="clearfix pbs">
+          <ikn-icon icon="camera-full"></ikn-icon><span class="name">camera-full</span>
+        </div>
+    </div>
     <div class="glyph fs1">
         <div class="clearfix pbs">
           <ikn-icon icon="linkedin"></ikn-icon><span class="name">linkedin</span>

diff --git a/dist/fonts/ikonograph.ttf b/dist/fonts/ikonograph.ttf
diff --git a/dist/fonts/ikonograph.woff b/dist/fonts/ikonograph.woff
diff --git a/dist/fonts/ikonograph.woff2 b/dist/fonts/ikonograph.woff2
diff --git a/dist/icons.json b/dist/icons.json
diff --git a/dist/ikonograph.css b/dist/ikonograph.css
diff --git a/dist/ikonograph.js b/dist/ikonograph.js
diff --git a/dist/ikonograph.svg b/dist/ikonograph.svg
diff --git a/src/_icons.scss b/src/_icons.scss
@@ -1,4 +1,7 @@
 $icons-map: (
+  ikn-camera-full: "\e9c1",
+  ikn-camera: "\e9c2",
+  ikn-google-plus: "\e944",
   ikn-linkedin: "\e94e",
   ikn-twitter: "\e971",
   ikn-facebook: "\e930",
@@ -85,7 +88,7 @@ $icons-map: (
   ikn-fast-forward: "\e933",
   ikn-fast-forward-full: "\e996",
   ikn-file-code: "\e934",
-  ikn-dev: "\e997",
+  ikn-file-code-full: "\e997",
   ikn-file-csv: "\e935",
   ikn-file-csv-full: "\e998",
   ikn-file-doc: "\e936",
@@ -113,7 +116,6 @@ $icons-map: (
   ikn-gender: "\e942",
   ikn-gift: "\e943",
   ikn-gift-full: "\e9a3",
-  ikn-google-plus: "\e944",
   ikn-hamburger-menu: "\e945",
   ikn-heart: "\e947",
   ikn-heart-full: "\e946",
@@ -191,5 +193,5 @@ $icons-map: (
   ikn-wand: "\e976",
   ikn-wand-full: "\e9bf",
   ikn-warning: "\e977",
-  ikn-warning-full: "\e9c0",
+  ikn-warning-full: "\e9c0"
 );
diff --git a/src/fonts/ikonograph.ttf b/src/fonts/ikonograph.ttf
diff --git a/src/fonts/ikonograph.woff b/src/fonts/ikonograph.woff
diff --git a/src/fonts/ikonograph.woff2 b/src/fonts/ikonograph.woff2