Skip to content

Commit bc3ea97

Browse files
agalwoodagalwood
authored
Merge pull request #928 from agalwood/hotfix/app_style_20210507
fix: app style
2 parents 3aa18e7 + 2beb6f1 commit bc3ea97

20 files changed

+230
-248
lines changed

‎src/renderer/assets/app-icon.png

-2.26 KB
Loading

‎src/renderer/components/About/AboutPanel.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
</script>
5555

5656
<style lang="scss">
57-
.app-about-dialog {
58-
max-width: 632px;
59-
min-width: 380px;
60-
.el-dialog__header {
61-
padding-top: 0;
62-
padding-bottom: 0;
63-
}
57+
.app-about-dialog {
58+
max-width: 632px;
59+
min-width: 380px;
60+
.el-dialog__header {
61+
padding-top: 0;
62+
padding-bottom: 0;
6463
}
64+
}
6565
</style>

‎src/renderer/components/About/AppInfo.vue

+37-37
Original file line numberDiff line numberDiff line change
@@ -49,45 +49,45 @@
4949
</script>
5050

5151
<style lang="scss">
52-
.app-info {
53-
position: relative;
54-
margin: 8px 0;
55-
.app-version span {
56-
display: inline-block;
57-
vertical-align: bottom;
58-
font-size: $--font-size-large;
59-
margin-left: 20px;
60-
color: $--app-version-color;
61-
line-height: 18px;
62-
}
63-
.app-icon {
64-
position: absolute;
65-
top: 0;
66-
right: 0;
67-
background: transparent url('~@/assets/app-icon.png') center center no-repeat;
68-
background-size: 128px 128px;
69-
width: 128px;
70-
height: 128px;
52+
.app-info {
53+
position: relative;
54+
margin: 8px 0;
55+
.app-version span {
56+
display: inline-block;
57+
vertical-align: bottom;
58+
font-size: $--font-size-large;
59+
margin-left: 20px;
60+
color: $--app-version-color;
61+
line-height: 18px;
62+
}
63+
.app-icon {
64+
position: absolute;
65+
top: 0;
66+
right: 0;
67+
background: transparent url('~@/assets/app-icon.png') center center no-repeat;
68+
background-size: 128px 128px;
69+
width: 128px;
70+
height: 128px;
71+
}
72+
.engine-info {
73+
margin: 50px 35% 0 8px;
74+
h4 {
75+
font-size: $--font-size-base;
76+
font-weight: normal;
77+
color: $--app-engine-title-color;
7178
}
72-
.engine-info {
73-
margin: 50px 35% 0 8px;
74-
h4 {
75-
font-size: $--font-size-base;
76-
font-weight: normal;
77-
color: $--app-engine-title-color;
78-
}
79-
ul {
80-
font-size: 12px;
81-
color: $--app-engine-info-color;
82-
list-style: none;
83-
padding: 0;
84-
line-height: 20px;
85-
@include clearfix();
86-
li {
87-
float: left;
88-
width: 50%;
89-
}
79+
ul {
80+
font-size: 12px;
81+
color: $--app-engine-info-color;
82+
list-style: none;
83+
padding: 0;
84+
line-height: 20px;
85+
@include clearfix();
86+
li {
87+
float: left;
88+
width: 50%;
9089
}
9190
}
9291
}
92+
}
9393
</style>

‎src/renderer/components/About/Copyright.vue

+15-15
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929
</script>
3030

3131
<style lang="scss">
32-
.copyright {
33-
width: 100%;
34-
font-size: $--font-size-small;
35-
a {
36-
color: $--app-copyright-color;
37-
text-decoration: none;
38-
}
39-
}
40-
.copyright-left {
41-
text-align: left;
32+
.copyright {
33+
width: 100%;
34+
font-size: $--font-size-small;
35+
a {
36+
color: $--app-copyright-color;
37+
text-decoration: none;
4238
}
39+
}
40+
.copyright-left {
41+
text-align: left;
42+
}
4343
44-
.copyright-right {
45-
text-align: right;
46-
a {
47-
margin-left: 30px;
48-
}
44+
.copyright-right {
45+
text-align: right;
46+
a {
47+
margin-left: 30px;
4948
}
49+
}
5050
</style>

‎src/renderer/components/Aside/Index.vue

+33-33
Original file line numberDiff line numberDiff line change
@@ -64,40 +64,40 @@
6464
</script>
6565

6666
<style lang="scss">
67-
.aside-inner {
68-
display: flex;
69-
height: 100%;
70-
flex-flow: column;
71-
}
72-
.logo-mini {
73-
margin-top: 40px;
74-
}
75-
.menu {
76-
list-style: none;
77-
padding: 0;
78-
margin: 0 auto;
79-
user-select: none;
80-
cursor: default;
81-
> li {
82-
width: 32px;
83-
height: 32px;
84-
margin-top: 24px;
85-
cursor: pointer;
86-
border-radius: 16px;
87-
transition: background-color 0.25s;
88-
&:hover {
89-
background-color: rgba(255, 255, 255, 0.15);
90-
}
67+
.aside-inner {
68+
display: flex;
69+
height: 100%;
70+
flex-flow: column;
71+
}
72+
.logo-mini {
73+
margin-top: 40px;
74+
}
75+
.menu {
76+
list-style: none;
77+
padding: 0;
78+
margin: 0 auto;
79+
user-select: none;
80+
cursor: default;
81+
> li {
82+
width: 32px;
83+
height: 32px;
84+
margin-top: 24px;
85+
cursor: pointer;
86+
border-radius: 16px;
87+
transition: background-color 0.25s;
88+
&:hover {
89+
background-color: rgba(255, 255, 255, 0.15);
9190
}
92-
svg {
93-
padding: 6px;
94-
color: #fff;
95-
}
96-
}
97-
.top-menu {
98-
flex: 1;
9991
}
100-
.bottom-menu {
101-
margin-bottom: 24px;
92+
svg {
93+
padding: 6px;
94+
color: #fff;
10295
}
96+
}
97+
.top-menu {
98+
flex: 1;
99+
}
100+
.bottom-menu {
101+
margin-bottom: 24px;
102+
}
103103
</style>

‎src/renderer/components/Logo/LogoMini.vue

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010

1111
<script>
1212
export default {
13-
name: 'mo-logo-mini',
14-
components: {
15-
},
16-
methods: {
17-
}
13+
name: 'mo-logo-mini'
1814
}
1915
</script>
2016

‎src/renderer/components/Native/SelectDirectory.vue

-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@
3232
}
3333
}
3434
</script>
35-
36-
<style lang="scss">
37-
</style>

‎src/renderer/components/Native/ShowInFolder.vue

-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@
3131
}
3232
}
3333
</script>
34-
35-
<style lang="scss">
36-
</style>

‎src/renderer/components/Preference/Advanced.vue

+1
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@
255255
v-model="form.userAgent">
256256
</el-input>
257257
<el-button-group class="ua-group">
258+
<el-button @click="() => changeUA('aria2')">Aria2</el-button>
258259
<el-button @click="() => changeUA('transmission')">Transmission</el-button>
259260
<el-button @click="() => changeUA('chrome')">Chrome</el-button>
260261
<el-button @click="() => changeUA('du')">du</el-button>

‎src/renderer/components/Preference/Basic.vue

+8-3
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,21 @@
392392
label: '5 MB/s',
393393
value: '5M'
394394
},
395+
{
396+
label: '8 MB/s',
397+
value: '8M'
398+
},
395399
{
396400
label: '10 MB/s',
397401
value: '10M'
398402
},
399403
{
400404
label: '20 MB/s',
401405
value: '20M'
406+
},
407+
{
408+
label: '30 MB/s',
409+
value: '30M'
402410
}
403411
]
404412
},
@@ -505,6 +513,3 @@
505513
}
506514
}
507515
</script>
508-
509-
<style lang="scss">
510-
</style>

‎src/renderer/components/Preference/Index.vue

+45-45
Original file line numberDiff line numberDiff line change
@@ -17,59 +17,59 @@
1717
</script>
1818

1919
<style lang="scss">
20-
.form-preference {
21-
padding: 16px 7% 64px 0;
22-
.el-switch__label {
23-
font-weight: normal;
20+
.form-preference {
21+
padding: 16px 7% 64px 0;
22+
.el-switch__label {
23+
font-weight: normal;
24+
color: $--color-text-regular;
25+
&.is-active {
2426
color: $--color-text-regular;
25-
&.is-active {
26-
color: $--color-text-regular;
27-
}
2827
}
29-
.el-checkbox__input.is-checked + .el-checkbox__label {
28+
}
29+
.el-checkbox__input.is-checked + .el-checkbox__label {
30+
color: $--color-text-regular;
31+
}
32+
.el-form-item {
33+
a {
3034
color: $--color-text-regular;
31-
}
32-
.el-form-item {
33-
a {
34-
color: $--color-text-regular;
35-
text-decoration: none;
36-
&:hover {
37-
color: $--color-text-primary;
38-
text-decoration: underline;
39-
}
40-
&:active {
41-
color: $--color-text-primary;
42-
}
35+
text-decoration: none;
36+
&:hover {
37+
color: $--color-text-primary;
38+
text-decoration: underline;
4339
}
44-
}
45-
.el-form-item.el-form-item--mini {
46-
margin-bottom: 32px;
47-
}
48-
.el-form-item__content {
49-
color: $--color-text-regular;
50-
}
51-
.form-item-sub {
52-
margin-bottom: 8px;
53-
&:last-of-type {
54-
margin-bottom: 0;
40+
&:active {
41+
color: $--color-text-primary;
5542
}
5643
}
5744
}
58-
.form-actions {
59-
position: sticky;
60-
bottom: 0;
61-
left: auto;
62-
z-index: 10;
63-
width: -webkit-fill-available;
64-
box-sizing: border-box;
65-
padding: 24px 36px 24px 0;
45+
.el-form-item.el-form-item--mini {
46+
margin-bottom: 32px;
6647
}
67-
.action-link {
68-
cursor: pointer;
69-
color: $--link-color;
70-
&:hover {
71-
color: $--link-hover-color;
72-
text-decoration: underline;
48+
.el-form-item__content {
49+
color: $--color-text-regular;
50+
}
51+
.form-item-sub {
52+
margin-bottom: 8px;
53+
&:last-of-type {
54+
margin-bottom: 0;
7355
}
7456
}
57+
}
58+
.form-actions {
59+
position: sticky;
60+
bottom: 0;
61+
left: auto;
62+
z-index: 10;
63+
width: -webkit-fill-available;
64+
box-sizing: border-box;
65+
padding: 24px 36px 24px 0;
66+
}
67+
.action-link {
68+
cursor: pointer;
69+
color: $--link-color;
70+
&:hover {
71+
color: $--link-hover-color;
72+
text-decoration: underline;
73+
}
74+
}
7575
</style>

‎src/renderer/components/Preference/ThemeSwitcher.vue

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
2020
export default {
2121
name: 'mo-theme-switcher',
22-
components: {
23-
},
2422
props: {
2523
value: {
2624
type: String,

0 commit comments

Comments
 (0)