diff --git a/public/images/device/android.svg b/public/images/device/android.svg index dfb03ae22..fec248d0a 100644 --- a/public/images/device/android.svg +++ b/public/images/device/android.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/images/device/apple.svg b/public/images/device/apple.svg index 572569b8d..c0e84b64b 100644 --- a/public/images/device/apple.svg +++ b/public/images/device/apple.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/images/device/macos.svg b/public/images/device/macos.svg index f8f16fb8d..f9e7e098e 100644 --- a/public/images/device/macos.svg +++ b/public/images/device/macos.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/images/device/phone.svg b/public/images/device/phone.svg index 0e08ace55..ec0f369cd 100644 --- a/public/images/device/phone.svg +++ b/public/images/device/phone.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/images/device/tablet.svg b/public/images/device/tablet.svg index 00f6af319..873d31a4d 100644 --- a/public/images/device/tablet.svg +++ b/public/images/device/tablet.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/images/device/web.svg b/public/images/device/web.svg index 27d898980..52a26158f 100644 --- a/public/images/device/web.svg +++ b/public/images/device/web.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/images/device/window.svg b/public/images/device/window.svg index e0d4716ec..2b34d2806 100644 --- a/public/images/device/window.svg +++ b/public/images/device/window.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss index 2a5486131..fd2d3c832 100755 --- a/resources/assets/sass/pages/page-setting.scss +++ b/resources/assets/sass/pages/page-setting.scss @@ -360,10 +360,14 @@ flex-direction: row; justify-content: center; align-items: center; - gap: 8px; + gap: 12px; padding: 24px; - border-radius: 12px; - background: rgba(79, 89, 102, .04); + border-radius: 10px; + border: 1px solid #eeeeee; + + &:hover { + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1); + } &.loading { background: transparent; @@ -433,7 +437,7 @@ align-items: center; gap: 2px; justify-content: flex-start; - color: #262626; + color: $primary-title-color; .name { font-weight: 500; @@ -460,22 +464,7 @@ } .current { - color: #595959; - } - - .ivu-btn { - background: #d9d9dd; - border-color: #d9d9dd; - color: #262626; - box-shadow: none; - height: 36px; - padding: 0 12px; - border-radius: 12px; - - &:hover { - background: rgba(217, 217, 221, 0.8); - border-color: rgba(217, 217, 221, 0.8); - } + color: $primary-text-color; } } } @@ -594,20 +583,35 @@ body.window-portrait { } .setting-device { - padding: 16px !important; + padding: 0 !important; > ul { + gap: 0; + > li { padding: 20px; + border: 0; + border-bottom: 1px solid #eeeeee; + border-radius: 0; + + &:hover { + box-shadow: none; + } .info { + gap: 4px; + .title { flex-direction: column; align-items: flex-start; + font-size: 15px; + gap: 0; + .device { - opacity: 0.6; + font-size: 14px; + color: #8a939d; &:before, &:after { - content: ""; + display: none; } } } diff --git a/resources/assets/statics/public/images/device/android.svg b/resources/assets/statics/public/images/device/android.svg index dfb03ae22..fec248d0a 100644 --- a/resources/assets/statics/public/images/device/android.svg +++ b/resources/assets/statics/public/images/device/android.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/statics/public/images/device/apple.svg b/resources/assets/statics/public/images/device/apple.svg index 572569b8d..c0e84b64b 100644 --- a/resources/assets/statics/public/images/device/apple.svg +++ b/resources/assets/statics/public/images/device/apple.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/statics/public/images/device/macos.svg b/resources/assets/statics/public/images/device/macos.svg index f8f16fb8d..f9e7e098e 100644 --- a/resources/assets/statics/public/images/device/macos.svg +++ b/resources/assets/statics/public/images/device/macos.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/statics/public/images/device/phone.svg b/resources/assets/statics/public/images/device/phone.svg index 0e08ace55..ec0f369cd 100644 --- a/resources/assets/statics/public/images/device/phone.svg +++ b/resources/assets/statics/public/images/device/phone.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/statics/public/images/device/tablet.svg b/resources/assets/statics/public/images/device/tablet.svg index 00f6af319..873d31a4d 100644 --- a/resources/assets/statics/public/images/device/tablet.svg +++ b/resources/assets/statics/public/images/device/tablet.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/statics/public/images/device/web.svg b/resources/assets/statics/public/images/device/web.svg index 27d898980..52a26158f 100644 --- a/resources/assets/statics/public/images/device/web.svg +++ b/resources/assets/statics/public/images/device/web.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/assets/statics/public/images/device/window.svg b/resources/assets/statics/public/images/device/window.svg index e0d4716ec..2b34d2806 100644 --- a/resources/assets/statics/public/images/device/window.svg +++ b/resources/assets/statics/public/images/device/window.svg @@ -1 +1 @@ - \ No newline at end of file +