Skip to content

Commit 24f4f72

Browse files
author
ssongliu
committed
style: Adjust the home page recommended application style
1 parent 3028777 commit 24f4f72

18 files changed

Lines changed: 48 additions & 49 deletions

File tree

core/app/service/upgrade.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,9 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
173173
global.CONF.Base.Version = req.Version
174174
_ = settingRepo.Update("SystemStatus", "Free")
175175

176-
go func() {
177-
_, _ = cmd.ExecWithTimeOut("systemctl daemon-reload && systemctl restart 1pane-agent.service", 1*time.Minute)
178-
}()
179-
_, _ = cmd.ExecWithTimeOut("systemctl daemon-reload && systemctl restart 1panel-core.service", 1*time.Minute)
176+
_, _ = cmd.ExecWithTimeOut("systemctl daemon-reload", 30*time.Second)
177+
_, _ = cmd.ExecWithTimeOut("systemctl restart 1pane-agent.service", 1*time.Second)
178+
_, _ = cmd.ExecWithTimeOut("systemctl restart 1panel-core.service", 1*time.Second)
180179
}()
181180
return nil
182181
}

frontend/src/assets/iconfont/iconfont.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@font-face {
22
font-family: "iconfont"; /* Project id 4776196 */
3-
src: url('iconfont.woff2?t=1742467026147') format('woff2'),
4-
url('iconfont.woff?t=1742467026147') format('woff'),
5-
url('iconfont.ttf?t=1742467026147') format('truetype'),
6-
url('iconfont.svg?t=1742467026147#iconfont') format('svg');
3+
src: url('iconfont.woff2?t=1743473205128') format('woff2'),
4+
url('iconfont.woff?t=1743473205128') format('woff'),
5+
url('iconfont.ttf?t=1743473205128') format('truetype'),
6+
url('iconfont.svg?t=1743473205128#iconfont') format('svg');
77
}
88

99
.iconfont {
@@ -14,6 +14,10 @@
1414
-moz-osx-font-smoothing: grayscale;
1515
}
1616

17+
.p-huobao1:before {
18+
content: "\e604";
19+
}
20+
1721
.p-gerenzhongxin1:before {
1822
content: "\e61e";
1923
}

frontend/src/assets/iconfont/iconfont.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/assets/iconfont/iconfont.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
"css_prefix_text": "p-",
66
"description": "",
77
"glyphs": [
8+
{
9+
"icon_id": "29971586",
10+
"name": "火爆",
11+
"font_class": "huobao1",
12+
"unicode": "e604",
13+
"unicode_decimal": 58884
14+
},
815
{
916
"icon_id": "10199157",
1017
"name": "个人中心",

frontend/src/assets/iconfont/iconfont.svg

Lines changed: 2 additions & 0 deletions
Loading
288 Bytes
Binary file not shown.
180 Bytes
Binary file not shown.
220 Bytes
Binary file not shown.

frontend/src/lang/modules/en.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3219,14 +3219,14 @@ const message = {
32193219
nodeInfo: 'Node Information',
32203220
nodeSyncHelper: 'Node information synchronization will sync the following information:',
32213221
nodeSyncHelper1: '1. Public backup account information',
3222-
nodeSyncHelper2: '2. Overview page recommended application information',
3223-
nodeSyncHelper3: '3. Connection information between the main node and sub-nodes',
3222+
nodeSyncHelper2: '2. Connection information between the main node and sub-nodes',
32243223
panelExist:
32253224
'Detected that there is already 1panel service on this node. Adding this node will use the original service port and installation directory of 1panel. Do you want to continue?',
32263225
coreExist:
32273226
'Detected that there is already 1panel-core service on this node. Unable to add this node, please check and try again!',
32283227
agentExist:
32293228
'Detected that the 1panel-agent service already exists on this node. Continuing to add will retain the node data and only replace the 1panel-agent service. Do you want to continue?',
3229+
errLicense: 'The license bound to this node is unavailable. Please check and try again!',
32303230
reinstallHelper: 'Reinstall node {0}, do you want to continue?',
32313231
unhealthyCheck: 'Abnormal Check',
32323232
fixOperation: 'Fix Operation',

frontend/src/lang/modules/ja.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3074,15 +3074,15 @@ const message = {
30743074
nodeInfo: 'ノード情報',
30753075
nodeSyncHelper: 'ノード情報の同期は、以下の情報を同期します:',
30763076
nodeSyncHelper1: '1. 公共のバックアップアカウント情報',
3077-
nodeSyncHelper2: '2. 概要ページの推奨アプリ情報',
3078-
nodeSyncHelper3: '3. 主ノードとサブノードの接続情報',
3077+
nodeSyncHelper2: '2. 主ノードとサブノードの接続情報',
30793078

30803079
panelExist:
30813080
'このノードに既に1panelサービスが存在します。このノードを追加すると、1panelの元のサービスポートとインストールディレクトリが使用されます。続行しますか?',
30823081
coreExist:
30833082
'このノードに既に1panel-coreサービスが存在します。このノードを追加できません。確認して再試行してください!',
30843083
agentExist:
30853084
'このノードに1panel-agentサービスが既に存在することが検出されました。追加を続行すると、ノードデータは保持され、1panel-agentサービスのみが置き換えられます。続行しますか?',
3085+
errLicense: 'このノードにバインドされたライセンスが利用できません。確認して再試行してください!',
30863086
reinstallHelper: 'ノード{0}を再インストールします。続行しますか?',
30873087
unhealthyCheck: '異常チェック',
30883088
fixOperation: '修正操作',

0 commit comments

Comments
 (0)