Merge pull request ionic-team#79 from 2metres/master

Add iOS7 version of shrink and expand icons
IT-configuer · May 28, 2014 · 92ab37d · 92ab37d
2 parents 01a4a40 + 7eec94b
commit 92ab37d
Show file tree

Hide file tree

Showing 13 changed files with 862 additions and 16 deletions.
diff --git a/builder/build_data.json b/builder/build_data.json
@@ -1,5 +1,5 @@
 {
-  "build_hash": "",
+  "build_hash": "b00533d2baf717d9970fa1b1ded6de04",
   "prefix": "ion-",
   "version": "1.4.1",
   "name": "Ionicons",
@@ -1000,6 +1000,10 @@
       "code": "0xf186",
       "name": "ios7-email-outline"
     },
+    {
+      "code": "0xf30d",
+      "name": "ios7-expand"
+    },
     {
       "code": "0xf189",
       "name": "ios7-eye"
@@ -1368,6 +1372,10 @@
       "code": "0xf1d9",
       "name": "ios7-search-strong"
     },
+    {
+      "code": "0xf30e",
+      "name": "ios7-shrink"
+    },
     {
       "code": "0xf1dc",
       "name": "ios7-skipbackward"

diff --git a/builder/manifest.json b/builder/manifest.json
@@ -1,5 +1,5 @@
 {
-  "build_hash": "b00533d2baf717d9970fa1b1ded6de04",
+  "build_hash": "2d88147024893cacf6fee967debb268d",
   "prefix": "ion-",
   "version": "1.4.1",
   "name": "Ionicons",
@@ -1000,6 +1000,10 @@
       "code": "0xf186",
       "name": "ios7-email-outline"
     },
+    {
+      "code": "0xf30d",
+      "name": "ios7-expand"
+    },
     {
       "code": "0xf189",
       "name": "ios7-eye"
@@ -1368,6 +1372,10 @@
       "code": "0xf1d9",
       "name": "ios7-search-strong"
     },
+    {
+      "code": "0xf30e",
+      "name": "ios7-shrink"
+    },
     {
       "code": "0xf1dc",
       "name": "ios7-skipbackward"

diff --git a/cheatsheet.html b/cheatsheet.html
@@ -142,7 +142,7 @@
 <body>
   <div class="container">
     <header>
-      <h1>Ionicons v1.4.1 Cheatsheet, 525 icons:</h1>
+      <h1>Ionicons v1.4.1 Cheatsheet, 527 icons:</h1>
       <p><a href="http://ionicons.com/">Ionicons Homepage</a></p>
     </header>
     <div class="content">
@@ -9608,6 +9608,44 @@ <h1>Ionicons v1.4.1 Cheatsheet, 525 icons:</h1>
     <input class="css" type="text" readonly="readonly" onClick="this.select();" value="\f186" />
   </div>
 </div>
+<div class="icon-row">
+  <div class="preview-icon"><span class="step size-12">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-14">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-16">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-18">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-21">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-24">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-32">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-48">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-64">
+      <i class="icon ion-ios7-expand"></i>
+    </span><span class="step size-96">
+      <i class="icon ion-ios7-expand"></i>
+    </span>
+  </div>
+  <div class="preview-scale"><span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">32</span><span class="step">48</span><span class="step">64</span><span class="step">96</span></div>
+  <div class="usage">
+    <label>Classname:</label>
+    <input class="name" type="text" readonly="readonly" onClick="this.select();" value="ion-ios7-expand" />
+
+    <label>Selectable:</label>
+    <span class="ion">&#xf30d;</span>
+
+    <label>Escaped HTML:</label>
+    <input class="html" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf30d;" />
+
+    <label>CSS Content:</label>
+    <input class="css" type="text" readonly="readonly" onClick="this.select();" value="\f30d" />
+  </div>
+</div>
 <div class="icon-row">
   <div class="preview-icon"><span class="step size-12">
       <i class="icon ion-ios7-eye"></i>
@@ -13104,6 +13142,44 @@ <h1>Ionicons v1.4.1 Cheatsheet, 525 icons:</h1>
     <input class="css" type="text" readonly="readonly" onClick="this.select();" value="\f1d9" />
   </div>
 </div>
+<div class="icon-row">
+  <div class="preview-icon"><span class="step size-12">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-14">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-16">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-18">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-21">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-24">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-32">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-48">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-64">
+      <i class="icon ion-ios7-shrink"></i>
+    </span><span class="step size-96">
+      <i class="icon ion-ios7-shrink"></i>
+    </span>
+  </div>
+  <div class="preview-scale"><span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">32</span><span class="step">48</span><span class="step">64</span><span class="step">96</span></div>
+  <div class="usage">
+    <label>Classname:</label>
+    <input class="name" type="text" readonly="readonly" onClick="this.select();" value="ion-ios7-shrink" />
+
+    <label>Selectable:</label>
+    <span class="ion">&#xf30e;</span>
+
+    <label>Escaped HTML:</label>
+    <input class="html" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf30e;" />
+
+    <label>CSS Content:</label>
+    <input class="css" type="text" readonly="readonly" onClick="this.select();" value="\f30e" />
+  </div>
+</div>
 <div class="icon-row">
   <div class="preview-icon"><span class="step size-12">
       <i class="icon ion-ios7-skipbackward"></i>

diff --git a/css/ionicons.css b/css/ionicons.css
diff --git a/css/ionicons.min.css b/css/ionicons.min.css
diff --git a/fonts/ionicons.eot b/fonts/ionicons.eot
diff --git a/fonts/ionicons.svg b/fonts/ionicons.svg
diff --git a/fonts/ionicons.ttf b/fonts/ionicons.ttf
diff --git a/fonts/ionicons.woff b/fonts/ionicons.woff
diff --git a/scss/_ionicons-icons.scss b/scss/_ionicons-icons.scss
@@ -251,6 +251,7 @@
 .#{$ionicons-prefix}ios7-drag,
 .#{$ionicons-prefix}ios7-email,
 .#{$ionicons-prefix}ios7-email-outline,
+.#{$ionicons-prefix}ios7-expand,
 .#{$ionicons-prefix}ios7-eye,
 .#{$ionicons-prefix}ios7-eye-outline,
 .#{$ionicons-prefix}ios7-fastforward,
@@ -343,6 +344,7 @@
 .#{$ionicons-prefix}ios7-rewind-outline,
 .#{$ionicons-prefix}ios7-search,
 .#{$ionicons-prefix}ios7-search-strong,
+.#{$ionicons-prefix}ios7-shrink,
 .#{$ionicons-prefix}ios7-skipbackward,
 .#{$ionicons-prefix}ios7-skipbackward-outline,
 .#{$ionicons-prefix}ios7-skipforward,
@@ -779,6 +781,7 @@
 .#{$ionicons-prefix}ios7-drag:before { content: $ionicon-var-ios7-drag; }
 .#{$ionicons-prefix}ios7-email:before { content: $ionicon-var-ios7-email; }
 .#{$ionicons-prefix}ios7-email-outline:before { content: $ionicon-var-ios7-email-outline; }
+.#{$ionicons-prefix}ios7-expand:before { content: $ionicon-var-ios7-expand; }
 .#{$ionicons-prefix}ios7-eye:before { content: $ionicon-var-ios7-eye; }
 .#{$ionicons-prefix}ios7-eye-outline:before { content: $ionicon-var-ios7-eye-outline; }
 .#{$ionicons-prefix}ios7-fastforward:before { content: $ionicon-var-ios7-fastforward; }
@@ -871,6 +874,7 @@
 .#{$ionicons-prefix}ios7-rewind-outline:before { content: $ionicon-var-ios7-rewind-outline; }
 .#{$ionicons-prefix}ios7-search:before { content: $ionicon-var-ios7-search; }
 .#{$ionicons-prefix}ios7-search-strong:before { content: $ionicon-var-ios7-search-strong; }
+.#{$ionicons-prefix}ios7-shrink:before { content: $ionicon-var-ios7-shrink; }
 .#{$ionicons-prefix}ios7-skipbackward:before { content: $ionicon-var-ios7-skipbackward; }
 .#{$ionicons-prefix}ios7-skipbackward-outline:before { content: $ionicon-var-ios7-skipbackward-outline; }
 .#{$ionicons-prefix}ios7-skipforward:before { content: $ionicon-var-ios7-skipforward; }

diff --git a/scss/_ionicons-variables.scss b/scss/_ionicons-variables.scss
@@ -255,6 +255,7 @@ $ionicon-var-ios7-download-outline: "\f183";
 $ionicon-var-ios7-drag: "\f185";
 $ionicon-var-ios7-email: "\f187";
 $ionicon-var-ios7-email-outline: "\f186";
+$ionicon-var-ios7-expand: "\f30d";
 $ionicon-var-ios7-eye: "\f189";
 $ionicon-var-ios7-eye-outline: "\f188";
 $ionicon-var-ios7-fastforward: "\f18b";
@@ -347,6 +348,7 @@ $ionicon-var-ios7-rewind: "\f1d8";
 $ionicon-var-ios7-rewind-outline: "\f1d7";
 $ionicon-var-ios7-search: "\f1da";
 $ionicon-var-ios7-search-strong: "\f1d9";
+$ionicon-var-ios7-shrink: "\f30e";
 $ionicon-var-ios7-skipbackward: "\f1dc";
 $ionicon-var-ios7-skipbackward-outline: "\f1db";
 $ionicon-var-ios7-skipforward: "\f1de";