From 6724912c73b7392373f01e0a1d96422c6c99f1f1 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 2 May 2020 19:52:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/App.vue                          | 28 +++++++------------
 src/renderer/assets/styles/variables.less     |  2 +-
 src/renderer/components/core/Aside.vue        | 17 ++++++-----
 src/renderer/components/core/Player.vue       |  4 +--
 .../components/material/SearchInput.vue       |  2 +-
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index b1dc61e9..ea1117a2 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -1,22 +1,20 @@
 <template lang="pug">
 #container(v-if="isProd && !isNt" :class="[theme, nd ? 'nd' : '']" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
-  #main
-    core-aside#left
-    #right
-      core-toolbar#toolbar
-      core-view#view
-  core-player#player
+  core-aside#left
+  #right
+    core-toolbar#toolbar
+    core-view#view
+    core-player#player
   core-icons
   material-xm-verify-modal(v-show="globalObj.xm.isShowVerify" :show="globalObj.xm.isShowVerify" :bg-close="false" @close="handleXMVerifyModalClose")
   material-version-modal(v-show="version.showModal")
   material-pact-modal(v-show="!setting.isAgreePact || globalObj.isShowPact")
 #container(v-else :class="[theme, nd ? 'nd' : '']")
-  #main
-    core-aside#left
-    #right
-      core-toolbar#toolbar
-      core-view#view
-  core-player#player
+  core-aside#left
+  #right
+    core-toolbar#toolbar
+    core-view#view
+    core-player#player
   core-icons
   material-xm-verify-modal(v-show="globalObj.xm.isShowVerify" :show="globalObj.xm.isShowVerify" :bg-close="false" @close="handleXMVerifyModalClose")
   material-version-modal(v-show="version.showModal")
@@ -343,7 +341,6 @@ body {
 #container {
   position: relative;
   display: flex;
-  flex-flow: column nowrap;
   height: 100%;
   overflow: hidden;
   background: @color-theme-bgimg @color-theme-bgposition no-repeat;
@@ -352,11 +349,6 @@ body {
   background-color: @color-theme;
 }
 
-#main {
-  flex: auto;
-  display: flex;
-}
-
 #left {
   flex: none;
   width: @width-app-left;
diff --git a/src/renderer/assets/styles/variables.less b/src/renderer/assets/styles/variables.less
index f6687c21..081aebfc 100644
--- a/src/renderer/assets/styles/variables.less
+++ b/src/renderer/assets/styles/variables.less
@@ -703,7 +703,7 @@
 
 
 // Width
-@width-app-left: 6.5%;
+@width-app-left: 7.3%;
 
 // Height
 @height-toolbar: 54px;
diff --git a/src/renderer/components/core/Aside.vue b/src/renderer/components/core/Aside.vue
index 211f8d1d..0c6b9ff2 100644
--- a/src/renderer/components/core/Aside.vue
+++ b/src/renderer/components/core/Aside.vue
@@ -10,19 +10,19 @@ div(:class="$style.aside")
       dd
         router-link(:active-class="$style.active" to="search")
           div(:class="$style.icon")
-            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' width='35%' viewBox='0 0 30.239 30.239' space='preserve')
+            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 30.239 30.239' space='preserve')
               use(xlink:href='#icon-search')
           span {{$t('core.aside.search')}}
       dd
         router-link(:active-class="$style.active" to="songList")
           div(:class="$style.icon")
-            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' width='35%' viewBox='0 0 511.334 511.334' space='preserve')
+            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 511.334 511.334' space='preserve')
               use(xlink:href='#icon-album')
           span {{$t('core.aside.song_list')}}
       dd
         router-link(:active-class="$style.active" to="leaderboard")
           div(:class="$style.icon")
-            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' width='35%' viewBox='0 0 512.001 512.001' space='preserve')
+            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 512.001 512.001' space='preserve')
               use(xlink:href='#icon-leaderboard')
           span {{$t('core.aside.leaderboard')}}
     dl
@@ -31,7 +31,7 @@ div(:class="$style.aside")
         //- router-link(:active-class="($route.query.id === defaultList.id || $route.query.id == '') ? $style.active : ''" :to="`list?id=${defaultList.id || ''}`") {{$t('core.aside.default_list')}}
         router-link(:active-class="$route.query.id === loveList.id ? $style.active : ''" :to="`list?id=${loveList.id}`")
           div(:class="$style.icon")
-            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' width='35%' viewBox='0 0 512 512' space='preserve')
+            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 512 512' space='preserve')
               use(xlink:href='#icon-love')
           span {{$t('core.aside.love_list')}}
         router-link(:active-class="$route.query.id === item.id ? $style.active : ''" v-for="item in userList" :to="`list?id=${item._id}`" :key="item._id") {{item.name}}
@@ -40,13 +40,13 @@ div(:class="$style.aside")
       dd
         router-link(:active-class="$style.active" to="download")
           div(:class="$style.icon")
-            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' width='35%' viewBox='0 0 24 24' space='preserve')
+            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 24 24' space='preserve')
               use(xlink:href='#icon-download-2')
           span {{$t('core.aside.download')}}
       dd
         router-link(:active-class="$style.active" to="setting")
           div(:class="$style.icon")
-            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' width='35%' viewBox='0 0 512 512' space='preserve')
+            svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 512 512' space='preserve')
               use(xlink:href='#icon-setting')
           span {{$t('core.aside.setting')}}
 </template>
@@ -150,7 +150,7 @@ export default {
       text-decoration: none;
 
       position: relative;
-      padding: 10px 10px;
+      padding: 10px 3px;
       // margin: 5px 0;
       // border-left: 5px solid transparent;
       transition: @transition-theme;
@@ -181,6 +181,9 @@ export default {
 
 .icon {
   margin-bottom: 5px;
+  &> svg {
+    width: 27%;
+  }
 }
 
 
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 36551e73..c5e108dd 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -676,7 +676,7 @@ export default {
   transition: @transition-theme;
   transition-property: color;
   flex: none;
-  padding: 3px 3px 3px 5px;
+  padding: 2px;
   opacity: 1;
   transition: @transition-theme;
   transition-property: opacity;
@@ -698,7 +698,7 @@ export default {
     transition: @transition-theme;
     transition-property: border-color;
     // border-radius: 50%;
-    border-radius: @radius-progress-border;
+    // border-radius: @radius-progress-border;
     // border: 2px solid @color-theme_2-background_1;
   }
 }
diff --git a/src/renderer/components/material/SearchInput.vue b/src/renderer/components/material/SearchInput.vue
index 2ccfb0f1..ac599f5e 100644
--- a/src/renderer/components/material/SearchInput.vue
+++ b/src/renderer/components/material/SearchInput.vue
@@ -189,7 +189,7 @@ export default {
       border-bottom-right-radius: 3px;
       cursor: pointer;
       height: 100%;
-      padding: 5px 7px;
+      padding: 6px 7px;
       color: @color-btn;
       transition: background-color .2s ease;