瀏覽代碼

#940 collapse, collapse-top, expand, aliases for paperclip and unchecked

davegandy 12 年之前
父節點
當前提交
24dd7e1b80

+ 1 - 1
_config.yml

@@ -16,7 +16,7 @@ icon_layout:      icon.html    # Relative to _layouts directory
 icon_destination: icon         # Relative to destination
 
 font_awesome:
-  version:        3.1.0
+  version:        3.2.0
   url:            http://fontawesome.io
   legacy_url:     http://fortawesome.github.com/Font-Awesome/
   twitter:        fontawesome

+ 1 - 1
build/_includes/jumbotron-slider.html

@@ -13,7 +13,7 @@
             </a>
           </div>
           <div class="shameless-self-promotion">
-            <a href="{{ site.font_awesome.github.url }}" target="_blank"
+            <a href="{{ site.font_awesome.github.url }}"
                onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
               GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
             Version {{ site.font_awesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;

+ 15 - 0
build/assets/font-awesome/css/font-awesome.css

@@ -1263,6 +1263,15 @@ ul.icons-ul > li .icon-li {
 .icon-share-sign:before {
   content: "\f14d";
 }
+.icon-collapse:before {
+  content: "\f150";
+}
+.icon-collapse-top:before {
+  content: "\f151";
+}
+.icon-expand:before {
+  content: "\f152";
+}
 .icon-power-off:before {
   content: "\f011";
 }
@@ -1281,3 +1290,9 @@ ul.icons-ul > li .icon-li {
 .icon-star-half-full:before {
   content: "\f123";
 }
+.icon-unchecked:before {
+  content: "\f096";
+}
+.icon-paperclip:before {
+  content: "\f0c6";
+}

二進制
build/assets/font-awesome/font/FontAwesome.otf


+ 6 - 0
build/assets/font-awesome/less/icons.less

@@ -326,6 +326,10 @@
 .icon-external-link-sign:before   { content: @icon-external-link-sign; }
 .icon-share-sign:before           { content: @icon-share-sign; }
 
+.icon-collapse:before             { content: @icon-collapse; }
+.icon-collapse-top:before         { content: @icon-collapse-top; }
+.icon-expand:before               { content: @icon-expand; }
+
 
 // aliases
 .icon-power-off:before            { content: @icon-off; }
@@ -334,3 +338,5 @@
 .icon-rotate-left:before          { content: @icon-undo; }
 .icon-mail-reply:before           { content: @icon-reply; }
 .icon-star-half-full:before       { content: @icon-star-half-empty; }
+.icon-unchecked:before            { content: @icon-check-empty; }
+.icon-paperclip:before            { content: @icon-paper-clip; }

+ 4 - 0
build/assets/font-awesome/less/variables.less

@@ -334,3 +334,7 @@
 @icon-edit-sign: "\f14b";
 @icon-external-link-sign: "\f14c";
 @icon-share-sign: "\f14d";
+
+@icon-collapse: "\f150";
+@icon-collapse-top: "\f151";
+@icon-expand: "\f152";

+ 26 - 0
build/icons.yml

@@ -1005,6 +1005,8 @@ icons:
     id:         check-empty
     unicode:    f096
     created:    2.0.0
+    aliases:
+      - unchecked
     categories:
       - Web Application Icons
 
@@ -1239,6 +1241,8 @@ icons:
     id:         paper-clip
     unicode:    f0c6
     created:    2.0.0
+    aliases:
+      - paperclip
     categories:
       - Text Editor Icons
 
@@ -2153,3 +2157,25 @@ icons:
     created:    3.1.0
     categories:
       - Web Application Icons
+
+
+  - name:       Collapse
+    id:         collapse
+    unicode:    f150
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Collapse Top
+    id:         collapse-top
+    unicode:    f151
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Expand
+    id:         expand
+    unicode:    f152
+    created:    3.2.0
+    categories:
+      - Web Application Icons