Skip to content

Commit d48f863

Browse files
muwoomuwoo
authored
Merge pull request #262 from lumozx/master
优化引导页UI，修复部分文案错误
2 parents a7a85a7 + 9c92e0f commit d48f863

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ This project exists thanks to all the people who contribute. [[Contribute](https
9494
![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png)
9595

9696
## License
97-
This project is licensed under the MIT License - see the [LICENSE.md](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details.
97+
This project is licensed under the MIT License - see the [LICENSE](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details.

‎README.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ This project exists thanks to all the people who contribute. [[Contribute](https
9494
![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png)
9595

9696
## License
97-
This project is licensed under the MIT License - see the [LICENSE.md](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details.
97+
This project is licensed under the MIT License - see the [LICENSE](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details.
9898

‎guide/src/App.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ const netStep = () => {
102102
}
103103
.info {
104104
padding-top: 42px;
105-
margin-left: 178px;
105+
margin-left: 84px;
106106
box-sizing: border-box;
107-
width: 100%;
108107
text-align: left;
109108
position: relative;
109+
align-self: flex-start;
110110
color: @text-color;
111111
.top-icon {
112112
position: absolute;
@@ -147,9 +147,11 @@ const netStep = () => {
147147
background: @primary-color;
148148
color: #fff;
149149
display: flex;
150-
aligin-items: center;
150+
align-items: center;
151151
justify-content: center;
152152
border-radius: 4px;
153+
cursor: pointer;
154+
user-select: none;
153155
}
154156
}
155157

‎public/guide/css/app.5b19f647.css

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

‎public/guide/css/app.8c142cf3.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎public/guide/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>rubick 桌面端开源工具箱</title><script defer="defer" src="js/chunk-vendors.c1874e13.js"></script><script defer="defer" src="js/app.b3377163.js"></script><link href="css/app.8c142cf3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but guide doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
1+
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>rubick 桌面端开源工具箱</title><script defer="defer" src="js/chunk-vendors.c1874e13.js"></script><script defer="defer" src="js/app.c403c1a5.js"></script><link href="css/app.5b19f647.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but guide doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

‎public/guide/js/app.b3377163.js renamed to ‎public/guide/js/app.c403c1a5.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.

‎src/main/common/registerySystemPlugin.ts renamed to ‎src/main/common/registerSystemPlugin.ts

File renamed without changes.

‎src/main/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121

2222
import '../common/utils/localPlugin';
2323

24-
import registerySystemPlugin from './common/registerySystemPlugin';
24+
import registerSystemPlugin from './common/registerSystemPlugin';
2525

2626
class App {
2727
public windowCreator: { init: () => void; getWindow: () => BrowserWindow };
@@ -36,7 +36,7 @@ class App {
3636
if (!gotTheLock) {
3737
app.quit();
3838
} else {
39-
this.systemPlugins = registerySystemPlugin();
39+
this.systemPlugins = registerSystemPlugin();
4040
this.beforeReady();
4141
this.onReady();
4242
this.onRunning();

0 commit comments

Comments
 (0)