Skip to content

Commit

Permalink
Merge pull request #928 from agalwood/hotfix/app_style_20210507
Browse files Browse the repository at this point in the history 
fix: app style
  • Loading branch information
@agalwood
agalwood committed May 7, 2021
2 parents 3aa18e7 + 2beb6f1 commit bc3ea97
Show file tree
Hide file tree
Showing 20 changed files with 230 additions and 248 deletions.
Binary file modified src/renderer/assets/app-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions src/renderer/components/About/AboutPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
</script>

<style lang="scss">
.app-about-dialog {
max-width: 632px;
min-width: 380px;
.el-dialog__header {
padding-top: 0;
padding-bottom: 0;
}
.app-about-dialog {
max-width: 632px;
min-width: 380px;
.el-dialog__header {
padding-top: 0;
padding-bottom: 0;
}
}
</style>
74 changes: 37 additions & 37 deletions src/renderer/components/About/AppInfo.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,45 +49,45 @@
</script>

<style lang="scss">
.app-info {
position: relative;
margin: 8px 0;
.app-version span {
display: inline-block;
vertical-align: bottom;
font-size: $--font-size-large;
margin-left: 20px;
color: $--app-version-color;
line-height: 18px;
}
.app-icon {
position: absolute;
top: 0;
right: 0;
background: transparent url('~@/assets/app-icon.png') center center no-repeat;
background-size: 128px 128px;
width: 128px;
height: 128px;
.app-info {
position: relative;
margin: 8px 0;
.app-version span {
display: inline-block;
vertical-align: bottom;
font-size: $--font-size-large;
margin-left: 20px;
color: $--app-version-color;
line-height: 18px;
}
.app-icon {
position: absolute;
top: 0;
right: 0;
background: transparent url('~@/assets/app-icon.png') center center no-repeat;
background-size: 128px 128px;
width: 128px;
height: 128px;
}
.engine-info {
margin: 50px 35% 0 8px;
h4 {
font-size: $--font-size-base;
font-weight: normal;
color: $--app-engine-title-color;
}
.engine-info {
margin: 50px 35% 0 8px;
h4 {
font-size: $--font-size-base;
font-weight: normal;
color: $--app-engine-title-color;
}
ul {
font-size: 12px;
color: $--app-engine-info-color;
list-style: none;
padding: 0;
line-height: 20px;
@include clearfix();
li {
float: left;
width: 50%;
}
ul {
font-size: 12px;
color: $--app-engine-info-color;
list-style: none;
padding: 0;
line-height: 20px;
@include clearfix();
li {
float: left;
width: 50%;
}
}
}
}
</style>
30 changes: 15 additions & 15 deletions src/renderer/components/About/Copyright.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
</script>

<style lang="scss">
.copyright {
width: 100%;
font-size: $--font-size-small;
a {
color: $--app-copyright-color;
text-decoration: none;
}
}
.copyright-left {
text-align: left;
.copyright {
width: 100%;
font-size: $--font-size-small;
a {
color: $--app-copyright-color;
text-decoration: none;
}
}
.copyright-left {
text-align: left;
}
.copyright-right {
text-align: right;
a {
margin-left: 30px;
}
.copyright-right {
text-align: right;
a {
margin-left: 30px;
}
}
</style>
66 changes: 33 additions & 33 deletions src/renderer/components/Aside/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,40 +64,40 @@
</script>

<style lang="scss">
.aside-inner {
display: flex;
height: 100%;
flex-flow: column;
}
.logo-mini {
margin-top: 40px;
}
.menu {
list-style: none;
padding: 0;
margin: 0 auto;
user-select: none;
cursor: default;
> li {
width: 32px;
height: 32px;
margin-top: 24px;
cursor: pointer;
border-radius: 16px;
transition: background-color 0.25s;
&:hover {
background-color: rgba(255, 255, 255, 0.15);
}
.aside-inner {
display: flex;
height: 100%;
flex-flow: column;
}
.logo-mini {
margin-top: 40px;
}
.menu {
list-style: none;
padding: 0;
margin: 0 auto;
user-select: none;
cursor: default;
> li {
width: 32px;
height: 32px;
margin-top: 24px;
cursor: pointer;
border-radius: 16px;
transition: background-color 0.25s;
&:hover {
background-color: rgba(255, 255, 255, 0.15);
}
svg {
padding: 6px;
color: #fff;
}
}
.top-menu {
flex: 1;
}
.bottom-menu {
margin-bottom: 24px;
svg {
padding: 6px;
color: #fff;
}
}
.top-menu {
flex: 1;
}
.bottom-menu {
margin-bottom: 24px;
}
</style>
6 changes: 1 addition & 5 deletions src/renderer/components/Logo/LogoMini.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@

<script>
export default {
name: 'mo-logo-mini',
components: {
},
methods: {
}
name: 'mo-logo-mini'
}
</script>

Expand Down
3 changes: 0 additions & 3 deletions src/renderer/components/Native/SelectDirectory.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,3 @@
}
}
</script>

<style lang="scss">
</style>
3 changes: 0 additions & 3 deletions src/renderer/components/Native/ShowInFolder.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,3 @@
}
}
</script>

<style lang="scss">
</style>
1 change: 1 addition & 0 deletions src/renderer/components/Preference/Advanced.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@
v-model="form.userAgent">
</el-input>
<el-button-group class="ua-group">
<el-button @click="() => changeUA('aria2')">Aria2</el-button>
<el-button @click="() => changeUA('transmission')">Transmission</el-button>
<el-button @click="() => changeUA('chrome')">Chrome</el-button>
<el-button @click="() => changeUA('du')">du</el-button>
Expand Down
11 changes: 8 additions & 3 deletions src/renderer/components/Preference/Basic.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,21 @@
label: '5 MB/s',
value: '5M'
},
{
label: '8 MB/s',
value: '8M'
},
{
label: '10 MB/s',
value: '10M'
},
{
label: '20 MB/s',
value: '20M'
},
{
label: '30 MB/s',
value: '30M'
}
]
},
Expand Down Expand Up @@ -505,6 +513,3 @@
}
}
</script>

<style lang="scss">
</style>
90 changes: 45 additions & 45 deletions src/renderer/components/Preference/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,59 +17,59 @@
</script>

<style lang="scss">
.form-preference {
padding: 16px 7% 64px 0;
.el-switch__label {
font-weight: normal;
.form-preference {
padding: 16px 7% 64px 0;
.el-switch__label {
font-weight: normal;
color: $--color-text-regular;
&.is-active {
color: $--color-text-regular;
&.is-active {
color: $--color-text-regular;
}
}
.el-checkbox__input.is-checked + .el-checkbox__label {
}
.el-checkbox__input.is-checked + .el-checkbox__label {
color: $--color-text-regular;
}
.el-form-item {
a {
color: $--color-text-regular;
}
.el-form-item {
a {
color: $--color-text-regular;
text-decoration: none;
&:hover {
color: $--color-text-primary;
text-decoration: underline;
}
&:active {
color: $--color-text-primary;
}
text-decoration: none;
&:hover {
color: $--color-text-primary;
text-decoration: underline;
}
}
.el-form-item.el-form-item--mini {
margin-bottom: 32px;
}
.el-form-item__content {
color: $--color-text-regular;
}
.form-item-sub {
margin-bottom: 8px;
&:last-of-type {
margin-bottom: 0;
&:active {
color: $--color-text-primary;
}
}
}
.form-actions {
position: sticky;
bottom: 0;
left: auto;
z-index: 10;
width: -webkit-fill-available;
box-sizing: border-box;
padding: 24px 36px 24px 0;
.el-form-item.el-form-item--mini {
margin-bottom: 32px;
}
.action-link {
cursor: pointer;
color: $--link-color;
&:hover {
color: $--link-hover-color;
text-decoration: underline;
.el-form-item__content {
color: $--color-text-regular;
}
.form-item-sub {
margin-bottom: 8px;
&:last-of-type {
margin-bottom: 0;
}
}
}
.form-actions {
position: sticky;
bottom: 0;
left: auto;
z-index: 10;
width: -webkit-fill-available;
box-sizing: border-box;
padding: 24px 36px 24px 0;
}
.action-link {
cursor: pointer;
color: $--link-color;
&:hover {
color: $--link-hover-color;
text-decoration: underline;
}
}
</style>
2 changes: 0 additions & 2 deletions src/renderer/components/Preference/ThemeSwitcher.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
export default {
name: 'mo-theme-switcher',
components: {
},
props: {
value: {
type: String,
Expand Down
Loading

0 comments on commit bc3ea97

Please sign in to comment.