Merge branch 'master' into trayicon-config

PublicWorld · May 17, 2017 · 918d473 · 918d473
2 parents 4a39f06 + b41c7b4
commit 918d473
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/windows/styles/settings.css b/src/windows/styles/settings.css
@@ -29,9 +29,8 @@ section {
   position: relative;
   width: 75%;
   left: 12.5%;
-  margin: 1px;
   border-bottom: 1px solid gray;
-  text-align:
+  overflow: hidden;
 }
 
 .page {
@@ -62,9 +61,9 @@ section {
   padding: 0;
   margin: 0 0 10px 0;
   border: none;
-  height: 130px;
+  height: 140px;
   width: 100%;
-  overflow: auto;
+  overflow: hidden;
   background-color: #CCC;
   box-shadow: 0px 5px 5px #CCC;
 }

diff --git a/src/windows/views/settings.html b/src/windows/views/settings.html
@@ -21,7 +21,7 @@
         <li>
           <h1>Electronic Wechat V2.0.0</h1></li>
         <li>
-          <h1 style="font-size:95%;">Powered by Electron V1.4.7</h1></li>
+          <h1 style="font-size:95%;">Powered by Electron V<span id="top-title-electron-ver">process.versions.electron</span></h1></li>
       </ul>
     </div>
   </div>
@@ -126,11 +126,12 @@ <h4 id="app-tray-desc">选择一个适合当前主题的颜色</h4>
     function $(id) {
       return document.getElementById(id);
     }
-
+    
     if(process.platform === 'darwin') {
       $('process.platform').style.display = 'none';
     }
 
+    $('top-title-electron-ver').innerText = process.versions.electron;
     setConfig();
     setListeners()