Skip to content

Commit c6525ac

Browse files
authored
Add mastodon link on mainpage (#837)
1 parent 3f6dbd1 commit c6525ac

13 files changed

+150
-29
lines changed

fonts/Font-Awesome/README.txt

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
This webfont is generated by https://fontello.com open source project.
2+
3+
4+
================================================================================
5+
Please, note, that you should obey original font licenses, used to make this
6+
webfont pack. Details available in LICENSE.txt file.
7+
8+
- Usually, it's enough to publish content of LICENSE.txt file somewhere on your
9+
site in "About" section.
10+
11+
- If your project is open-source, usually, it will be ok to make LICENSE.txt
12+
file publicly available in your repository.
13+
14+
- Fonts, used in Fontello, don't require a clickable link on your site.
15+
But any kind of additional authors crediting is welcome.
16+
================================================================================
17+
18+
19+
Comments on archive content
20+
---------------------------
21+
22+
- /font/* - fonts in different formats
23+
24+
- /css/* - different kinds of css, for all situations. Should be ok with
25+
twitter bootstrap. Also, you can skip <i> style and assign icon classes
26+
directly to text elements, if you don't mind about IE7.
27+
28+
- demo.html - demo file, to show your webfont content
29+
30+
- LICENSE.txt - license info about source fonts, used to build your one.
31+
32+
- config.json - keeps your settings. You can import it back into fontello
33+
anytime, to continue your work
34+
35+
36+
Why so many CSS files ?
37+
-----------------------
38+
39+
Because we like to fit all your needs :)
40+
41+
- basic file, <your_font_name>.css - is usually enough, it contains @font-face
42+
and character code definitions
43+
44+
- *-ie7.css - if you need IE7 support, but still don't wish to put char codes
45+
directly into html
46+
47+
- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
48+
rules, but still wish to benefit from css generation. That can be very
49+
convenient for automated asset build systems. When you need to update font -
50+
no need to manually edit files, just override old version with archive
51+
content. See fontello source code for examples.
52+
53+
- *-embedded.css - basic css file, but with embedded WOFF font, to avoid
54+
CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
55+
We strongly recommend to resolve this issue by `Access-Control-Allow-Origin`
56+
server headers. But if you ok with dirty hack - this file is for you. Note,
57+
that data url moved to separate @font-face to avoid problems with <IE9, when
58+
string is too long.
59+
60+
- animate.css - use it to get ideas about spinner rotation animation.
61+
62+
63+
Attention for server setup
64+
--------------------------
65+
66+
You MUST setup server to reply with proper `mime-types` for font files -
67+
otherwise some browsers will fail to show fonts.
68+
69+
Usually, `apache` already has necessary settings, but `nginx` and other
70+
webservers should be tuned. Here is list of mime types for our file extensions:
71+
72+
- `application/vnd.ms-fontobject` - eot
73+
- `application/x-font-woff` - woff
74+
- `application/x-font-ttf` - ttf
75+
- `image/svg+xml` - svg

fonts/Font-Awesome/config.json

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,32 @@
77
"ascent": 850,
88
"glyphs": [
99
{
10-
"uid": "627abcdb627cb1789e009c08e2678ef9",
11-
"css": "twitter",
10+
"uid": "9f41027a9c9801e52905317a2294f254",
11+
"css": "mastodon",
12+
"code": 59393,
13+
"src": "fontawesome",
14+
"selected": true,
15+
"svg": {
16+
"path": "M845.7 349.8C845.7 160 721.3 104.3 721.3 104.3 599.2 48.3 274.9 48.8 153.9 104.3 153.9 104.3 29.5 160 29.5 349.8 29.5 575.8 16.6 856.5 235.8 914.5 314.9 935.4 382.9 939.9 437.6 936.7 536.8 931.3 592.5 901.4 592.5 901.4L589.2 829.3S518.3 851.6 438.6 849C359.6 846.3 276.5 840.4 263.5 743.6A200.3 200.3 0 0 1 261.8 716.4C429 757.2 571.6 734.2 610.9 729.5 720.5 716.4 816 648.8 828.1 587.1 847.3 489.9 845.7 349.8 845.7 349.8ZM699 594.4H607.9V371.3C607.9 274.2 482.9 270.5 482.9 384.8V506.9H392.4V384.8C392.4 270.5 267.4 274.2 267.4 371.3V594.3H176.2C176.2 355.9 166 305.5 212.1 252.5 262.7 196.1 368 192.4 414.9 264.5L437.6 302.5 460.2 264.5C507.3 192 612.8 196.5 663 252.5 709.3 305.9 698.9 356.1 698.9 594.3Z",
17+
"width": 875
18+
},
19+
"search": [
20+
"mastodon"
21+
]
22+
},
23+
{
24+
"uid": "3d9f8dd3dd630f242e1e7881e22a2892",
25+
"css": "x-twitter",
1226
"code": 59392,
13-
"src": "fontawesome"
27+
"src": "fontawesome",
28+
"selected": true,
29+
"svg": {
30+
"path": "M760.2 93.8H898L596.9 437.9 951.2 906.3H673.8L456.4 622.3 208 906.3H69.9L392 538.1 52.3 93.8H336.7L533 353.3 760.2 93.8ZM711.7 823.8H788.1L295.1 171.9H213.1L711.7 823.8Z",
31+
"width": 1000
32+
},
33+
"search": [
34+
"x-twitter"
35+
]
1436
}
1537
]
1638
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
.icon-twitter:before { content: '\e800'; } /* '' */
1+
2+
.icon-x-twitter:before { content: '\e800'; } /* '' */
3+
.icon-mastodon:before { content: '\e801'; } /* '' */

fonts/Font-Awesome/css/fontello-embedded.css

Lines changed: 15 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
.icon-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
1+
2+
.icon-x-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
3+
.icon-mastodon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }

fonts/Font-Awesome/css/fontello-ie7.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
/* font-size: 120%; */
1111
}
1212

13-
.icon-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
13+
.icon-x-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
14+
.icon-mastodon { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }

fonts/Font-Awesome/css/fontello.css

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@font-face {
22
font-family: 'fontello';
3-
src: url('/fonts/Font-Awesome/font/fontello.eot?60964435');
4-
src: url('/fonts/Font-Awesome/font/fontello.eot?60964435#iefix') format('embedded-opentype'),
5-
url('/fonts/Font-Awesome/font/fontello.woff?60964435') format('woff'),
6-
url('/fonts/Font-Awesome/font/fontello.ttf?60964435') format('truetype'),
7-
url('/fonts/Font-Awesome/font/fontello.svg?60964435#fontello') format('svg');
3+
src: url('/fonts/Font-Awesome/font/fontello.eot?96103027');
4+
src: url('/fonts/Font-Awesome/font/fontello.eot?96103027#iefix') format('embedded-opentype'),
5+
url('/fonts/Font-Awesome/font/fontello.woff2?96103027') format('woff2'),
6+
url('/fonts/Font-Awesome/font/fontello.woff?96103027') format('woff'),
7+
url('/fonts/Font-Awesome/font/fontello.ttf?96103027') format('truetype'),
8+
url('/fonts/Font-Awesome/font/fontello.svg?96103027#fontello') format('svg');
89
font-weight: normal;
910
font-style: normal;
1011
}
@@ -14,16 +15,15 @@
1415
@media screen and (-webkit-min-device-pixel-ratio:0) {
1516
@font-face {
1617
font-family: 'fontello';
17-
src: url('/fonts/Font-Awesome/font/fontello.svg?60964435#fontello') format('svg');
18+
src: url('../font/fontello.svg?96103027#fontello') format('svg');
1819
}
1920
}
2021
*/
21-
22-
[class^="icon-"]:before, [class*=" icon-"]:before {
22+
[class^="icon-"]:before, [class*=" icon-"]:before {
2323
font-family: "fontello";
2424
font-style: normal;
2525
font-weight: normal;
26-
speak: none;
26+
speak: never;
2727

2828
display: inline-block;
2929
text-decoration: inherit;
@@ -46,8 +46,13 @@
4646
/* you can be more comfortable with increased icons size */
4747
/* font-size: 120%; */
4848

49+
/* Font smoothing. That was taken from TWBS */
50+
-webkit-font-smoothing: antialiased;
51+
-moz-osx-font-smoothing: grayscale;
52+
4953
/* Uncomment for 3D effect */
5054
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
5155
}
5256

53-
.icon-twitter:before { content: '\e800'; } /* '' */
57+
.icon-x-twitter:before { content: '\e800'; } /* '' */
58+
.icon-mastodon:before { content: '\e801'; } /* '' */

fonts/Font-Awesome/font/fontello.eot

1.66 KB
Binary file not shown.

fonts/Font-Awesome/font/fontello.svg

Lines changed: 5 additions & 3 deletions
Loading

fonts/Font-Awesome/font/fontello.ttf

1.66 KB
Binary file not shown.

0 commit comments

Comments
 (0)