Jelajahi Sumber

updating docs for 3.2.1, adding site.fontawesome.minor_version jekyll variable as a hack for now

davegandy 12 tahun lalu
induk
melakukan
9c8f62ac70

+ 3 - 2
README.md

@@ -1,7 +1,7 @@
-#[Font Awesome v3.2.0](http://fontawesome.io)
+#[Font Awesome v3.2.1](http://fontawesome.io)
 ###the iconic font designed for Bootstrap
 
-Font Awesome is a full suite of 302 pictographic icons for easy scalable vector graphics on websites, created and
+Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
 maintained by [Dave Gandy](http://twitter.com/byscuits). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 
 Get started at http://fontawesome.io!
@@ -24,6 +24,7 @@ Get started at http://fontawesome.io!
 - v3.1.0 - Added 54 icons, icon stacking styles, flipping and rotating icons, removed SASS support
 - [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
 - [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
+- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)
 
 ##Versioning
 

+ 2 - 1
_config.yml

@@ -19,7 +19,8 @@ icon_layout:      icon.html    # Relative to _layouts directory
 icon_destination: icon         # Relative to destination
 
 fontawesome:
-  version:        3.2.0
+  version:        3.2.1
+  minor_version:  3.2
   url:            http://fontawesome.io
   legacy_url:     http://fortawesome.github.com/Font-Awesome/
   blog_url:       http://blog.fontawesome.io

+ 1 - 1
css/font-awesome-ie7.css

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be

+ 3 - 3
css/font-awesome.css

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be
@@ -27,8 +27,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/fontawesome-webfont.eot?v=3.2.0');
-  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');
+  src: url('../font/fontawesome-webfont.eot?v=3.2.1');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
   font-weight: normal;
   font-style: normal;
 }

+ 1 - 1
css/font-awesome.min.css

@@ -1,4 +1,4 @@
-@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
+@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
 [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;cursor:default;speak:none;}
 .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
 a [class^="icon-"],a [class*=" icon-"]{display:inline;}

+ 1 - 1
less/font-awesome-ie7.less

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be

+ 1 - 1
less/font-awesome.less

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be

+ 2 - 2
less/variables.less

@@ -2,8 +2,8 @@
 // --------------------------
 
 @FontAwesomePath:    "../font";
-//@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/3.2.0/font"; // for referencing Bootstrap CDN font files directly
-@FontAwesomeVersion: "3.2.0";
+//@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly
+@FontAwesomeVersion: "3.2.1";
 @borderColor:        #eee;
 @iconMuted:          #eee;
 @iconLight:          #fff;

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "font-awesome",
   "description": "The iconic font designed for Bootstrap",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
   "homepage": "http://fontawesome.io/",
   "author": {

+ 1 - 1
scss/_variables.scss

@@ -2,7 +2,7 @@
 // --------------------------
 
 $FontAwesomePath: "../font" !default;
-$FontAwesomeVersion: "3.2.0" !default;
+$FontAwesomeVersion: "3.2.1" !default;
 $borderColor: #eeeeee !default;
 $iconMuted: #eeeeee !default;
 $iconLight: white !default;

+ 1 - 1
scss/font-awesome-ie7.scss

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be

+ 1 - 1
scss/font-awesome.scss

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 3.2.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
  *  ------------------------------------------------------------------------------
  *  The full suite of pictographic icons, examples, and documentation can be

+ 1 - 1
src/_includes/examples/new.html

@@ -1,5 +1,5 @@
 <{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles">
-  <h2 class="page-header">New Styles in {{ site.fontawesome.version }}</h2>
+  <h2 class="page-header">New Styles in {{ site.fontawesome.minor_version }}</h2>
   <div class="row">
     <div class="span4">
       <h4><a href="#rotated-flipped">Rotated and Flipped Icons</a></h4>

+ 1 - 1
src/_includes/icons.html

@@ -1,6 +1,6 @@
 {% capture stripe_ad_content %}
 <p class="lead">
-  You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.version | size }} shiny new icons in version {{ site.fontawesome.version }}.
+  You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.
   Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
   <!--The ever-expanding list of Font Awesome {{ site.fontawesome.version }} icons.-->
   Need vectors or want to use on the desktop? Check the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.

+ 3 - 3
src/_includes/icons/new.html

@@ -1,14 +1,14 @@
 <{% if page.navbar_active == "icons" %}div{% else %}section{% endif %} id="new">
-  <h2 class="page-header">New Icons in {{ site.fontawesome.version }}</h2>
+  <h2 class="page-header">New Icons in {{ site.fontawesome.minor_version }}</h2>
   {% if page.navbar_active != "icons" %}
     <div class="margin-botom-large">
-      You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.version | size }} shiny new icons in version {{ site.fontawesome.version }}.
+      You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.
       Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
     </div>
   {% endif %}
 
   <div class="row the-icons">
-    {% assign icons_new = icons | expand_aliases | version:site.fontawesome.version %}
+    {% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version %}
 
     {% for icon in icons_new %}
       <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.class }}"></i> icon-{{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>

+ 3 - 3
src/_includes/whats-new.html

@@ -1,7 +1,7 @@
 {% capture stripe_ad_content %}
 <p class="lead">
   Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome
-  {{ site.fontawesome.version }}. Have some ideas for new features?
+  {{ site.fontawesome.minor_version }}. Have some ideas for new features?
   <a href="{{ page.relative_path }}community/">Help contribute</a>.
 </p>
 {% endcapture %}
@@ -10,7 +10,7 @@
 <div id="whats-new">
   <div class="row">
     <div class="span4">
-      <h4><i class="icon-lightbulb"></i> {{ icons | version:site.fontawesome.version | size }} New Icons in {{ site.fontawesome.version }}</h4>
+      <h4><i class="icon-lightbulb"></i> {{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}</h4>
       Requested by the active community on the <a href="{{ site.fontawesome.github.url }}">Font Awesome GitHub project</a>.
     </div>
     <div class="span4">
@@ -26,7 +26,7 @@
     </div>
     <div class="span4 margin-bottom-large">
       <h4><i class="icon-magic"></i> Pixel Perfection at 14px</h4>
-      Version 3.0 was re-created from the ground up to be razor sharp at Bootstrap's default 14px.
+      Version 3 was re-created from the ground up to be razor sharp at Bootstrap's default 14px.
     </div>
     <div class="span4">
       <h4><i class="icon-th-large"></i> <a href="http://icnfnt.com/">Font Subsetting</a></h4>

File diff ditekan karena terlalu besar
+ 135 - 135
src/icons.yml


+ 1 - 1
src/whats-new.html

@@ -5,7 +5,7 @@ navbar_active: whats-new
 relative_path: ../
 ---
 {% capture jumbotron_h1 %}<i class="icon-lightbulb icon-large"></i>&nbsp; What's New{% endcapture %}
-{% capture jumbotron_p %}What's New in the latest version &mdash; Font Awesome {{ site.fontawesome.version }}{% endcapture %}
+{% capture jumbotron_p %}What's New in the latest version &mdash; Font Awesome {{ site.fontawesome.minor_version }}{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini