feat(main): v1.3.1-style

licesun · Sep 23, 2019 · cd8274c · cd8274c
1 parent bc8f6ea
commit cd8274c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ Works on macOS 10.12+, and Windows 10, Windows7.
 - 增加wallhaven图库
 
 > 1.3.1
-- 增加nasa图库
+- 增加NASA图库
 - 增加电影壁纸图库themoviedb
 
 ## 用户统计

diff --git a/src/renderer/page/content.vue b/src/renderer/page/content.vue
@@ -258,7 +258,7 @@ export default {
                     this.infoShow = INFOSHOW.null
                     this.refreshBtnIng = false
                     if (data.length === 0) {
-                        this.havaDataFlag = false
+                        // this.havaDataFlag = false
                         this.infoShow = INFOSHOW.noData
                         return
                     }
@@ -671,6 +671,7 @@ export default {
 
         .header-search {
             width: 100%;
+            padding-bottom:6px;
             display: flex;
             align-items: center;
             position: relative;
@@ -731,7 +732,7 @@ export default {
             .active{
                 font-weight:bold;
                 color:#ddd;
-            }
+            } 
 
         }
     }

diff --git a/src/renderer/page/setter.vue b/src/renderer/page/setter.vue
@@ -69,7 +69,7 @@
 
                 <div class="setter-row image-sourece">图片来源: {{imageSource}}</div>
 
-                <div class="setter-row">
+                <div class="setter-row image-sourece-options">
                     <el-radio-group v-model="imageSource" @change="imageSourceChange">
                         <template v-for="item in imageSourceType">
                             <el-radio :label="item.value" :key="item.value">
@@ -264,7 +264,8 @@ export default {
 <style lang="less" scoped>
 .setter {
     width: 100%;
-    height: 270px;
+    min-height: 270px;
+    height:auto;
     position: absolute;
     z-index: 4000;
 
@@ -279,6 +280,10 @@ export default {
         height: 30px;
         font-weight: 500px;
     }
+    .image-sourece-options{
+        height:auto;
+        padding:5px 0;
+    }
 
     .setter-row-one {
         display: flex;
@@ -302,11 +307,12 @@ export default {
     .setter-content {
         background-color: rgba(43, 42, 42, 0.9);
         width: 100%;
-        height: 100%;
+        height: auto;
         position: absolute;
         right: 0px;
         top: 0px;
         padding: 20px;
+        padding-bottom:0px;
         color: #fff;
         user-select: none;
         cursor: default;

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -63,7 +63,7 @@ export const imageSourceType = [{
     search: true
 },
 {
-    name: 'nasa',
+    name: 'NASA',
     value: 'nasa',
     search: false,
 },