2
0
Эх сурвалжийг харах

Adding gender category to navbar, making gender circles render the same #6394

Dave Gandy 10 жил өмнө
parent
commit
d752f6dd8f

+ 1 - 1
README.md

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

+ 3 - 1
css/font-awesome.css

@@ -1549,7 +1549,6 @@
 .fa-history:before {
   content: "\f1da";
 }
-.fa-genderless:before,
 .fa-circle-thin:before {
   content: "\f1db";
 }
@@ -1782,6 +1781,9 @@
 .fa-neuter:before {
   content: "\f22c";
 }
+.fa-genderless:before {
+  content: "\f22d";
+}
 .fa-facebook-official:before {
   content: "\f230";
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
css/font-awesome.min.css


BIN
fonts/FontAwesome.otf


+ 1 - 1
less/icons.less

@@ -505,7 +505,6 @@
 .@{fa-css-prefix}-send-o:before,
 .@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; }
 .@{fa-css-prefix}-history:before { content: @fa-var-history; }
-.@{fa-css-prefix}-genderless:before,
 .@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; }
 .@{fa-css-prefix}-header:before { content: @fa-var-header; }
 .@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; }
@@ -586,6 +585,7 @@
 .@{fa-css-prefix}-mars-stroke-v:before { content: @fa-var-mars-stroke-v; }
 .@{fa-css-prefix}-mars-stroke-h:before { content: @fa-var-mars-stroke-h; }
 .@{fa-css-prefix}-neuter:before { content: @fa-var-neuter; }
+.@{fa-css-prefix}-genderless:before { content: @fa-var-genderless; }
 .@{fa-css-prefix}-facebook-official:before { content: @fa-var-facebook-official; }
 .@{fa-css-prefix}-pinterest-p:before { content: @fa-var-pinterest-p; }
 .@{fa-css-prefix}-whatsapp:before { content: @fa-var-whatsapp; }

+ 1 - 1
less/variables.less

@@ -282,7 +282,7 @@
 @fa-var-ge: "\f1d1";
 @fa-var-gear: "\f013";
 @fa-var-gears: "\f085";
-@fa-var-genderless: "\f1db";
+@fa-var-genderless: "\f22d";
 @fa-var-get-pocket: "\f265";
 @fa-var-gg: "\f260";
 @fa-var-gg-circle: "\f261";

+ 1 - 1
scss/_icons.scss

@@ -505,7 +505,6 @@
 .#{$fa-css-prefix}-send-o:before,
 .#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; }
 .#{$fa-css-prefix}-history:before { content: $fa-var-history; }
-.#{$fa-css-prefix}-genderless:before,
 .#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; }
 .#{$fa-css-prefix}-header:before { content: $fa-var-header; }
 .#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; }
@@ -586,6 +585,7 @@
 .#{$fa-css-prefix}-mars-stroke-v:before { content: $fa-var-mars-stroke-v; }
 .#{$fa-css-prefix}-mars-stroke-h:before { content: $fa-var-mars-stroke-h; }
 .#{$fa-css-prefix}-neuter:before { content: $fa-var-neuter; }
+.#{$fa-css-prefix}-genderless:before { content: $fa-var-genderless; }
 .#{$fa-css-prefix}-facebook-official:before { content: $fa-var-facebook-official; }
 .#{$fa-css-prefix}-pinterest-p:before { content: $fa-var-pinterest-p; }
 .#{$fa-css-prefix}-whatsapp:before { content: $fa-var-whatsapp; }

+ 1 - 1
scss/_variables.scss

@@ -282,7 +282,7 @@ $fa-var-gbp: "\f154";
 $fa-var-ge: "\f1d1";
 $fa-var-gear: "\f013";
 $fa-var-gears: "\f085";
-$fa-var-genderless: "\f1db";
+$fa-var-genderless: "\f22d";
 $fa-var-get-pocket: "\f265";
 $fa-var-gg: "\f260";
 $fa-var-gg-circle: "\f261";

+ 1 - 0
src/_includes/navbar.html

@@ -44,6 +44,7 @@
             <li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa fa-camera-retro fa-fw"></i>&nbsp; Web Application Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#hand"><i class="fa fa-hand-spock-o fa-fw"></i>&nbsp; Hand Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#transportation"><i class="fa fa-ship fa-fw"></i>&nbsp; Transportation Icons</a></li>
+            <li><a href="{{ page.relative_path }}icons/#gender"><i class="fa fa-venus fa-fw"></i>&nbsp; Gender Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#file-type"><i class="fa fa-file-image-o fa-fw"></i>&nbsp; File Type 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>

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


+ 7 - 3
src/icons.yml

@@ -4419,11 +4419,8 @@ icons:
     id:         circle-thin
     unicode:    f1db
     created:    4.1
-    aliases:
-      - genderless
     categories:
       - Web Application Icons
-      - Gender Icons
 
   - name:       header
     id:         header
@@ -5024,6 +5021,13 @@ icons:
     categories:
       - Gender Icons
 
+  - name:       Genderless
+    id:         genderless
+    unicode:    f22d
+    created:    4.4
+    categories:
+      - Gender Icons
+
 
   - name:       Facebook Official
     id:         facebook-official

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно