Skip to content

Commit 26e9fb7

Browse files
committed
* 整理示例工程;更换图标;
1 parent 4f4eadb commit 26e9fb7

13 files changed

Lines changed: 52 additions & 47 deletions

File tree

src/Nlnet.Sharp.Magic.App.Iconfont/Assets/icon_a.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "tmp-旅行",
44
"font_family": "travel",
55
"css_prefix_text": "icon-",
6-
"description": "",
6+
"description": "https://www.iconfont.cn/collections/detail?spm=a313x.user_detail.i1.dc64b3430.7c873a81SACVae&cid=2352",
77
"glyphs": [
88
{
99
"icon_id": "1337291",

src/Nlnet.Sharp.Magic.App.Iconfont/Assets/icon_b.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "tpm-树木",
44
"font_family": "tree",
55
"css_prefix_text": "icon-",
6-
"description": "",
6+
"description": "https://www.iconfont.cn/collections/detail?spm=a313x.user_detail.i1.dc64b3430.2cf93a81wpRmyb&cid=2067",
77
"glyphs": [
88
{
99
"icon_id": "1239661",

src/Nlnet.Sharp.Magic.App.Iconfont/Assets/icon_d.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "临时项目-copy",
44
"font_family": "iconfont",
55
"css_prefix_text": "icon-",
6-
"description": "",
6+
"description": "https://www.iconfont.cn/collections/detail?spm=a313x.user_detail.i1.dc64b3430.63d53a81RbDwsw&cid=37310",
77
"glyphs": [
88
{
99
"icon_id": "25997499",

src/Nlnet.Sharp.Magic.App.Iconfont/Assets/icon_e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "tmp-体育",
44
"font_family": "sport",
55
"css_prefix_text": "icon-",
6-
"description": "",
6+
"description": "https://www.iconfont.cn/collections/detail?spm=a313x.user_detail.i1.dc64b3430.59053a81HelXTH&cid=1911",
77
"glyphs": [
88
{
99
"icon_id": "1190484",

src/Nlnet.Sharp.Magic.App/App.axaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@
88
</Application.Styles>
99

1010
<Application.Resources>
11-
<!--This is not good because if you change the icon file's name or location, this goes wrong.-->
12-
<FontFamily x:Key="IconAFamily">avares://Nlnet.Sharp.Magic.App.Iconfont/Assets/icon_a.ttf#travel</FontFamily>
11+
<ResourceDictionary>
12+
<ResourceDictionary.MergedDictionaries>
13+
<ResourceInclude Source="avares://Nlnet.Avalonia.Senior/Assets/Themes.axaml" />
14+
</ResourceDictionary.MergedDictionaries>
15+
16+
<!--This is not good because if you change the icon file's name or location, this goes wrong.-->
17+
<FontFamily x:Key="IconAFamily">avares://Nlnet.Sharp.Magic.App.Iconfont/Assets/icon_a.ttf#travel</FontFamily>
18+
</ResourceDictionary>
1319
</Application.Resources>
1420

1521
</Application>
-6.13 KB
Binary file not shown.
-16.7 KB
Binary file not shown.

src/Nlnet.Sharp.Magic.App/Assets/Magic.Clean.svg

Lines changed: 0 additions & 18 deletions
This file was deleted.
-2.52 KB
Binary file not shown.
-6.66 KB
Loading

0 commit comments

Comments
 (0)