Skip to content

Commit e0fd30d

Browse files
xbgmsharpxbgmsharp
committed
Fix fontello with Firefox
1 parent 2195a54 commit e0fd30d

11 files changed

Lines changed: 82 additions & 28 deletions

File tree

‎fontello/config.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
"units_per_em": 1000,
77
"ascent": 850,
88
"glyphs": [
9+
{
10+
"uid": "8b80d36d4ef43889db10bc1f0dc9a862",
11+
"css": "user",
12+
"code": 128292,
13+
"src": "fontawesome"
14+
},
15+
{
16+
"uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
17+
"css": "info-circled",
18+
"code": 128289,
19+
"src": "fontawesome"
20+
},
921
{
1022
"uid": "d7271d490b71df4311e32cdacae8b331",
1123
"css": "home",
@@ -60,6 +72,18 @@
6072
"code": 128278,
6173
"src": "fontawesome"
6274
},
75+
{
76+
"uid": "63b3012c8cbe3654ba5bea598235aa3a",
77+
"css": "angle-double-up",
78+
"code": 128291,
79+
"src": "fontawesome"
80+
},
81+
{
82+
"uid": "dfec4ffa849d8594c2e4b86f6320b8a6",
83+
"css": "angle-double-down",
84+
"code": 128290,
85+
"src": "fontawesome"
86+
},
6387
{
6488
"uid": "555ef8c86832e686fef85f7af2eb7cde",
6589
"css": "left-big",

‎fontello/css/osm-codes.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
@charset "UTF-8";
22

33

4-
.osm-home:before { content: '🔠'; } /* '\1f520' */
4+
.osm-user:before { content: '🔤'; } /* '\1f524' */
55
.osm-globe:before { content: '🔘'; } /* '\1f518' */
6+
.osm-home:before { content: '🔠'; } /* '\1f520' */
7+
.osm-link:before { content: '🔙'; } /* '\1f519' */
68
.osm-link-ext:before { content: '🔐'; } /* '\1f510' */
79
.osm-pin:before { content: '🔑'; } /* '\1f511' */
810
.osm-location:before { content: '🔒'; } /* '\1f512' */
9-
.osm-link:before { content: '🔙'; } /* '\1f519' */
11+
.osm-info-circled:before { content: '🔡'; } /* '\1f521' */
1012
.osm-cog:before { content: '🔔'; } /* '\1f514' */
1113
.osm-zoom-in:before { content: '🔕'; } /* '\1f515' */
1214
.osm-zoom-out:before { content: '🔖'; } /* '\1f516' */
15+
.osm-angle-double-up:before { content: '🔣'; } /* '\1f523' */
16+
.osm-angle-double-down:before { content: '🔢'; } /* '\1f522' */
1317
.osm-left-big:before { content: '🔗'; } /* '\1f517' */
1418
.osm-direction:before { content: '🔓'; } /* '\1f513' */

‎fontello/css/osm-embedded.css‎

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fontello/css/osm-ie7-codes.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11

2-
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔠 '); }
2+
.osm-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔤 '); }
33
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔘 '); }
4+
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔠 '); }
5+
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔙 '); }
46
.osm-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔐 '); }
57
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔑 '); }
68
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔒 '); }
7-
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔙 '); }
9+
.osm-info-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔡 '); }
810
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔔 '); }
911
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔕 '); }
1012
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔖 '); }
13+
.osm-angle-double-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔣 '); }
14+
.osm-angle-double-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔢 '); }
1115
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔗 '); }
1216
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔓 '); }

‎fontello/css/osm-ie7.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@
1010
/* font-size: 120%; */
1111
}
1212

13-
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔠 '); }
13+
.osm-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔤 '); }
1414
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔘 '); }
15+
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔠 '); }
16+
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔙 '); }
1517
.osm-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔐 '); }
1618
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔑 '); }
1719
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔒 '); }
18-
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔙 '); }
20+
.osm-info-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔡 '); }
1921
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔔 '); }
2022
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔕 '); }
2123
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔖 '); }
24+
.osm-angle-double-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔣 '); }
25+
.osm-angle-double-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔢 '); }
2226
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔗 '); }
2327
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔓 '); }

‎fontello/css/osm.css‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
@font-face {
44
font-family: 'osm';
5-
src: url('../font/osm.eot?16352570');
6-
src: url('../font/osm.eot?16352570#iefix') format('embedded-opentype'),
7-
url('../font/osm.woff?16352570') format('woff'),
8-
url('../font/osm.ttf?16352570') format('truetype'),
9-
url('../font/osm.svg?16352570#osm') format('svg');
5+
src: url('../font/osm.eot?39632956');
6+
src: url('../font/osm.eot?39632956#iefix') format('embedded-opentype'),
7+
url('../font/osm.woff?39632956') format('woff'),
8+
url('../font/osm.ttf?39632956') format('truetype'),
9+
url('../font/osm.svg?39632956#osm') format('svg');
1010
font-weight: normal;
1111
font-style: normal;
1212
}
@@ -16,7 +16,7 @@
1616
@media screen and (-webkit-min-device-pixel-ratio:0) {
1717
@font-face {
1818
font-family: 'osm';
19-
src: url('../font/osm.svg?16352570#osm') format('svg');
19+
src: url('../font/osm.svg?39632956#osm') format('svg');
2020
}
2121
}
2222
*/
@@ -52,14 +52,18 @@
5252
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
5353
}
5454

55-
.osm-home:before { content: '🔠'; } /* '\1f520' */
55+
.osm-user:before { content: '🔤'; } /* '\1f524' */
5656
.osm-globe:before { content: '🔘'; } /* '\1f518' */
57+
.osm-home:before { content: '🔠'; } /* '\1f520' */
58+
.osm-link:before { content: '🔙'; } /* '\1f519' */
5759
.osm-link-ext:before { content: '🔐'; } /* '\1f510' */
5860
.osm-pin:before { content: '🔑'; } /* '\1f511' */
5961
.osm-location:before { content: '🔒'; } /* '\1f512' */
60-
.osm-link:before { content: '🔙'; } /* '\1f519' */
62+
.osm-info-circled:before { content: '🔡'; } /* '\1f521' */
6163
.osm-cog:before { content: '🔔'; } /* '\1f514' */
6264
.osm-zoom-in:before { content: '🔕'; } /* '\1f515' */
6365
.osm-zoom-out:before { content: '🔖'; } /* '\1f516' */
66+
.osm-angle-double-up:before { content: '🔣'; } /* '\1f523' */
67+
.osm-angle-double-down:before { content: '🔢'; } /* '\1f522' */
6468
.osm-left-big:before { content: '🔗'; } /* '\1f517' */
6569
.osm-direction:before { content: '🔓'; } /* '\1f513' */

‎fontello/demo.html‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,19 +263,25 @@ <h1>
263263
</div>
264264
<div id="icons" class="container">
265265
<div class="row">
266-
<div title="Code: 0x1f520" class="the-icons span3"><i class="osm-home"></i> <span class="i-name">osm-home</span><span class="i-code">0x1f520</span></div>
266+
<div title="Code: 0x1f524" class="the-icons span3"><i class="osm-user"></i> <span class="i-name">osm-user</span><span class="i-code">0x1f524</span></div>
267267
<div title="Code: 0x1f518" class="the-icons span3"><i class="osm-globe"></i> <span class="i-name">osm-globe</span><span class="i-code">0x1f518</span></div>
268+
<div title="Code: 0x1f520" class="the-icons span3"><i class="osm-home"></i> <span class="i-name">osm-home</span><span class="i-code">0x1f520</span></div>
269+
<div title="Code: 0x1f519" class="the-icons span3"><i class="osm-link"></i> <span class="i-name">osm-link</span><span class="i-code">0x1f519</span></div>
270+
</div>
271+
<div class="row">
268272
<div title="Code: 0x1f510" class="the-icons span3"><i class="osm-link-ext"></i> <span class="i-name">osm-link-ext</span><span class="i-code">0x1f510</span></div>
269273
<div title="Code: 0x1f511" class="the-icons span3"><i class="osm-pin"></i> <span class="i-name">osm-pin</span><span class="i-code">0x1f511</span></div>
274+
<div title="Code: 0x1f512" class="the-icons span3"><i class="osm-location"></i> <span class="i-name">osm-location</span><span class="i-code">0x1f512</span></div>
275+
<div title="Code: 0x1f521" class="the-icons span3"><i class="osm-info-circled"></i> <span class="i-name">osm-info-circled</span><span class="i-code">0x1f521</span></div>
270276
</div>
271277
<div class="row">
272-
<div title="Code: 0x1f512" class="the-icons span3"><i class="osm-location"></i> <span class="i-name">osm-location</span><span class="i-code">0x1f512</span></div>
273-
<div title="Code: 0x1f519" class="the-icons span3"><i class="osm-link"></i> <span class="i-name">osm-link</span><span class="i-code">0x1f519</span></div>
274278
<div title="Code: 0x1f514" class="the-icons span3"><i class="osm-cog"></i> <span class="i-name">osm-cog</span><span class="i-code">0x1f514</span></div>
275279
<div title="Code: 0x1f515" class="the-icons span3"><i class="osm-zoom-in"></i> <span class="i-name">osm-zoom-in</span><span class="i-code">0x1f515</span></div>
280+
<div title="Code: 0x1f516" class="the-icons span3"><i class="osm-zoom-out"></i> <span class="i-name">osm-zoom-out</span><span class="i-code">0x1f516</span></div>
281+
<div title="Code: 0x1f523" class="the-icons span3"><i class="osm-angle-double-up"></i> <span class="i-name">osm-angle-double-up</span><span class="i-code">0x1f523</span></div>
276282
</div>
277283
<div class="row">
278-
<div title="Code: 0x1f516" class="the-icons span3"><i class="osm-zoom-out"></i> <span class="i-name">osm-zoom-out</span><span class="i-code">0x1f516</span></div>
284+
<div title="Code: 0x1f522" class="the-icons span3"><i class="osm-angle-double-down"></i> <span class="i-name">osm-angle-double-down</span><span class="i-code">0x1f522</span></div>
279285
<div title="Code: 0x1f517" class="the-icons span3"><i class="osm-left-big"></i> <span class="i-name">osm-left-big</span><span class="i-code">0x1f517</span></div>
280286
<div title="Code: 0x1f513" class="the-icons span3"><i class="osm-direction"></i> <span class="i-name">osm-direction</span><span class="i-code">0x1f513</span></div>
281287
</div>

‎fontello/font/osm.eot‎

892 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)