소스 검색

shortening font declaration, adding font-variant and text-rendering defaults

Dave Gandy 10 년 전
부모
커밋
791f220839
6개의 변경된 파일15개의 추가작업 그리고 20개의 파일을 삭제
  1. 3 4
      css/font-awesome.css
  2. 0 0
      css/font-awesome.min.css
  3. 3 4
      less/core.less
  4. 3 4
      scss/_core.scss
  5. 3 4
      src/assets/font-awesome/less/core.less
  6. 3 4
      src/assets/font-awesome/scss/_core.scss

+ 3 - 4
css/font-awesome.css

@@ -12,10 +12,9 @@
 }
 }
 .fa {
 .fa {
   display: inline-block;
   display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
css/font-awesome.min.css


+ 3 - 4
less/core.less

@@ -3,10 +3,9 @@
 
 
 .@{fa-css-prefix} {
 .@{fa-css-prefix} {
   display: inline-block;
   display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
+  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }

+ 3 - 4
scss/_core.scss

@@ -3,10 +3,9 @@
 
 
 .#{$fa-css-prefix} {
 .#{$fa-css-prefix} {
   display: inline-block;
   display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
+  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }

+ 3 - 4
src/assets/font-awesome/less/core.less

@@ -6,10 +6,9 @@
 
 
 .@{fa-css-prefix} {
 .@{fa-css-prefix} {
   display: inline-block;
   display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
+  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }

+ 3 - 4
src/assets/font-awesome/scss/_core.scss

@@ -6,10 +6,9 @@
 
 
 .#{$fa-css-prefix} {
 .#{$fa-css-prefix} {
   display: inline-block;
   display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
+  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.