Compare commits

...

6 Commits

Author SHA1 Message Date
Dr_rOot 166aba7747 chore: bump version v1.6.10 2021-05-07 23:22:26 +08:00
Dr_rOot bc3ea97780 Merge pull request #928 from agalwood/hotfix/app_style_20210507
fix: app style
2021-05-07 22:37:43 +08:00
Dr_rOot 2beb6f14a8 chore: update app info icon 2021-05-07 21:49:32 +08:00
Dr_rOot 5d8566a934 feat: mock ua add more ua options 2021-05-07 21:36:52 +08:00
Dr_rOot 84b002d513 feat: add more speed options 2021-05-07 21:25:29 +08:00
Dr_rOot a4fb082088 refactor: style code format 2021-05-07 21:25:04 +08:00
21 changed files with 233 additions and 251 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Motrix",
"version": "1.6.9",
"version": "1.6.10",
"description": "A full-featured download manager",
"homepage": "https://motrix.app",
"author": {
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

+7 -7
View File
@@ -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>
+37 -37
View File
@@ -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-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;
}
.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;
}
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>
+15 -15
View File
@@ -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>
+33 -33
View File
@@ -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);
}
}
svg {
padding: 6px;
color: #fff;
.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);
}
}
.top-menu {
flex: 1;
}
.bottom-menu {
margin-bottom: 24px;
svg {
padding: 6px;
color: #fff;
}
}
.top-menu {
flex: 1;
}
.bottom-menu {
margin-bottom: 24px;
}
</style>
+1 -5
View File
@@ -10,11 +10,7 @@
<script>
export default {
name: 'mo-logo-mini',
components: {
},
methods: {
}
name: 'mo-logo-mini'
}
</script>
@@ -32,6 +32,3 @@
}
}
</script>
<style lang="scss">
</style>
@@ -31,6 +31,3 @@
}
}
</script>
<style lang="scss">
</style>
@@ -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>
+8 -3
View File
@@ -392,6 +392,10 @@
label: '5 MB/s',
value: '5M'
},
{
label: '8 MB/s',
value: '8M'
},
{
label: '10 MB/s',
value: '10M'
@@ -399,6 +403,10 @@
{
label: '20 MB/s',
value: '20M'
},
{
label: '30 MB/s',
value: '30M'
}
]
},
@@ -505,6 +513,3 @@
}
}
</script>
<style lang="scss">
</style>
+47 -47
View File
@@ -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 {
color: $--color-text-regular;
}
.el-form-item {
a {
color: $--color-text-regular;
text-decoration: none;
&:hover {
color: $--color-text-primary;
text-decoration: underline;
}
}
.el-checkbox__input.is-checked + .el-checkbox__label {
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;
}
}
}
.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>
@@ -19,8 +19,6 @@
export default {
name: 'mo-theme-switcher',
components: {
},
props: {
value: {
type: String,
@@ -10,7 +10,7 @@
<em>{{ engineMode }}</em>
</div>
<div class="value" v-if="stat.numActive > 0">
<em >{{ stat.uploadSpeed | bytesToSize }}/s</em>
<em>{{ stat.uploadSpeed | bytesToSize }}/s</em>
<span>{{ stat.downloadSpeed | bytesToSize }}/s</span>
</div>
</div>
@@ -18,15 +18,11 @@
<script>
import { mapState, mapActions } from 'vuex'
import { bytesToSize } from '@shared/utils'
import '@/components/Icons/speedometer'
import {
bytesToSize
} from '@shared/utils'
export default {
name: 'mo-speedometer',
components: {
},
computed: {
...mapState('app', [
'stat'
@@ -62,6 +62,3 @@
}
}
</script>
<style lang="scss">
</style>
@@ -62,6 +62,3 @@
}
}
</script>
<style lang="scss">
</style>
-3
View File
@@ -410,6 +410,3 @@
}
}
</script>
<style lang="scss">
</style>
+25 -25
View File
@@ -160,31 +160,31 @@
</script>
<style lang="scss">
.task-actions {
position: absolute;
top: 44px;
right: 0;
height: 24px;
padding: 0;
overflow: hidden;
user-select: none;
cursor: default;
text-align: right;
color: $--task-action-color;
transition: all 0.25s;
.task-action {
display: inline-block;
padding: 5px;
margin: 0 4px;
font-size: 0;
cursor: pointer;
outline: none;
&:hover {
color: $--task-action-hover-color;
}
&.disabled {
color: $--task-action-disabled-color;
}
.task-actions {
position: absolute;
top: 44px;
right: 0;
height: 24px;
padding: 0;
overflow: hidden;
user-select: none;
cursor: default;
text-align: right;
color: $--task-action-color;
transition: all 0.25s;
.task-action {
display: inline-block;
padding: 5px;
margin: 0 4px;
font-size: 0;
cursor: pointer;
outline: none;
&:hover {
color: $--task-action-hover-color;
}
&.disabled {
color: $--task-action-disabled-color;
}
}
}
</style>
+34 -34
View File
@@ -75,41 +75,41 @@
</script>
<style lang="scss">
.task-item {
position: relative;
min-height: 88px;
padding: 16px 12px;
background-color: $--task-item-background;
border: 1px solid $--task-item-border-color;
border-radius: 6px;
margin-bottom: 16px;
transition: $--border-transition-base;
&:hover {
border-color: $--task-item-hover-border-color;
}
.task-item-actions {
position: absolute;
top: 16px;
right: 12px;
}
}
.selected .task-item {
.task-item {
position: relative;
min-height: 78px;
padding: 16px 12px;
background-color: $--task-item-background;
border: 1px solid $--task-item-border-color;
border-radius: 6px;
margin-bottom: 16px;
transition: $--border-transition-base;
&:hover {
border-color: $--task-item-hover-border-color;
}
.task-name {
color: #505753;
margin-bottom: 1.5rem;
margin-right: 220px;
word-break: break-all;
min-height: 26px;
&> span {
font-size: 14px;
line-height: 26px;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.task-item-actions {
position: absolute;
top: 16px;
right: 12px;
}
}
.selected .task-item {
border-color: $--task-item-hover-border-color;
}
.task-name {
color: #505753;
margin-bottom: 1.5rem;
margin-right: 220px;
word-break: break-all;
min-height: 26px;
&> span {
font-size: 14px;
line-height: 26px;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
}
</style>
+20 -20
View File
@@ -68,24 +68,24 @@
</script>
<style lang="scss">
.task-list {
padding: 16px 0 64px 0;
min-height: 100%;
box-sizing: border-box;
}
.no-task {
display: flex;
height: 100%;
text-align: center;
align-items: center;
justify-content: center;
font-size: 14px;
color: #555;
user-select: none;
}
.no-task-inner {
width: 100%;
padding-top: 360px;
background: transparent url('~@/assets/no-task.svg') top center no-repeat;
}
.task-list {
padding: 16px 0 64px 0;
min-height: 100%;
box-sizing: border-box;
}
.no-task {
display: flex;
height: 100%;
text-align: center;
align-items: center;
justify-content: center;
font-size: 14px;
color: #555;
user-select: none;
}
.no-task-inner {
width: 100%;
padding-top: 360px;
background: transparent url('~@/assets/no-task.svg') top center no-repeat;
}
</style>
+2 -1
View File
@@ -1,5 +1,6 @@
export default {
aria2: 'aria2/1.35.0',
transmission: 'Transmission/2.94',
chrome: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.122 Safari/537.36',
chrome: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36',
du: 'netdisk;6.0.0.12;PC;PC-Windows;10.0.16299;WindowsBaiduYunGuanJia'
}