Selaa lähdekoodia

updating webfont files & config for release

Dave Gandy 10 vuotta sitten
vanhempi
sitoutus
a65bd93d81

+ 1 - 1
_config.yml

@@ -21,7 +21,7 @@ icon_destination: icon         # Relative to destination
 fontawesome:
   version:        4.2.0
   minor_version:  4.2
-  doc_blob:       4.2.0-wip
+  doc_blob:       v4.2.0
   url:            http://fontawesome.io
   legacy_url:     http://fortawesome.github.com/Font-Awesome/
   blog_url:       http://blog.fontawesome.io

+ 2 - 1
css/font-awesome.css

@@ -6,7 +6,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/FontAwesome.otf') format('opentype');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.2.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
css/font-awesome.min.css


BIN
fonts/FontAwesome.otf


BIN
fonts/fontawesome-webfont.eot


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 19 - 18
fonts/fontawesome-webfont.svg


BIN
fonts/fontawesome-webfont.ttf


BIN
fonts/fontawesome-webfont.woff


+ 6 - 6
less/path.less

@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-//  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
-//  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
-//    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
-//    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
-//    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }

+ 4 - 4
src/_includes/jumbotron-carousel.html

@@ -25,11 +25,11 @@
           <!-- Carousel items -->
           <div class="carousel-inner">
             <div class="active item"><div><i class="fa fa-flag"></i></div></div>
-            <div class="item"><div><i class="fa fa-send-o"></i></div></div>
-            <div class="item"><div><i class="fa fa-cube"></i></div></div>
-            <div class="item"><div><i class="fa fa-file-picture-o"></i></div></div>
-            <div class="item"><div><i class="fa fa-life-ring"></i></div></div>
+            <div class="item"><div><i class="fa fa-birthday-cake"></i></div></div>
+            <div class="item"><div><i class="fa fa-paint-brush"></i></div></div>
+            <div class="item"><div><i class="fa fa-eyedropper"></i></div></div>
             <div class="item"><div><i class="fa fa-envelope"></i></div></div>
+            <div class="item"><div><i class="fa fa-send-o"></i></div></div>
             <div class="item"><div><i class="fa fa-book"></i></div></div>
             <div class="item"><div><i class="fa fa-fighter-jet"></i></div></div>
             <div class="item"><div><i class="fa fa-beer"></i></div></div>

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


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.eot


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 19 - 18
src/assets/font-awesome/fonts/fontawesome-webfont.svg


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.ttf


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.woff


+ 6 - 6
src/assets/font-awesome/less/path.less

@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-//  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
-//  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
-//    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
-//    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
-//    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä