do not auto-width animated icons

startupsco · Nov 15, 2013 · 560be6a · 560be6a
1 parent aa72d6f
commit 560be6a
Show file tree

Hide file tree

Showing 13 changed files with 281 additions and 254 deletions.
diff --git a/bower.json b/bower.json
@@ -7,7 +7,7 @@
         "test",
         "tests"
     ],
-    "version": "1.3.4",
+    "version": "1.3.5",
     "name": "Ionicons",
     "license": "MIT",
     "authors": [

diff --git a/builder/build_data.json b/builder/build_data.json
@@ -1,7 +1,7 @@
 {
-  "build_hash": "283bffe80f9777d67627afcd6d170661",
+  "build_hash": "6720df1d45ed6c6639c66a398bfbea55",
   "prefix": "ion-",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "name": "Ionicons",
   "icons": [
     {

diff --git a/builder/manifest.json b/builder/manifest.json
@@ -1,7 +1,7 @@
 {
-  "build_hash": "6720df1d45ed6c6639c66a398bfbea55",
+  "build_hash": "12febfa8c61b7232a63eed40ea673d0d",
   "prefix": "ion-",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "name": "Ionicons",
   "icons": [
     {

diff --git a/builder/scripts/generate_font.py b/builder/scripts/generate_font.py
@@ -13,6 +13,7 @@
 BUILD_DATA_PATH = os.path.join(SCRIPT_PATH, '..', 'build_data.json')
 AUTO_WIDTH = True
 KERNING = 15
+STANDARD_WIDTH_ICONS = ['refresh', 'ios7-reload', 'load-a', 'load-b', 'load-c', 'load-d', 'loop']
 
 cp = 0xf100
 m = md5.new()
@@ -107,11 +108,12 @@
         os.unlink(tmpsvgfile.name)
 
       # set glyph size explicitly or automatically depending on autowidth
-      if AUTO_WIDTH:
+      if AUTO_WIDTH and name not in STANDARD_WIDTH_ICONS:
         glyph.left_side_bearing = glyph.right_side_bearing = 0
         glyph.round()
       else:
         # force a manual size when autowidth is disabled
+        print " - Standard Width: %s" % (name)
         glyph.width = 512
 
     # resize glyphs if autowidth is enabled

diff --git a/cheatsheet.html b/cheatsheet.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Ionicons v1.3.4 Cheatsheet</title>
+  <title>Ionicons v1.3.5 Cheatsheet</title>
   <style>
     * {
       -moz-box-sizing: border-box;
@@ -142,7 +142,7 @@
 <body>
   <div class="container">
     <header>
-      <h1>Ionicons v1.3.4 Cheatsheet, 446 icons:</h1>
+      <h1>Ionicons v1.3.5 Cheatsheet, 446 icons:</h1>
       <p><a href="http://ionicons.com/">Ionicons Homepage</a></p>
     </header>
     <div class="content">

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
     "repo": "driftyco/ionicons",
     "development": {},
-    "version": "1.3.4",
+    "version": "1.3.5",
     "styles": [
         "css/ionicons.css"
     ],

diff --git a/css/ionicons.css b/css/ionicons.css
@@ -1,13 +1,13 @@
-/*!
-  Ionicons, v1.3.4
+/*
+  Ionicons, v1.3.5
   Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
   https://twitter.com/helloimben  https://twitter.com/ionicframework
   MIT License: https://github.com/driftyco/ionicons
 */
 @font-face {
   font-family: "Ionicons";
-  src: url("../fonts/ionicons.eot?v=1.3.4");
-  src: url("../fonts/ionicons.eot?v=1.3.4#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.3.4") format("truetype"), url("../fonts/ionicons.woff?v=1.3.4") format("woff"), url("../fonts/ionicons.svg?v=1.3.4#Ionicons") format("svg");
+  src: url("../fonts/ionicons.eot?v=1.3.5");
+  src: url("../fonts/ionicons.eot?v=1.3.5#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=1.3.5") format("truetype"), url("../fonts/ionicons.woff?v=1.3.5") format("woff"), url("../fonts/ionicons.svg?v=1.3.5#Ionicons") format("svg");
   font-weight: normal;
   font-style: normal; }
 

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-variables.scss b/scss/_ionicons-variables.scss
@@ -3,7 +3,7 @@
 
 $ionicons-font-path: "../fonts" !default;
 $ionicons-font-family: "Ionicons" !default;
-$ionicons-version: "1.3.4" !default;
+$ionicons-version: "1.3.5" !default;
 $ionicons-prefix: ion- !default;
 
 $ionicon-var-alert: "\f101";