mirror of
https://github.com/FortAwesome/Font-Awesome.git
synced 2024-12-26 13:31:30 +08:00
Change FontAwesomeRegular to FontAwesome.
This commit is contained in:
parent
54882b1fe2
commit
e00ab96313
2
css/font-awesome.css
vendored
2
css/font-awesome.css
vendored
@ -25,7 +25,7 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'FontAwesome';
|
font-family: 'FontAwesome';
|
||||||
src: url('../font/fontawesome-webfont.eot');
|
src: url('../font/fontawesome-webfont.eot');
|
||||||
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'), url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
|
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svgz#FontAwesome') format('svg'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
2
docs/assets/css/font-awesome.css
vendored
2
docs/assets/css/font-awesome.css
vendored
@ -24,7 +24,7 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'FontAwesome';
|
font-family: 'FontAwesome';
|
||||||
src: url('../font/fontawesome-webfont.eot');
|
src: url('../font/fontawesome-webfont.eot');
|
||||||
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'), url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
|
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svgz#FontAwesome') format('svg'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
File diff suppressed because one or more lines are too long
@ -7,7 +7,7 @@ Designer : Dave Gandy
|
|||||||
Foundry : Fort Awesome
|
Foundry : Fort Awesome
|
||||||
</metadata>
|
</metadata>
|
||||||
<defs>
|
<defs>
|
||||||
<font id="FontAwesomeRegular" horiz-adv-x="900" >
|
<font id="FontAwesome" horiz-adv-x="900" >
|
||||||
<font-face units-per-em="1000" ascent="750" descent="-250" />
|
<font-face units-per-em="1000" ascent="750" descent="-250" />
|
||||||
<missing-glyph horiz-adv-x="250" />
|
<missing-glyph horiz-adv-x="250" />
|
||||||
<glyph unicode="
" horiz-adv-x="250" />
|
<glyph unicode="
" horiz-adv-x="250" />
|
||||||
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
4
docs/assets/less/font-awesome.less
vendored
4
docs/assets/less/font-awesome.less
vendored
@ -28,8 +28,8 @@
|
|||||||
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
|
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
|
||||||
url('../font/fontawesome-webfont.woff') format('woff'),
|
url('../font/fontawesome-webfont.woff') format('woff'),
|
||||||
url('../font/fontawesome-webfont.ttf') format('truetype'),
|
url('../font/fontawesome-webfont.ttf') format('truetype'),
|
||||||
url('../font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'),
|
url('../font/fontawesome-webfont.svgz#FontAwesome') format('svg'),
|
||||||
url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
|
url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
@ -434,8 +434,8 @@
|
|||||||
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
|
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
|
||||||
url('../font/fontawesome-webfont.woff') format('woff'),
|
url('../font/fontawesome-webfont.woff') format('woff'),
|
||||||
url('../font/fontawesome-webfont.ttf') format('truetype'),
|
url('../font/fontawesome-webfont.ttf') format('truetype'),
|
||||||
url('../font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'),
|
url('../font/fontawesome-webfont.svgz#FontAwesome') format('svg'),
|
||||||
url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
|
url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ Designer : Dave Gandy
|
|||||||
Foundry : Fort Awesome
|
Foundry : Fort Awesome
|
||||||
</metadata>
|
</metadata>
|
||||||
<defs>
|
<defs>
|
||||||
<font id="FontAwesomeRegular" horiz-adv-x="900" >
|
<font id="FontAwesome" horiz-adv-x="900" >
|
||||||
<font-face units-per-em="1000" ascent="750" descent="-250" />
|
<font-face units-per-em="1000" ascent="750" descent="-250" />
|
||||||
<missing-glyph horiz-adv-x="250" />
|
<missing-glyph horiz-adv-x="250" />
|
||||||
<glyph unicode="
" horiz-adv-x="250" />
|
<glyph unicode="
" horiz-adv-x="250" />
|
||||||
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
@ -23,7 +23,7 @@
|
|||||||
@import compass/css3/font-face
|
@import compass/css3/font-face
|
||||||
$font_path: "../font/fontawesome-webfont" !default
|
$font_path: "../font/fontawesome-webfont" !default
|
||||||
|
|
||||||
+font-face("FontAwesome", font-files("#{$font_path}.woff", woff, "#{$font_path}.ttf", truetype, "#{$font_path}.otf", opentype, "#{$font_path}.svgz#FontAwesomeRegular", svg, "#{$font_path}.svg#FontAwesomeRegular", svg), "#{$font_path}.eot", normal, normal)
|
+font-face("FontAwesome", font-files("#{$font_path}.woff", woff, "#{$font_path}.ttf", truetype, "#{$font_path}.otf", opentype, "#{$font_path}.svgz#FontAwesome", svg, "#{$font_path}.svg#FontAwesome", svg), "#{$font_path}.eot", normal, normal)
|
||||||
|
|
||||||
// sprites.less reset
|
// sprites.less reset
|
||||||
[class^="icon-"],
|
[class^="icon-"],
|
||||||
|
4
sass/font-awesome.scss
vendored
4
sass/font-awesome.scss
vendored
@ -31,8 +31,8 @@ $font_path: "../font/fontawesome-webfont" !default;
|
|||||||
"#{$font_path}.woff", woff,
|
"#{$font_path}.woff", woff,
|
||||||
"#{$font_path}.ttf", truetype,
|
"#{$font_path}.ttf", truetype,
|
||||||
"#{$font_path}.otf", opentype,
|
"#{$font_path}.otf", opentype,
|
||||||
"#{$font_path}.svgz#FontAwesomeRegular", svg,
|
"#{$font_path}.svgz#FontAwesome", svg,
|
||||||
"#{$font_path}.svg#FontAwesomeRegular", svg),
|
"#{$font_path}.svg#FontAwesome", svg),
|
||||||
'#{$font_path}.eot',
|
'#{$font_path}.eot',
|
||||||
normal,
|
normal,
|
||||||
normal);
|
normal);
|
||||||
|
Loading…
Reference in New Issue
Block a user