浏览代码

Fixing some CSS issues

Dave Gandy 9 年之前
父节点
当前提交
82ed6c3e0c

+ 1 - 1
README.md

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

+ 6 - 0
css/font-awesome.css

@@ -2163,6 +2163,12 @@
 .fa-first-order:before {
 .fa-first-order:before {
   content: "\f2b0";
   content: "\f2b0";
 }
 }
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
 .sr-only {
 .sr-only {
   position: absolute;
   position: absolute;
   width: 1px;
   width: 1px;

文件差异内容过多而无法显示
+ 0 - 0
css/font-awesome.min.css


二进制
fonts/FontAwesome.otf


+ 2 - 0
less/icons.less

@@ -725,3 +725,5 @@
 .@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
 .@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
 .@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
 .@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
 .@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
 .@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
+.@{fa-css-prefix}-yoast:before { content: @fa-var-yoast; }
+.@{fa-css-prefix}-themeisle:before { content: @fa-var-themeisle; }

+ 2 - 0
less/variables.less

@@ -639,6 +639,7 @@
 @fa-var-th: "\f00a";
 @fa-var-th: "\f00a";
 @fa-var-th-large: "\f009";
 @fa-var-th-large: "\f009";
 @fa-var-th-list: "\f00b";
 @fa-var-th-list: "\f00b";
+@fa-var-themeisle: "\f2b2";
 @fa-var-thumb-tack: "\f08d";
 @fa-var-thumb-tack: "\f08d";
 @fa-var-thumbs-down: "\f165";
 @fa-var-thumbs-down: "\f165";
 @fa-var-thumbs-o-down: "\f088";
 @fa-var-thumbs-o-down: "\f088";
@@ -732,6 +733,7 @@
 @fa-var-yc-square: "\f1d4";
 @fa-var-yc-square: "\f1d4";
 @fa-var-yelp: "\f1e9";
 @fa-var-yelp: "\f1e9";
 @fa-var-yen: "\f157";
 @fa-var-yen: "\f157";
+@fa-var-yoast: "\f2b1";
 @fa-var-youtube: "\f167";
 @fa-var-youtube: "\f167";
 @fa-var-youtube-play: "\f16a";
 @fa-var-youtube-play: "\f16a";
 @fa-var-youtube-square: "\f166";
 @fa-var-youtube-square: "\f166";

+ 2 - 0
scss/_icons.scss

@@ -725,3 +725,5 @@
 .#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }
 .#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }
 .#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
 .#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
 .#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; }
 .#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; }
+.#{$fa-css-prefix}-yoast:before { content: $fa-var-yoast; }
+.#{$fa-css-prefix}-themeisle:before { content: $fa-var-themeisle; }

+ 2 - 0
scss/_variables.scss

@@ -639,6 +639,7 @@ $fa-var-text-width: "\f035";
 $fa-var-th: "\f00a";
 $fa-var-th: "\f00a";
 $fa-var-th-large: "\f009";
 $fa-var-th-large: "\f009";
 $fa-var-th-list: "\f00b";
 $fa-var-th-list: "\f00b";
+$fa-var-themeisle: "\f2b2";
 $fa-var-thumb-tack: "\f08d";
 $fa-var-thumb-tack: "\f08d";
 $fa-var-thumbs-down: "\f165";
 $fa-var-thumbs-down: "\f165";
 $fa-var-thumbs-o-down: "\f088";
 $fa-var-thumbs-o-down: "\f088";
@@ -732,6 +733,7 @@ $fa-var-yc: "\f23b";
 $fa-var-yc-square: "\f1d4";
 $fa-var-yc-square: "\f1d4";
 $fa-var-yelp: "\f1e9";
 $fa-var-yelp: "\f1e9";
 $fa-var-yen: "\f157";
 $fa-var-yen: "\f157";
+$fa-var-yoast: "\f2b1";
 $fa-var-youtube: "\f167";
 $fa-var-youtube: "\f167";
 $fa-var-youtube-play: "\f16a";
 $fa-var-youtube-play: "\f16a";
 $fa-var-youtube-square: "\f166";
 $fa-var-youtube-square: "\f166";

二进制
src/assets/font-awesome/fonts/FontAwesome.otf


+ 0 - 11
src/assets/less/site/bootstrap/jumbotron.less

@@ -29,17 +29,6 @@
   .text-muted {
   .text-muted {
     color: mix(@jumbotron-color, @fa-green, 45%);
     color: mix(@jumbotron-color, @fa-green, 45%);
   }
   }
-
-  a {
-    color: mix(@jumbotron-color, @fa-green, 70%);
-
-    // STATE: hover, focus, active
-    &:hover, &:focus, &:active {
-      border-color: @fa-green-dark;
-      background: @fa-green-dark;
-      color: @jumbotron-color;
-    }
-  }
 }
 }
 
 
 .jumbotron-ad, .jumbotron-carousel {
 .jumbotron-ad, .jumbotron-carousel {

+ 10 - 0
src/assets/less/site/jumbotron-carousel.less

@@ -58,4 +58,14 @@
       }
       }
     }
     }
   }
   }
+  a {
+    color: mix(@jumbotron-color, @fa-green, 70%);
+
+    // STATE: hover, focus, active
+    &:hover, &:focus, &:active {
+      border-color: @fa-green-dark;
+      background: @fa-green-dark;
+      color: @jumbotron-color;
+    }
+  }
 }
 }

+ 16 - 0
src/icons.yml

@@ -6145,3 +6145,19 @@ icons:
     created:    4.6
     created:    4.6
     categories:
     categories:
       - Brand Icons
       - Brand Icons
+
+  - name:       Yoast
+    id:         yoast
+    unicode:    f2b1
+    created:    4.6
+    url:        yoast.com
+    categories:
+      - Brand Icons
+
+  - name:       ThemeIsle
+    id:         themeisle
+    unicode:    f2b2
+    created:    4.6
+    url:        themeisle.com
+    categories:
+      - Brand Icons

部分文件因为文件数量过多而无法显示