Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
xuqi
9 years ago
Commit
d48ebadaf2b7d2db97326aa578a605a493ffb637
1 parent
d58f09db
conflict fonts replace
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
35 deletions
web-static/font/iconfont.eot
web-static/font/iconfont.svg
web-static/font/iconfont.ttf
web-static/font/iconfont.woff
web-static/font/iconfont.eot
View file @
d48ebad
No preview for this file type
web-static/font/iconfont.svg
View file @
d48ebad
...
...
@@ -2,11 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg
xmlns=
"http://www.w3.org/2000/svg"
>
<metadata>
<<<<<<
< HEAD
Created
by
FontForge
20120731
at
Fri
Dec
4
15:54:33
2015
=
======
Created
by
FontForge
20120731
at
Thu
Dec
3
17:36:03
2015
>
>>>>>> feature/product
Created by FontForge 20120731 at Thu Dec 10 11:10:57 2015
By Ads
</metadata>
<defs>
...
...
@@ -20,14 +16,10 @@ Created by FontForge 20120731 at Thu Dec 3 17:36:03 2015
ascent=
"896"
descent=
"-128"
x-height=
"792"
bbox=
"0 -214 1172.
06
864"
bbox=
"0 -214 1172.
1
864"
underline-thickness=
"50"
underline-position=
"-100"
<<<<<<<
HEAD
unicode-range=
"U+0078-E619"
=======
unicode-range=
"U+0078-E618"
>
>>>>>> feature/product
unicode-range=
"U+0078-E61B"
/>
<missing-glyph
horiz-adv-x=
"374"
d=
"M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z"
/>
...
...
@@ -56,40 +48,40 @@ d="M819 739v-878l-614 439z" />
<glyph
glyph-name=
"uniE606"
unicode=
""
d=
"M205 -139v878l614 -439z"
/>
<glyph
glyph-name=
"uniE607"
unicode=
""
d=
"M786 705l-415 -405l415 -404q19 -18 19 -44t-19 -4
4.5t-46 -18.5t-46 18
l-461 449q-19 18 -19 44.5t19 44.5l461 449q19 18 46 18t46 -18.5t19 -44.5t-19 -44zM786 705z"
/>
d=
"M786 705l-415 -405l415 -404q19 -18 19 -44t-19 -4
5q-12 -12 -29 -16t-33.5 0t-29.5 16
l-461 449q-19 18 -19 44.5t19 44.5l461 449q19 18 46 18t46 -18.5t19 -44.5t-19 -44zM786 705z"
/>
<glyph
glyph-name=
"uniE608"
unicode=
""
d=
"M233 705q-19 18 -19 44t19 44.5t46 18.5t46 -18l461 -449q19 -18 19 -44.5t-19 -44.5l-461 -449q-19 -18 -46 -18t-46 18.5t-19 44.5t19 44l416 404zM233 705z"
/>
<glyph
glyph-name=
"uniE609"
unicode=
""
d=
"M577 -214q-17 0 -30 11q-16 12 -18 31.5t11 35.5l357 443l-350 404q-13 15 -11.5 34.5t16.5 32.5
t34.5 11.5t32.5 -16
.5l376 -433q12 -13 12 -30.5t-11 -30.5l-382 -475q-14 -18 -37 -18z"
/>
d=
"M577 -214q-17 0 -30 11q-16 12 -18 31.5t11 35.5l357 443l-350 404q-13 15 -11.5 34.5t16.5 32.5
q9 9 22 11.5t25 -2t20 -14
.5l376 -433q12 -13 12 -30.5t-11 -30.5l-382 -475q-14 -18 -37 -18z"
/>
<glyph
glyph-name=
"uniE60A"
unicode=
""
d=
"M447 -214q-23 0 -37 18l-382 475q-
11 13 -11 30.5t12 30.5l376 433q13 15 32.5 16.5t34.5 -11.5t16.5 -32.5t-11.5 -34.5l-350 -404l357 -443q13 -16 11 -35.5t-18 -31.5
q-13 -11 -30 -11z"
/>
d=
"M447 -214q-23 0 -37 18l-382 475q-
8 8 -10 19t0.5 22t10.5 20l376 433q13 15 32.5 16.5t34.5 -11.5t16.5 -32.5t-11.5 -34.5l-350 -404l357 -443q9 -10 10.5 -22.5t-3 -24.5t-14.5 -20
q-13 -11 -30 -11z"
/>
<glyph
glyph-name=
"uniE60B"
unicode=
""
d=
"M284 -69q-
14 -14 -14 -33t13.5 -32.5t32.5 -13.5t32 14l397 401q13 14 13 33t-13 33l-397 401q-13 14 -32 14t-32.5 -13.5t-13.5 -32.5t13 -33
l351 -369l-350 -369v0zM284 -69z"
/>
d=
"M284 -69q-
9 -9 -12.5 -21t0 -24t12.5 -20q13 -14 32 -14t32 14l397 401q5 6 8.5 12.5t4 13.5t0 14t-4 13.5t-8.5 12.5l-397 401q-13 14 -32 14t-32 -14q-6 -5 -9 -11.5t-4 -13.5t0 -14t4 -14t8 -12
l351 -369l-350 -369v0zM284 -69z"
/>
<glyph
glyph-name=
"uniE60C"
unicode=
""
d=
"M745 669q13 14 13 33t-13
.5 32.5t-32.5 13.5t-32 -14
l-396 -401q-14 -14 -14 -33t14 -33l396 -401q14 -14 32.5 -14t32 13.5t13.5 32.5t-13 33l-351 369l351 369v0zM745 669z"
/>
d=
"M745 669q13 14 13 33t-13
32q-9 9 -21 12.5t-23.5 0t-20.5 -12.5
l-396 -401q-14 -14 -14 -33t14 -33l396 -401q14 -14 32.5 -14t32 13.5t13.5 32.5t-13 33l-351 369l351 369v0zM745 669z"
/>
<glyph
glyph-name=
"uniE60D"
unicode=
""
d=
"M512.5
654q-12.5
0
-21.5
-9t-9
-22v-311h-249q-12
0
-21.5
-9t-9.5
-22t9.5
-22t21.5
-9h280q12
0
21.5
9t9.5
22v342q0
13
-9.5
22t-22
9zM513
778q-101
0
-193
-39.5t-158.5
-105.5t-106
-158t-39.5
-193t39.5
-193t106
-158.5t158.5
-105.5t193
-39t192.5
39
t158
105.5t106
158.5t39.5
193t-39.5
193t-106
158t-158
105.5t-192.5
39.5zM513
-152q-118
0
-218
58t-158.5
158t-58.5
218t58.5
218t158.5
158t218
58t218
-58t158
-158t58
-218t-58
-218t-158
-158t-218
-58z"
/>
d=
"M513
654q-13
0
-22
-9t-9
-22v-311h-249q-6
0
-11.5
-2.5t-10
-6.5t-7
-10t-2.5
-12q0
-8
4.5
-15.5t11.5
-11.5t15
-4h280q12
0
21.5
9t9.5
22v342q0
8
-4.5
15.5t-11.5
11.5t-15
4zM513
778q-81
0
-157
-25t-137
-71t-107
-107t-71
-136.5t-25
-156.5q0
-101
39.5
-193
t106
-158.5t158.5
-105.5t193
-39t192.5
39t158
105.5t106
158.5t39.5
193t-39.5
193t-106
158t-158
105.5t-192.5
39.5zM513
-152q-118
0
-218
58t-158.5
158t-58.5
218q0
88
34.5
168.5t92.5
138.5t138.5
92.5t169.5
34.5q59
0
115
-15.5t103.5
-43.5t88
-68t68.5
-88
t43.5
-104t15.5
-115q0
-118
-58
-218t-158
-158t-218
-58z"
/>
<glyph
glyph-name=
"uniE60E"
unicode=
""
d=
"M710 300l-473 474l38 38l512 -512l-512 -512l-38 38z"
/>
<glyph
glyph-name=
"uniE60F"
unicode=
""
d=
"M314 300l473 -474l-38 -38l-512 512l512 512l38 -38z"
/>
<glyph
glyph-name=
"uniE610"
unicode=
""
d=
"M797 135
.5q0 -7.5 -5 -13.5l-29 -28q-6 -6 -13.5 -6t-12.5 6l-225 224l-224 -224q-6 -6 -13.5 -6t-13.5 6l-28 28q-6 6 -6 13.5t6 13.5l266 266q6 6 13.5 6t12.5 -6l267 -266q5 -6 5 -13.5
z"
/>
d=
"M797 135
q0 -7 -5 -13l-29 -28q-6 -6 -13.5 -6t-12.5 6l-225 224l-224 -224q-6 -6 -13.5 -6t-13.5 6l-28 28q-6 6 -6 13.5t6 13.5l266 266q6 6 13.5 6t12.5 -6l267 -266q5 -6 5 -14
z"
/>
<glyph
glyph-name=
"uniE611"
unicode=
""
d=
"M892
41l-236
236q54
77
54
172q0
124
-87
211t-210.5
87t-211
-87t-87.5
-211t87.5
-211t210.5
-87q95
0
173
55l236
-236q16
-17
38
-18t37
14t14
37t-18
38zM213
449q0
82
58.5
140.5t140.5
58.5t140.5
-58.5t58.5
-140.5t-58.5
-140.5t-140.5
-58.5t-140.5
58.5
t-58.5
140.5z"
/>
d=
"M892
41l-236
236q54
77
54
172q0
81
-39.5
150t-108.5
108.5t-150
39.5q-123
0
-210.5
-87t-87.5
-211t87.5
-211t210.5
-87q95
0
173
55l236
-236q16
-17
38
-18t37
14q10
10
12.5
23.5t-1.5
27t-15
24.5zM213
449q0
82
58.5
140.5t140.5
58.5t140.5
-58.5t58.5
-140.5
t-58.5
-140.5t-140.5
-58.5t-140.5
58.5t-58.5
140.5z"
/>
<glyph
glyph-name=
"uniE612"
unicode=
""
d=
"M939
-212h-854q-35
0
-60
25t-25
60v854q0
35
25
60t60
25h854q35
0
60
-25t25
-60v-854q0
-35
-25
-60t-60
-25zM939
705q0
10
-6
16t-16
6h-810q-10
0
-16
-6t-6
-16v-810q0
-10
6
-16t16
-6h810q10
0
16
6t6
16v810zM457
99q-10
-12
-30.5
-12t-29.5
12l-171
171
q-13
10
-13
30q0
18
12.5
30.5t30.5
12.5q20
0
30
-13l141
-141l311
312q13
12
30
12q18
0
30.5
-12.5t12.5
-29.5q0
-21
-13
-30z"
/>
d=
"M939
-212h-854q-23
0
-42.5
11.5t-31
31t-11.5
42.5v854q0
35
25
60t60
25h854q23
0
42.5
-11.5t31
-31t11.5
-42.5v-854q0
-35
-25
-60t-60
-25zM939
705q0
10
-6
16t-16
6h-810q-10
0
-16
-6t-6
-16v-810q0
-7
3
-11.5t7.5
-7.5t11.5
-3h810q10
0
16
6t6
16v810z
M457
99q-5
-6
-13
-9t-17
-3q-21
0
-30
12l-171
171q-13
10
-13
30q0
18
12.5
30.5t30.5
12.5q10
0
17.5
-3.5t12.5
-9.5l141
-141l311
312q13
12
30
12q18
0
30.5
-12.5t12.5
-29.5q0
-21
-13
-30z"
/>
<glyph
glyph-name=
"uniE613"
unicode=
""
d=
"M877 812h-730q-61 0 -104 -43t-43 -104v-730q0 -61 43 -104t104 -43h730q61 0 104 43t43 104v730q0 61 -43 104t-104 43zM939 -65q0 -26 -18 -44t-44 -18h-730q-26 0 -44 18t-18 44v730q0
26 18 44t44 18
h730q26 0 44 -18t18 -44v-730z"
/>
d=
"M877 812h-730q-61 0 -104 -43t-43 -104v-730q0 -61 43 -104t104 -43h730q61 0 104 43t43 104v730q0 61 -43 104t-104 43zM939 -65q0 -26 -18 -44t-44 -18h-730q-26 0 -44 18t-18 44v730q0
17 8.5 31t22.5 22.5t31 8.5
h730q26 0 44 -18t18 -44v-730z"
/>
<glyph
glyph-name=
"uniE614"
unicode=
""
d=
"M160 996zM865 247q0 -18 -13 -31l-308 -308q-13 -13 -31 -13t-31 13l-309 308q-13 13 -13 31t13.5 31t30.5 13h617q18 0 31 -13t13 -31zM865 511q0 -18 -13 -31t-31 -13h-617q-18 0 -31 13t-13 31t13 31l309 309q13 13 31 13t31 -13l308 -309q13 -13 13 -31z"
/>
<glyph
glyph-name=
"uniE615"
unicode=
""
d=
"M704 569l-41 39l-343 -320l343 -320l41 39l-301 281z"
/>
<glyph
glyph-name=
"uniE616"
unicode=
""
horiz-adv-x=
"1173"
<<<<<<<
HEAD
d=
"M586
588q-64
150
-188
203q-114
47
-222
-7q-112
-56
-155
-192q-20
-67
-21
-144q0
-41
9
-78.5t24
-66.5t39
-57.5t47
-48.5t55.5
-43t56.5
-38t58.5
-35.5t53.5
-33.5q63
-42
118
-94.5t86.5
-95t39.5
-69.5q4
19
25.5
50t53.5
66t75
74t88
71q21
15
53.5
35.5t58
36
t57
38t55
43t47
48t39
56.5t25
66.5t8.5
78.5q0
75
-19.5
138t-52.5
105.5t-76.5
70.5t-91
37.5t-98
1t-96
-34.5t-85.5
-72.5t-67
-108.5z"
/>
<glyph
glyph-name=
"uniE617"
unicode=
""
...
...
@@ -100,15 +92,10 @@ q0 -24 -9.5 -42t-24.5 -31t-33.5 -20t-35.5 -7h-394q-15 0 -33 8.5t-33.5 23t-26.5 3
q-21
0
-35.5
-14.5t-14.5
-35.5t14.5
-35.5t35.5
-14.5h299zM714
374q0
21
-14.5
36t-35.5
15h-299q-21
0
-35.5
-15t-14.5
-36t14.5
-35t35.5
-14h299q21
0
35.5
14t14.5
35zM714
374z"
/>
<glyph
glyph-name=
"uniE619"
unicode=
""
d=
"M512 515q47 0 88 -18t72 -49t49 -72t18 -89q0 -23 -4.5 -45t-13.5 -42q-18 -41 -49 -72t-72 -49q-20 -9 -42 -13.5t-46 -4.5q-47 0 -88 18t-72 49t-49 72t-18 87q0 48 18 89t49 72t72 49t88 18v0zM512 515z"
/>
=======
d="M586 588q-28 65 -69 113t-86.5 73.5t-96 34t-97.5 -2t-90 -39.5t-75.5 -73t-51.5 -107.5t-20 -138.5q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q93 -61 162 -138.5t82 -120.5q10 39 81.5 118.5t160.5 142.5q24 17 71.5 47
t79 50.5t71.5 54.5t64 67t41 81t16 102q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" />
<glyph
glyph-name=
"uniE617"
unicode=
""
d=
"M500 775l-348 -298q-16 -14 -16 -35v-386q0 -25 17.5 -42.5t42.5 -17.5h197v257h238v-257h197q25 0 42.5 17.5t17.5 42.5v386q0 21 -16 35l-348 298q-12 10 -24 0z"
/>
<glyph
glyph-name=
"uniE618"
unicode=
""
horiz-adv-x=
"1000"
d=
"M751
670q21
-20
34
-33t19.5
-22.5t8.5
-16t2
-10.5v-13h-119q-8
0
-14
6t-10
14t-6
16.5t-2
12.5v100h3q6
0
13
-2t15.5
-8t22
-16t33.5
-28zM614
624q0
-16
5
-33.5t15
-32t26
-24t38
-9.5h117v-451q0
-24
-9.5
-42t-24.5
-31t-33.5
-20t-35.5
-7h-394q-15
0
-33
8.5
t-33.5
23t-26
33t-10.5
38.5v543q0
17
7.5
35t21
33.5t30
25.5t35.5
10h305v-100zM664
125q21
0
35.5
14.5t14.5
35.5t-14.5
35.5t-35.5
14.5h-299q-21
0
-35.5
-14.5t-14.5
-35.5t14.5
-35.5t35.5
-14.5h299zM714
374q0
21
-14.5
36t-35.5
15h-299q-21
0
-35.5
-15
t-14.5
-36t14.5
-35t35.5
-14h299q21
0
35.5
14t14.5
35zM714
374z"
/>
>>>>>>> feature/product
<glyph
glyph-name=
"uniE61A"
unicode=
""
d=
"M903 493l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65z"
/>
<glyph
glyph-name=
"uniE61B"
unicode=
""
d=
"M505
253l2
-2q2
-1
4
-1l3
1l430
364q2
2
1
6l-2
2q-1
1
-3
1h-435h-424q-2
0
-3
-1l-2
-2l1
-6zM72
585q-3
2
-6
0l-3
-4v-584q0
-4
3.5
-5t5.5
1l288
346zM953
585h-5l-288
-246l287
-346q3
-2
6
-1t3
5v584q0
3
-3
4zM641
322l-131
-111l-5
5l-125
103l-275
-328
q-2
-3
-1
-6l2
-2q1
-1
3
-1h396h407q4
0
5
3t-1
6z"
/>
</font>
</defs></svg>
...
...
web-static/font/iconfont.ttf
View file @
d48ebad
No preview for this file type
web-static/font/iconfont.woff
View file @
d48ebad
No preview for this file type
Please
register
or
login
to post a comment