Skip to content

Commit 50599da

Browse files
xbgmsharpxbgmsharp
committed
Update fontello, cleanup unsed icon and update id to avoid conflict
1 parent 885d786 commit 50599da

11 files changed

Lines changed: 92 additions & 120 deletions

File tree

‎fontello/config.json‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
{
1010
"uid": "d7271d490b71df4311e32cdacae8b331",
1111
"css": "home",
12-
"code": 59393,
12+
"code": 919553,
1313
"src": "fontawesome"
1414
},
1515
{
1616
"uid": "0ddd3e8201ccc7d41f7b7c9d27eca6c1",
1717
"css": "link",
18-
"code": 919552,
18+
"code": 919554,
1919
"src": "fontawesome"
2020
},
2121
{
@@ -27,61 +27,49 @@
2727
{
2828
"uid": "5b0772e9484a1a11646793a82edd622a",
2929
"css": "pin",
30-
"code": 919553,
30+
"code": 919556,
3131
"src": "fontawesome"
3232
},
3333
{
3434
"uid": "0d08dbb1dd648a43bdea81b7e6c9e036",
3535
"css": "location",
36-
"code": 919560,
36+
"code": 919557,
3737
"src": "fontawesome"
3838
},
3939
{
4040
"uid": "921e3974e54ff9e8b7cd906a3dc74636",
4141
"css": "direction",
42-
"code": 919559,
43-
"src": "fontawesome"
44-
},
45-
{
46-
"uid": "e5d624264734620fa9f98d59e6dc941f",
47-
"css": "compass",
4842
"code": 919558,
4943
"src": "fontawesome"
5044
},
5145
{
5246
"uid": "e99461abfef3923546da8d745372c995",
5347
"css": "cog",
54-
"code": 59392,
55-
"src": "fontawesome"
56-
},
57-
{
58-
"uid": "98687378abd1faf8f6af97c254eb6cd6",
59-
"css": "cog-alt",
60-
"code": 919557,
48+
"code": 919559,
6149
"src": "fontawesome"
6250
},
6351
{
6452
"uid": "0b2b66e526028a6972d51a6f10281b4b",
6553
"css": "zoom-in",
66-
"code": 919554,
54+
"code": 919560,
6755
"src": "fontawesome"
6856
},
6957
{
7058
"uid": "d25d10efa900f529ad1d275657cfd30e",
7159
"css": "zoom-out",
72-
"code": 59395,
60+
"code": 919561,
7361
"src": "fontawesome"
7462
},
7563
{
7664
"uid": "555ef8c86832e686fef85f7af2eb7cde",
7765
"css": "left-big",
78-
"code": 59394,
66+
"code": 919569,
7967
"src": "fontawesome"
8068
},
8169
{
8270
"uid": "197375a3cea8cb90b02d06e4ddf1433d",
8371
"css": "globe",
84-
"code": 919556,
72+
"code": 919568,
8573
"src": "fontawesome"
8674
}
8775
]

‎fontello/css/osm-codes.css‎

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

33

4-
.osm-home:before { content: '\e801'; } /* '' */
5-
.osm-globe:before { content: '󠠄'; } /* '\e0804' */
4+
.osm-home:before { content: '󠠁'; } /* '\e0801' */
5+
.osm-globe:before { content: '󠠐'; } /* '\e0810' */
66
.osm-link-ext:before { content: '󠠃'; } /* '\e0803' */
7-
.osm-pin:before { content: '󠠁'; } /* '\e0801' */
8-
.osm-location:before { content: '󠠈'; } /* '\e0808' */
9-
.osm-direction:before { content: '󠠇'; } /* '\e0807' */
10-
.osm-link:before { content: '󠠀'; } /* '\e0800' */
11-
.osm-cog:before { content: '\e800'; } /* '' */
12-
.osm-cog-alt:before { content: '󠠅'; } /* '\e0805' */
13-
.osm-zoom-in:before { content: '󠠂'; } /* '\e0802' */
14-
.osm-zoom-out:before { content: '\e803'; } /* '' */
15-
.osm-left-big:before { content: '\e802'; } /* '' */
16-
.osm-compass:before { content: '󠠆'; } /* '\e0806' */
7+
.osm-pin:before { content: '󠠄'; } /* '\e0804' */
8+
.osm-location:before { content: '󠠅'; } /* '\e0805' */
9+
.osm-link:before { content: '󠠂'; } /* '\e0802' */
10+
.osm-cog:before { content: '󠠇'; } /* '\e0807' */
11+
.osm-zoom-in:before { content: '󠠈'; } /* '\e0808' */
12+
.osm-zoom-out:before { content: '󠠉'; } /* '\e0809' */
13+
.osm-left-big:before { content: '󠠑'; } /* '\e0811' */
14+
.osm-direction:before { content: '󠠆'; } /* '\e0806' */

‎fontello/css/osm-embedded.css‎

Lines changed: 16 additions & 18 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: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11

2-
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
3-
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠄 '); }
2+
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠁 '); }
3+
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠐 '); }
44
.osm-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠃 '); }
5-
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠁 '); }
6-
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠈 '); }
7-
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠇 '); }
8-
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠀 '); }
9-
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
10-
.osm-cog-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠅 '); }
11-
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠂 '); }
12-
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
13-
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
14-
.osm-compass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠆 '); }
5+
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠄 '); }
6+
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠅 '); }
7+
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠂 '); }
8+
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠇 '); }
9+
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠈 '); }
10+
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠉 '); }
11+
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠑 '); }
12+
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠆 '); }

‎fontello/css/osm-ie7.css‎

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

13-
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
14-
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠄 '); }
13+
.osm-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠁 '); }
14+
.osm-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠐 '); }
1515
.osm-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠃 '); }
16-
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠁 '); }
17-
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠈 '); }
18-
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠇 '); }
19-
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠀 '); }
20-
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
21-
.osm-cog-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠅 '); }
22-
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠂 '); }
23-
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
24-
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
25-
.osm-compass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠆 '); }
16+
.osm-pin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠄 '); }
17+
.osm-location { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠅 '); }
18+
.osm-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠂 '); }
19+
.osm-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠇 '); }
20+
.osm-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠈 '); }
21+
.osm-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠉 '); }
22+
.osm-left-big { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠑 '); }
23+
.osm-direction { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '󠠆 '); }

‎fontello/css/osm.css‎

Lines changed: 16 additions & 18 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?87643405');
6-
src: url('../font/osm.eot?87643405#iefix') format('embedded-opentype'),
7-
url('../font/osm.woff?87643405') format('woff'),
8-
url('../font/osm.ttf?87643405') format('truetype'),
9-
url('../font/osm.svg?87643405#osm') format('svg');
5+
src: url('../font/osm.eot?38459959');
6+
src: url('../font/osm.eot?38459959#iefix') format('embedded-opentype'),
7+
url('../font/osm.woff?38459959') format('woff'),
8+
url('../font/osm.ttf?38459959') format('truetype'),
9+
url('../font/osm.svg?38459959#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?87643405#osm') format('svg');
19+
src: url('../font/osm.svg?38459959#osm') format('svg');
2020
}
2121
}
2222
*/
@@ -52,16 +52,14 @@
5252
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
5353
}
5454

55-
.osm-home:before { content: '\e801'; } /* '' */
56-
.osm-globe:before { content: '󠠄'; } /* '\e0804' */
55+
.osm-home:before { content: '󠠁'; } /* '\e0801' */
56+
.osm-globe:before { content: '󠠐'; } /* '\e0810' */
5757
.osm-link-ext:before { content: '󠠃'; } /* '\e0803' */
58-
.osm-pin:before { content: '󠠁'; } /* '\e0801' */
59-
.osm-location:before { content: '󠠈'; } /* '\e0808' */
60-
.osm-direction:before { content: '󠠇'; } /* '\e0807' */
61-
.osm-link:before { content: '󠠀'; } /* '\e0800' */
62-
.osm-cog:before { content: '\e800'; } /* '' */
63-
.osm-cog-alt:before { content: '󠠅'; } /* '\e0805' */
64-
.osm-zoom-in:before { content: '󠠂'; } /* '\e0802' */
65-
.osm-zoom-out:before { content: '\e803'; } /* '' */
66-
.osm-left-big:before { content: '\e802'; } /* '' */
67-
.osm-compass:before { content: '󠠆'; } /* '\e0806' */
58+
.osm-pin:before { content: '󠠄'; } /* '\e0804' */
59+
.osm-location:before { content: '󠠅'; } /* '\e0805' */
60+
.osm-link:before { content: '󠠂'; } /* '\e0802' */
61+
.osm-cog:before { content: '󠠇'; } /* '\e0807' */
62+
.osm-zoom-in:before { content: '󠠈'; } /* '\e0808' */
63+
.osm-zoom-out:before { content: '󠠉'; } /* '\e0809' */
64+
.osm-left-big:before { content: '󠠑'; } /* '\e0811' */
65+
.osm-direction:before { content: '󠠆'; } /* '\e0806' */

‎fontello/demo.html‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -261,25 +261,21 @@ <h1>
261261
</div>
262262
<div id="icons" class="container">
263263
<div class="row">
264-
<div title="Code: 0xe801" class="the-icons span3"><i class="osm-home"></i> <span class="i-name">osm-home</span><span class="i-code">0xe801</span></div>
265-
<div title="Code: 0xe0804" class="the-icons span3"><i class="osm-globe"></i> <span class="i-name">osm-globe</span><span class="i-code">0xe0804</span></div>
264+
<div title="Code: 0xe0801" class="the-icons span3"><i class="osm-home"></i> <span class="i-name">osm-home</span><span class="i-code">0xe0801</span></div>
265+
<div title="Code: 0xe0810" class="the-icons span3"><i class="osm-globe"></i> <span class="i-name">osm-globe</span><span class="i-code">0xe0810</span></div>
266266
<div title="Code: 0xe0803" class="the-icons span3"><i class="osm-link-ext"></i> <span class="i-name">osm-link-ext</span><span class="i-code">0xe0803</span></div>
267-
<div title="Code: 0xe0801" class="the-icons span3"><i class="osm-pin"></i> <span class="i-name">osm-pin</span><span class="i-code">0xe0801</span></div>
267+
<div title="Code: 0xe0804" class="the-icons span3"><i class="osm-pin"></i> <span class="i-name">osm-pin</span><span class="i-code">0xe0804</span></div>
268268
</div>
269269
<div class="row">
270-
<div title="Code: 0xe0808" class="the-icons span3"><i class="osm-location"></i> <span class="i-name">osm-location</span><span class="i-code">0xe0808</span></div>
271-
<div title="Code: 0xe0807" class="the-icons span3"><i class="osm-direction"></i> <span class="i-name">osm-direction</span><span class="i-code">0xe0807</span></div>
272-
<div title="Code: 0xe0800" class="the-icons span3"><i class="osm-link"></i> <span class="i-name">osm-link</span><span class="i-code">0xe0800</span></div>
273-
<div title="Code: 0xe800" class="the-icons span3"><i class="osm-cog"></i> <span class="i-name">osm-cog</span><span class="i-code">0xe800</span></div>
270+
<div title="Code: 0xe0805" class="the-icons span3"><i class="osm-location"></i> <span class="i-name">osm-location</span><span class="i-code">0xe0805</span></div>
271+
<div title="Code: 0xe0802" class="the-icons span3"><i class="osm-link"></i> <span class="i-name">osm-link</span><span class="i-code">0xe0802</span></div>
272+
<div title="Code: 0xe0807" class="the-icons span3"><i class="osm-cog"></i> <span class="i-name">osm-cog</span><span class="i-code">0xe0807</span></div>
273+
<div title="Code: 0xe0808" class="the-icons span3"><i class="osm-zoom-in"></i> <span class="i-name">osm-zoom-in</span><span class="i-code">0xe0808</span></div>
274274
</div>
275275
<div class="row">
276-
<div title="Code: 0xe0805" class="the-icons span3"><i class="osm-cog-alt"></i> <span class="i-name">osm-cog-alt</span><span class="i-code">0xe0805</span></div>
277-
<div title="Code: 0xe0802" class="the-icons span3"><i class="osm-zoom-in"></i> <span class="i-name">osm-zoom-in</span><span class="i-code">0xe0802</span></div>
278-
<div title="Code: 0xe803" class="the-icons span3"><i class="osm-zoom-out"></i> <span class="i-name">osm-zoom-out</span><span class="i-code">0xe803</span></div>
279-
<div title="Code: 0xe802" class="the-icons span3"><i class="osm-left-big"></i> <span class="i-name">osm-left-big</span><span class="i-code">0xe802</span></div>
280-
</div>
281-
<div class="row">
282-
<div title="Code: 0xe0806" class="the-icons span3"><i class="osm-compass"></i> <span class="i-name">osm-compass</span><span class="i-code">0xe0806</span></div>
276+
<div title="Code: 0xe0809" class="the-icons span3"><i class="osm-zoom-out"></i> <span class="i-name">osm-zoom-out</span><span class="i-code">0xe0809</span></div>
277+
<div title="Code: 0xe0811" class="the-icons span3"><i class="osm-left-big"></i> <span class="i-name">osm-left-big</span><span class="i-code">0xe0811</span></div>
278+
<div title="Code: 0xe0806" class="the-icons span3"><i class="osm-direction"></i> <span class="i-name">osm-direction</span><span class="i-code">0xe0806</span></div>
283279
</div>
284280
</div>
285281
<div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>

‎fontello/font/osm.eot‎

-1.05 KB
Binary file not shown.

0 commit comments

Comments
 (0)