Browse Source

adding pie-chart, area-chart, and line-chart #171

Dave Gandy 11 năm trước cách đây
mục cha
commit
9baa10591a

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 #[Font Awesome v4.2.0](http://fontawesome.io)
 #[Font Awesome v4.2.0](http://fontawesome.io)
 ###The iconic font and CSS framework
 ###The iconic font and CSS framework
 
 
-Font Awesome is a full suite of 465 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 468 pictographic icons for easy scalable vector graphics on websites,
 created and maintained by [Dave Gandy](http://twitter.com/davegandy).
 created and maintained by [Dave Gandy](http://twitter.com/davegandy).
 Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 
 

+ 11 - 1
css/font-awesome.css

@@ -532,7 +532,8 @@
 .fa-arrows-h:before {
 .fa-arrows-h:before {
   content: "\f07e";
   content: "\f07e";
 }
 }
-.fa-bar-chart-o:before {
+.fa-bar-chart-o:before,
+.fa-bar-chart:before {
   content: "\f080";
   content: "\f080";
 }
 }
 .fa-twitter-square:before {
 .fa-twitter-square:before {
@@ -1624,3 +1625,12 @@
 .fa-birthday-cake:before {
 .fa-birthday-cake:before {
   content: "\f1fd";
   content: "\f1fd";
 }
 }
+.fa-area-chart:before {
+  content: "\f1fe";
+}
+.fa-pie-chart:before {
+  content: "\f200";
+}
+.fa-line-chart:before {
+  content: "\f201";
+}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
css/font-awesome.min.css


BIN
fonts/FontAwesome.otf


+ 5 - 1
less/icons.less

@@ -131,7 +131,8 @@
 .@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
 .@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
 .@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
 .@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
 .@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
 .@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
-.@{fa-css-prefix}-bar-chart-o:before { content: @fa-var-bar-chart-o; }
+.@{fa-css-prefix}-bar-chart-o:before,
+.@{fa-css-prefix}-bar-chart:before { content: @fa-var-bar-chart; }
 .@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
 .@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
 .@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
 .@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
 .@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; }
 .@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; }
@@ -533,3 +534,6 @@
 .@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; }
 .@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; }
 .@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; }
 .@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; }
 .@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; }
 .@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; }
+.@{fa-css-prefix}-area-chart:before { content: @fa-var-area-chart; }
+.@{fa-css-prefix}-pie-chart:before { content: @fa-var-pie-chart; }
+.@{fa-css-prefix}-line-chart:before { content: @fa-var-line-chart; }

+ 4 - 0
less/variables.less

@@ -28,6 +28,7 @@
 @fa-var-angle-up: "\f106";
 @fa-var-angle-up: "\f106";
 @fa-var-apple: "\f179";
 @fa-var-apple: "\f179";
 @fa-var-archive: "\f187";
 @fa-var-archive: "\f187";
+@fa-var-area-chart: "\f1fe";
 @fa-var-arrow-circle-down: "\f0ab";
 @fa-var-arrow-circle-down: "\f0ab";
 @fa-var-arrow-circle-left: "\f0a8";
 @fa-var-arrow-circle-left: "\f0a8";
 @fa-var-arrow-circle-o-down: "\f01a";
 @fa-var-arrow-circle-o-down: "\f01a";
@@ -50,6 +51,7 @@
 @fa-var-backward: "\f04a";
 @fa-var-backward: "\f04a";
 @fa-var-ban: "\f05e";
 @fa-var-ban: "\f05e";
 @fa-var-bank: "\f19c";
 @fa-var-bank: "\f19c";
+@fa-var-bar-chart: "\f080";
 @fa-var-bar-chart-o: "\f080";
 @fa-var-bar-chart-o: "\f080";
 @fa-var-barcode: "\f02a";
 @fa-var-barcode: "\f02a";
 @fa-var-bars: "\f0c9";
 @fa-var-bars: "\f0c9";
@@ -293,6 +295,7 @@
 @fa-var-life-ring: "\f1cd";
 @fa-var-life-ring: "\f1cd";
 @fa-var-life-saver: "\f1cd";
 @fa-var-life-saver: "\f1cd";
 @fa-var-lightbulb-o: "\f0eb";
 @fa-var-lightbulb-o: "\f0eb";
+@fa-var-line-chart: "\f201";
 @fa-var-link: "\f0c1";
 @fa-var-link: "\f0c1";
 @fa-var-linkedin: "\f0e1";
 @fa-var-linkedin: "\f0e1";
 @fa-var-linkedin-square: "\f08c";
 @fa-var-linkedin-square: "\f08c";
@@ -350,6 +353,7 @@
 @fa-var-phone-square: "\f098";
 @fa-var-phone-square: "\f098";
 @fa-var-photo: "\f03e";
 @fa-var-photo: "\f03e";
 @fa-var-picture-o: "\f03e";
 @fa-var-picture-o: "\f03e";
+@fa-var-pie-chart: "\f200";
 @fa-var-pied-piper: "\f1a7";
 @fa-var-pied-piper: "\f1a7";
 @fa-var-pied-piper-alt: "\f1a8";
 @fa-var-pied-piper-alt: "\f1a8";
 @fa-var-pinterest: "\f0d2";
 @fa-var-pinterest: "\f0d2";

+ 5 - 1
scss/_icons.scss

@@ -131,7 +131,8 @@
 .#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; }
 .#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; }
 .#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; }
 .#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; }
 .#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; }
 .#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; }
-.#{$fa-css-prefix}-bar-chart-o:before { content: $fa-var-bar-chart-o; }
+.#{$fa-css-prefix}-bar-chart-o:before,
+.#{$fa-css-prefix}-bar-chart:before { content: $fa-var-bar-chart; }
 .#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; }
 .#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; }
 .#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; }
 .#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; }
 .#{$fa-css-prefix}-camera-retro:before { content: $fa-var-camera-retro; }
 .#{$fa-css-prefix}-camera-retro:before { content: $fa-var-camera-retro; }
@@ -533,3 +534,6 @@
 .#{$fa-css-prefix}-eyedropper:before { content: $fa-var-eyedropper; }
 .#{$fa-css-prefix}-eyedropper:before { content: $fa-var-eyedropper; }
 .#{$fa-css-prefix}-paint-brush:before { content: $fa-var-paint-brush; }
 .#{$fa-css-prefix}-paint-brush:before { content: $fa-var-paint-brush; }
 .#{$fa-css-prefix}-birthday-cake:before { content: $fa-var-birthday-cake; }
 .#{$fa-css-prefix}-birthday-cake:before { content: $fa-var-birthday-cake; }
+.#{$fa-css-prefix}-area-chart:before { content: $fa-var-area-chart; }
+.#{$fa-css-prefix}-pie-chart:before { content: $fa-var-pie-chart; }
+.#{$fa-css-prefix}-line-chart:before { content: $fa-var-line-chart; }

+ 4 - 0
scss/_variables.scss

@@ -28,6 +28,7 @@ $fa-var-angle-right: "\f105";
 $fa-var-angle-up: "\f106";
 $fa-var-angle-up: "\f106";
 $fa-var-apple: "\f179";
 $fa-var-apple: "\f179";
 $fa-var-archive: "\f187";
 $fa-var-archive: "\f187";
+$fa-var-area-chart: "\f1fe";
 $fa-var-arrow-circle-down: "\f0ab";
 $fa-var-arrow-circle-down: "\f0ab";
 $fa-var-arrow-circle-left: "\f0a8";
 $fa-var-arrow-circle-left: "\f0a8";
 $fa-var-arrow-circle-o-down: "\f01a";
 $fa-var-arrow-circle-o-down: "\f01a";
@@ -50,6 +51,7 @@ $fa-var-automobile: "\f1b9";
 $fa-var-backward: "\f04a";
 $fa-var-backward: "\f04a";
 $fa-var-ban: "\f05e";
 $fa-var-ban: "\f05e";
 $fa-var-bank: "\f19c";
 $fa-var-bank: "\f19c";
+$fa-var-bar-chart: "\f080";
 $fa-var-bar-chart-o: "\f080";
 $fa-var-bar-chart-o: "\f080";
 $fa-var-barcode: "\f02a";
 $fa-var-barcode: "\f02a";
 $fa-var-bars: "\f0c9";
 $fa-var-bars: "\f0c9";
@@ -293,6 +295,7 @@ $fa-var-life-buoy: "\f1cd";
 $fa-var-life-ring: "\f1cd";
 $fa-var-life-ring: "\f1cd";
 $fa-var-life-saver: "\f1cd";
 $fa-var-life-saver: "\f1cd";
 $fa-var-lightbulb-o: "\f0eb";
 $fa-var-lightbulb-o: "\f0eb";
+$fa-var-line-chart: "\f201";
 $fa-var-link: "\f0c1";
 $fa-var-link: "\f0c1";
 $fa-var-linkedin: "\f0e1";
 $fa-var-linkedin: "\f0e1";
 $fa-var-linkedin-square: "\f08c";
 $fa-var-linkedin-square: "\f08c";
@@ -350,6 +353,7 @@ $fa-var-phone: "\f095";
 $fa-var-phone-square: "\f098";
 $fa-var-phone-square: "\f098";
 $fa-var-photo: "\f03e";
 $fa-var-photo: "\f03e";
 $fa-var-picture-o: "\f03e";
 $fa-var-picture-o: "\f03e";
+$fa-var-pie-chart: "\f200";
 $fa-var-pied-piper: "\f1a7";
 $fa-var-pied-piper: "\f1a7";
 $fa-var-pied-piper-alt: "\f1a8";
 $fa-var-pied-piper-alt: "\f1a8";
 $fa-var-pinterest: "\f0d2";
 $fa-var-pinterest: "\f0d2";

+ 12 - 0
src/_includes/icons/chart.html

@@ -0,0 +1,12 @@
+<section id="chart">
+  <h2 class="page-header">Chart Icons</h2>
+
+  <div class="row fontawesome-icon-list">
+    {% assign icons_chart = icons | expand_aliases | category:"Chart Icons" | sort_by:'class' %}
+
+    {% for icon in icons_chart %}
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+    {% endfor %}
+  </div>
+
+</section>

+ 2 - 2
src/_includes/icons/payment.html

@@ -2,9 +2,9 @@
   <h2 class="page-header">Payment Icons</h2>
   <h2 class="page-header">Payment Icons</h2>
 
 
   <div class="row fontawesome-icon-list">
   <div class="row fontawesome-icon-list">
-    {% assign icons_currency = icons | expand_aliases | category:"Payment Icons" | sort_by:'class' %}
+    {% assign icons_payment = icons | expand_aliases | category:"Payment Icons" | sort_by:'class' %}
 
 
-    {% for icon in icons_currency %}
+    {% for icon in icons_payment %}
       <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
       <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
     {% endfor %}
   </div>
   </div>

+ 1 - 0
src/_includes/navbar.html

@@ -32,6 +32,7 @@
             <li><a href="{{ page.relative_path }}icons/#spinner"><i class="fa fa-spinner fa-fw"></i>&nbsp; Spinner Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#spinner"><i class="fa fa-spinner fa-fw"></i>&nbsp; Spinner Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#form-control"><i class="fa fa-check-square fa-fw"></i>&nbsp; Form Control Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#form-control"><i class="fa fa-check-square fa-fw"></i>&nbsp; Form Control Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#payment"><i class="fa fa-credit-card fa-fw"></i>&nbsp; Payment Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#payment"><i class="fa fa-credit-card fa-fw"></i>&nbsp; Payment Icons</a></li>
+            <li><a href="{{ page.relative_path }}icons/#chart"><i class="fa fa-pie-chart fa-fw"></i>&nbsp; Chart Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#currency"><i class="fa fa-won fa-fw"></i>&nbsp; Currency Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#currency"><i class="fa fa-won fa-fw"></i>&nbsp; Currency Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa fa-file-text-o fa-fw"></i>&nbsp; Text Editor Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa fa-file-text-o fa-fw"></i>&nbsp; Text Editor Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#directional"><i class="fa fa-hand-o-right fa-fw"></i>&nbsp; Directional Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#directional"><i class="fa fa-hand-o-right fa-fw"></i>&nbsp; Directional Icons</a></li>

BIN
src/assets/font-awesome/fonts/FontAwesome.otf


+ 1 - 0
src/icons.html

@@ -27,6 +27,7 @@ relative_path: ../
   {% include icons/spinner.html %}
   {% include icons/spinner.html %}
   {% include icons/form-control.html %}
   {% include icons/form-control.html %}
   {% include icons/payment.html %}
   {% include icons/payment.html %}
+  {% include icons/chart.html %}
   {% include icons/currency.html %}
   {% include icons/currency.html %}
   {% include icons/text-editor.html %}
   {% include icons/text-editor.html %}
   {% include icons/directional.html %}
   {% include icons/directional.html %}

+ 30 - 2
src/icons.yml

@@ -872,12 +872,15 @@ icons:
       - Directional Icons
       - Directional Icons
 
 
 
 
-  - name:       Bar Chart Outlined
-    id:         bar-chart-o
+  - name:       Bar Chart
+    id:         bar-chart
     unicode:    f080
     unicode:    f080
     created:    1.0
     created:    1.0
+    aliases:
+      - bar-chart-o
     categories:
     categories:
       - Web Application Icons
       - Web Application Icons
+      - Chart Icons
 
 
   - name:       Twitter Square
   - name:       Twitter Square
     id:         twitter-square
     id:         twitter-square
@@ -3462,3 +3465,28 @@ icons:
     created:    4.2
     created:    4.2
     categories:
     categories:
       - Web Application Icons
       - Web Application Icons
+
+  - name:       Area Chart
+    id:         area-chart
+    unicode:    f1fe
+    created:    4.2
+    categories:
+      - Web Application Icons
+      - Chart Icons
+
+
+  - name:       Pie Chart
+    id:         pie-chart
+    unicode:    f200
+    created:    4.2
+    categories:
+      - Web Application Icons
+      - Chart Icons
+
+  - name:       Line Chart
+    id:         line-chart
+    unicode:    f201
+    created:    4.2
+    categories:
+      - Web Application Icons
+      - Chart Icons

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác