key list to fix

natan88 · May 23, 2019 · ce5b5c6 · ce5b5c6
1 parent 084b1d8
commit ce5b5c6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container class="wrap-container">
 
-    <el-aside width="200px" class="aside-connection" >
+    <el-aside width="220px" class="aside-connection" >
       <Aside></Aside>
     </el-aside>
 

diff --git a/src/Aside.vue b/src/Aside.vue
@@ -3,7 +3,9 @@
     <div>
 
       <!-- new connection button -->
-      <el-button class="aside-new-connection" type="info" @click="dialogFormVisible = true" icon="el-icon-circle-plus">{{ $t('message.new_connection') }}</el-button>
+      <div class="aside-new-connection-container">
+        <el-button class="aside-new-connection" type="info" @click="dialogFormVisible = true" icon="el-icon-circle-plus">{{ $t('message.new_connection') }}</el-button>
+      </div>
 
       <!-- new connection dialog -->
       <el-dialog :title="$t('message.new_connection')" :visible.sync="dialogFormVisible">
@@ -114,7 +116,10 @@ export default {
 </script>
 
 <style type="text/css">
+  .aside-new-connection-container {
+    margin-right: 8px;
+  }
   .aside-new-connection {
-    width: 95%;
+    width: 100%;
   }
 </style>
diff --git a/src/components/Connections.vue b/src/components/Connections.vue
@@ -6,11 +6,13 @@
         <!-- connection item -->
         <template slot="title">
           <span slot="title" :title="item.menuIndex" class="connection-name">{{item.menuIndex}}</span>
-          <i :title="$t('message.edit_connection')" class="el-icon-edit-outline" @click.stop.prevent="showEditConnection(item, item.menuIndex)"></i>
-          <i :title="$t('message.del_connection')" class="el-icon-delete" @click.stop.prevent="deleteConnection(item)"></i>
+          <span class="connection-opt-icons">
+            <i :title="$t('message.edit_connection')" class="el-icon-edit-outline" @click.stop.prevent="showEditConnection(item, item.menuIndex)"></i>
+            <i :title="$t('message.del_connection')" class="el-icon-delete" @click.stop.prevent="deleteConnection(item)"></i>
+          </span>
         </template>
 
-        <el-form :inline="true" class="connection-form" size="mini">
+        <el-form class="connection-form" size="mini">
           <el-form-item>
             <el-row :gutter="6">
               <el-col :span="12">
@@ -700,6 +702,7 @@ export default {
   }
   .connection-menu {
     margin-top: 10px;
+    padding-right: 6px;
   }
   .connection-menu .connection-name {
     display: inline-block;
@@ -709,6 +712,10 @@ export default {
     overflow:hidden;
     text-overflow:ellipsis;
   }
+  .connection-menu .connection-opt-icons {
+    position: absolute;
+    right: 30px;
+  }
   .connection-menu .db-select {
     width: 100%;
   }
@@ -744,6 +751,10 @@ export default {
     /*background: #ECF5FF;*/
   }
 
+  .connection-menu .connection-form {
+    /*padding-right: 8px;*/
+  }
+
   .connection-menu .search-item .search-icon {
     font-size: 128%;
     color: #a5a8ad;
@@ -766,7 +777,7 @@ export default {
     color: #3c5765;
     font-size: 82%;
     line-height: 1.6;
-    margin-right: 3px;
+    /*margin-right: 3px;*/
     padding-left: 6px;
   }
   .connection-menu .key-list .key-item:hover {
@@ -778,6 +789,7 @@ export default {
     background: #e7ebec;
     box-sizing: border-box;
     border-left: 2px solid #68acf3;
+    padding-left: 4px;
   }
 
   .pagenation {

diff --git a/src/components/UpdateCheck.vue b/src/components/UpdateCheck.vue
@@ -113,7 +113,7 @@ export default {
       ipcRenderer.on('update-downloaded', (event, arg) => {
         console.log('update-downloaded', arg);
 
-        this.$notify.closeAll();
+        // this.$notify.closeAll();
         this.resetDownloadProcess();
         this.$notify.success({
           title: this.$t('message.update_downloaded'),