library-mirrors/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-11-20 11:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updating Opera logo #7871

Browse Source
This commit is contained in:
Dave Gandy 2015-11-19 11:47:05 -05:00 committed by Travis Chase
parent 55932f4c2e
commit d02f34ee74
13 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -62,6 +62,3 @@ DEPENDENCIES
safe_yaml (~> 1.0.4) safe_yaml (~> 1.0.4)
sass (~> 3.0) sass (~> 3.0)
therubyracer therubyracer
BUNDLED WITH
1.10.6

2
README.md
View File

@ -1,4 +1,4 @@
#[Font Awesome v4.4.0](http://fontawesome.io) #[Font Awesome v4.4.1](http://fontawesome.io)
###The iconic font and CSS framework ###The iconic font and CSS framework
Font Awesome is a full suite of 585 pictographic icons for easy scalable vector graphics on websites, Font Awesome is a full suite of 585 pictographic icons for easy scalable vector graphics on websites,

4
_config.yml
View File

@ -19,10 +19,10 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination icon_destination: icon # Relative to destination
fontawesome: fontawesome:
version: 4.4.0 version: 4.4.1
minor_version: 4.4 minor_version: 4.4
major_version: 4 major_version: 4
doc_blob: v4.4.0 doc_blob: v4.4.1
url: http://fontawesome.io url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/ legacy_url: http://fortawesome.github.com/Font-Awesome/
blog_url: http://blog.fontawesome.io blog_url: http://blog.fontawesome.io

5
css/font-awesome.css vendored
View File

@ -1,13 +1,12 @@
/*! /*!
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 4.4.1 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */
/* FONT PATH /* FONT PATH
* -------------------------- */ * -------------------------- */
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.4.0'); src: url('../fonts/FontAwesome.otf') format('opentype');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

4
css/font-awesome.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
fonts/FontAwesome.otf
View File

Binary file not shown.

2
less/font-awesome.less vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 4.4.1 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */

14
less/path.less
View File

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

4
less/variables.less
View File

@ -4,9 +4,9 @@
@fa-font-path: "../fonts"; @fa-font-path: "../fonts";
@fa-font-size-base: 14px; @fa-font-size-base: 14px;
@fa-line-height-base: 1; @fa-line-height-base: 1;
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts"; // for referencing Bootstrap CDN font files directly //@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.1/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: fa; @fa-css-prefix: fa;
@fa-version: "4.4.0"; @fa-version: "4.4.1";
@fa-border-color: #eee; @fa-border-color: #eee;
@fa-inverse: #fff; @fa-inverse: #fff;
@fa-li-width: (30em / 14); @fa-li-width: (30em / 14);

4
scss/_variables.scss
View File

@ -4,9 +4,9 @@
$fa-font-path: "../fonts" !default; $fa-font-path: "../fonts" !default;
$fa-font-size-base: 14px !default; $fa-font-size-base: 14px !default;
$fa-line-height-base: 1 !default; $fa-line-height-base: 1 !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts" !default; // for referencing Bootstrap CDN font files directly //$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.1/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: fa !default; $fa-css-prefix: fa !default;
$fa-version: "4.4.0" !default; $fa-version: "4.4.1" !default;
$fa-border-color: #eee !default; $fa-border-color: #eee !default;
$fa-inverse: #fff !default; $fa-inverse: #fff !default;
$fa-li-width: (30em / 14) !default; $fa-li-width: (30em / 14) !default;

2
scss/font-awesome.scss vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 4.4.1 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */

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

Binary file not shown.

14
src/assets/font-awesome/less/path.less vendored
View File

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