Skip to content

Commit

Permalink
update font-awesome to v4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Minwe committed Nov 13, 2015
1 parent 7963993 commit 2db4511
Show file tree
Hide file tree
Showing 10 changed files with 577 additions and 47 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Amaze UI Change Log
---

### 2015.11 W2

**CSS:**

- `Update` 升级 Font Awesome 至 4.4.0。


### 2015.11 W1

**文档：**
Expand Down
124 changes: 108 additions & 16 deletions docs/css/icon.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,24 +82,24 @@ __LESS 用户__可以调用 mixin 编写样式：
- `.am-danger`

`````html
<a href="" class="am-icon-btn am-icon-twitter"></a>
<a href="" class="am-icon-btn am-icon-facebook"></a>
<a href="" class="am-icon-btn am-icon-github"></a>
<a href="" class="am-icon-btn am-primary am-icon-qq"></a>
<a href="" class="am-icon-btn am-secondary am-icon-drupal"></a>
<a href="" class="am-icon-btn am-success am-icon-shield"></a>
<a href="" class="am-icon-btn am-warning am-icon-warning"></a>
<a href="" class="am-icon-btn am-danger am-icon-youtube"></a>
<a href="##" class="am-icon-btn am-icon-twitter"></a>
<a href="##" class="am-icon-btn am-icon-facebook"></a>
<a href="##" class="am-icon-btn am-icon-github"></a>
<a href="##" class="am-icon-btn am-primary am-icon-qq"></a>
<a href="##" class="am-icon-btn am-secondary am-icon-drupal"></a>
<a href="##" class="am-icon-btn am-success am-icon-shield"></a>
<a href="##" class="am-icon-btn am-warning am-icon-warning"></a>
<a href="##" class="am-icon-btn am-danger am-icon-youtube"></a>
`````
```html
<a href="" class="am-icon-btn am-icon-twitter"></a>
<a href="" class="am-icon-btn am-icon-facebook"></a>
<a href="" class="am-icon-btn am-icon-github"></a>
<a href="" class="am-icon-btn am-primary am-icon-qq"></a>
<a href="" class="am-icon-btn am-secondary am-icon-drupal"></a>
<a href="" class="am-icon-btn am-success am-icon-shield"></a>
<a href="" class="am-icon-btn am-warning am-icon-warning"></a>
<a href="" class="am-icon-btn am-danger am-icon-youtube"></a>
<a href="##" class="am-icon-btn am-icon-twitter"></a>
<a href="##" class="am-icon-btn am-icon-facebook"></a>
<a href="##" class="am-icon-btn am-icon-github"></a>
<a href="##" class="am-icon-btn am-primary am-icon-qq"></a>
<a href="##" class="am-icon-btn am-secondary am-icon-drupal"></a>
<a href="##" class="am-icon-btn am-success am-icon-shield"></a>
<a href="##" class="am-icon-btn am-warning am-icon-warning"></a>
<a href="##" class="am-icon-btn am-danger am-icon-youtube"></a>
```

## 旋转动画
Expand Down Expand Up @@ -143,6 +143,14 @@ FontAwesome 在绘制图标的时候不同图标宽度有差异， 添加 `.am-i
<li><i class="am-icon-cc-amex am-icon-fw"></i> Amex</li>
</ul>
`````
```html
<ul>
<li><i class="am-icon-qq am-icon-fw"></i> QQ</li>
<li><i class="am-icon-skype am-icon-fw"></i> Skype</li>
<li><i class="am-icon-github am-icon-fw"></i> GitHub</li>
<li><i class="am-icon-cc-amex am-icon-fw"></i> Amex</li>
</ul>
```


## 复制图标
Expand Down Expand Up @@ -200,6 +208,90 @@ Amaze UI 的定位是面向现代浏览器，虽然对 IE 8/9 这些浏览器提
## 所有图标列表

`````html
<section id="new-4-4">
<h2 class="doc-icon-hd">Font Awesome 4.4 新增字体（Amaze UI 2.5 中搭载） </h2>
<ul class="doc-icon-list am-avg-sm-2 am-avg-md-3 am-avg-lg-4">
<li><a href="http://font-awesome.io"/icon/500px"><i class="am-icon-500px"></i> 500px</a></li>
<li><a href="http://font-awesome.io/icon/amazon"><i class="am-icon-amazon"></i> amazon</a></li>
<li><a href="http://font-awesome.io/icon/balance-scale"><i class="am-icon-balance-scale"></i> balance-scale</a></li>
<li><a href="http://font-awesome.io/icon/battery-empty"><i class="am-icon-battery-0"></i> battery-0 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/battery-quarter"><i class="am-icon-battery-1"></i> battery-1 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/battery-half"><i class="am-icon-battery-2"></i> battery-2 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/battery-three-quarters"><i class="am-icon-battery-3"></i> battery-3 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/battery-full"><i class="am-icon-battery-4"></i> battery-4 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/battery-empty"><i class="am-icon-battery-empty"></i> battery-empty</a></li>
<li><a href="http://font-awesome.io/icon/battery-full"><i class="am-icon-battery-full"></i> battery-full</a></li>
<li><a href="http://font-awesome.io/icon/battery-half"><i class="am-icon-battery-half"></i> battery-half</a></li>
<li><a href="http://font-awesome.io/icon/battery-quarter"><i class="am-icon-battery-quarter"></i> battery-quarter</a></li>
<li><a href="http://font-awesome.io/icon/battery-three-quarters"><i class="am-icon-battery-three-quarters"></i> battery-three-quarters</a></li>
<li><a href="http://font-awesome.io/icon/black-tie"><i class="am-icon-black-tie"></i> black-tie</a></li>
<li><a href="http://font-awesome.io/icon/calendar-check-o"><i class="am-icon-calendar-check-o"></i> calendar-check-o</a></li>
<li><a href="http://font-awesome.io/icon/calendar-minus-o"><i class="am-icon-calendar-minus-o"></i> calendar-minus-o</a></li>
<li><a href="http://font-awesome.io/icon/calendar-plus-o"><i class="am-icon-calendar-plus-o"></i> calendar-plus-o</a></li>
<li><a href="http://font-awesome.io/icon/calendar-times-o"><i class="am-icon-calendar-times-o"></i> calendar-times-o</a></li>
<li><a href="http://font-awesome.io/icon/cc-diners-club"><i class="am-icon-cc-diners-club"></i> cc-diners-club</a></li>
<li><a href="http://font-awesome.io/icon/cc-jcb"><i class="am-icon-cc-jcb"></i> cc-jcb</a></li>
<li><a href="http://font-awesome.io/icon/chrome"><i class="am-icon-chrome"></i> chrome</a></li>
<li><a href="http://font-awesome.io/icon/clone"><i class="am-icon-clone"></i> clone</a></li>
<li><a href="http://font-awesome.io/icon/commenting"><i class="am-icon-commenting"></i> commenting</a></li>
<li><a href="http://font-awesome.io/icon/commenting-o"><i class="am-icon-commenting-o"></i> commenting-o</a></li>
<li><a href="http://font-awesome.io/icon/contao"><i class="am-icon-contao"></i> contao</a></li>
<li><a href="http://font-awesome.io/icon/creative-commons"><i class="am-icon-creative-commons"></i> creative-commons</a></li>
<li><a href="http://font-awesome.io/icon/expeditedssl"><i class="am-icon-expeditedssl"></i> expeditedssl</a></li>
<li><a href="http://font-awesome.io/icon/firefox"><i class="am-icon-firefox"></i> firefox</a></li>
<li><a href="http://font-awesome.io/icon/fonticons"><i class="am-icon-fonticons"></i> fonticons</a></li>
<li><a href="http://font-awesome.io/icon/genderless"><i class="am-icon-genderless"></i> genderless</a></li>
<li><a href="http://font-awesome.io/icon/get-pocket"><i class="am-icon-get-pocket"></i> get-pocket</a></li>
<li><a href="http://font-awesome.io/icon/gg"><i class="am-icon-gg"></i> gg</a></li>
<li><a href="http://font-awesome.io/icon/gg-circle"><i class="am-icon-gg-circle"></i> gg-circle</a></li>
<li><a href="http://font-awesome.io/icon/hand-rock-o"><i class="am-icon-hand-grab-o"></i> hand-grab-o <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/hand-lizard-o"><i class="am-icon-hand-lizard-o"></i> hand-lizard-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-paper-o"><i class="am-icon-hand-paper-o"></i> hand-paper-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-peace-o"><i class="am-icon-hand-peace-o"></i> hand-peace-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-pointer-o"><i class="am-icon-hand-pointer-o"></i> hand-pointer-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-rock-o"><i class="am-icon-hand-rock-o"></i> hand-rock-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-scissors-o"><i class="am-icon-hand-scissors-o"></i> hand-scissors-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-spock-o"><i class="am-icon-hand-spock-o"></i> hand-spock-o</a></li>
<li><a href="http://font-awesome.io/icon/hand-paper-o"><i class="am-icon-hand-stop-o"></i> hand-stop-o <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/hourglass"><i class="am-icon-hourglass"></i> hourglass</a></li>
<li><a href="http://font-awesome.io/icon/hourglass-start"><i class="am-icon-hourglass-1"></i> hourglass-1 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/hourglass-half"><i class="am-icon-hourglass-2"></i> hourglass-2 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/hourglass-end"><i class="am-icon-hourglass-3"></i> hourglass-3 <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/hourglass-end"><i class="am-icon-hourglass-end"></i> hourglass-end</a></li>
<li><a href="http://font-awesome.io/icon/hourglass-half"><i class="am-icon-hourglass-half"></i> hourglass-half</a></li>
<li><a href="http://font-awesome.io/icon/hourglass-o"><i class="am-icon-hourglass-o"></i> hourglass-o</a></li>
<li><a href="http://font-awesome.io/icon/hourglass-start"><i class="am-icon-hourglass-start"></i> hourglass-start</a></li>
<li><a href="http://font-awesome.io/icon/houzz"><i class="am-icon-houzz"></i> houzz</a></li>
<li><a href="http://font-awesome.io/icon/i-cursor"><i class="am-icon-i-cursor"></i> i-cursor</a></li>
<li><a href="http://font-awesome.io/icon/industry"><i class="am-icon-industry"></i> industry</a></li>
<li><a href="http://font-awesome.io/icon/internet-explorer"><i class="am-icon-internet-explorer"></i> internet-explorer</a></li>
<li><a href="http://font-awesome.io/icon/map"><i class="am-icon-map"></i> map</a></li>
<li><a href="http://font-awesome.io/icon/map-o"><i class="am-icon-map-o"></i> map-o</a></li>
<li><a href="http://font-awesome.io/icon/map-pin"><i class="am-icon-map-pin"></i> map-pin</a></li>
<li><a href="http://font-awesome.io/icon/map-signs"><i class="am-icon-map-signs"></i> map-signs</a></li>
<li><a href="http://font-awesome.io/icon/mouse-pointer"><i class="am-icon-mouse-pointer"></i> mouse-pointer</a></li>
<li><a href="http://font-awesome.io/icon/object-group"><i class="am-icon-object-group"></i> object-group</a></li>
<li><a href="http://font-awesome.io/icon/object-ungroup"><i class="am-icon-object-ungroup"></i> object-ungroup</a></li>
<li><a href="http://font-awesome.io/icon/odnoklassniki"><i class="am-icon-odnoklassniki"></i> odnoklassniki</a></li>
<li><a href="http://font-awesome.io/icon/odnoklassniki-square"><i class="am-icon-odnoklassniki-square"></i> odnoklassniki-square</a></li>
<li><a href="http://font-awesome.io/icon/opencart"><i class="am-icon-opencart"></i> opencart</a></li>
<li><a href="http://font-awesome.io/icon/opera"><i class="am-icon-opera"></i> opera</a></li>
<li><a href="http://font-awesome.io/icon/optin-monster"><i class="am-icon-optin-monster"></i> optin-monster</a></li>
<li><a href="http://font-awesome.io/icon/registered"><i class="am-icon-registered"></i> registered</a></li>
<li><a href="http://font-awesome.io/icon/safari"><i class="am-icon-safari"></i> safari</a></li>
<li><a href="http://font-awesome.io/icon/sticky-note"><i class="am-icon-sticky-note"></i> sticky-note</a></li>
<li><a href="http://font-awesome.io/icon/sticky-note-o"><i class="am-icon-sticky-note-o"></i> sticky-note-o</a></li>
<li><a href="http://font-awesome.io/icon/television"><i class="am-icon-television"></i> television</a></li>
<li><a href="http://font-awesome.io/icon/trademark"><i class="am-icon-trademark"></i> trademark</a></li>
<li><a href="http://font-awesome.io/icon/tripadvisor"><i class="am-icon-tripadvisor"></i> tripadvisor</a></li>
<li><a href="http://font-awesome.io/icon/television"><i class="am-icon-tv"></i> tv <span class="text-muted">(alias)</span></a></li>
<li><a href="http://font-awesome.io/icon/vimeo"><i class="am-icon-vimeo"></i> vimeo</a></li>
<li><a href="http://font-awesome.io/icon/wikipedia-w"><i class="am-icon-wikipedia-w"></i> wikipedia-w</a></li>
<li><a href="http://font-awesome.io/icon/y-combinator"><i class="am-icon-y-combinator"></i> y-combinator</a></li>
<li><a href="http://font-awesome.io/icon/y-combinator"><i class="am-icon-yc"></i> yc <span class="text-muted">(alias)</span></a></li>
</ul>
</section>

<section id="new-4-3">
<h2 class="doc-icon-hd">Font Awesome 4.3 新增字体（Amaze UI 2.2 中搭载） </h2>
<ul class="doc-icon-list am-avg-sm-2 am-avg-md-3 am-avg-lg-4">
Expand Down
Binary file modified fonts/FontAwesome.otf
100644 → 100755
View file
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.eot
100644 → 100755
View file
Binary file not shown.
Loading

0 comments on commit 2db4511

Please sign in to comment.