Merge pull request #11 from NotBlue-Dev/develop

Develop
NotBlue-Dev · Jun 24, 2022 · 4097bdc · 4097bdc
2 parents c231dfb + 86d5c3f
commit 4097bdc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/lib b/lib
diff --git a/main.js b/main.js
@@ -1,6 +1,6 @@
 const { app, BrowserWindow, ipcMain } = require('electron')
 
-const echo = require('echomodlib')
+const echo = require('./lib/index')
 
 require('dotenv').config()
 const dev = (process.env.NODE_ENV === 'development')

diff --git a/view/main/renderer.js b/view/main/renderer.js
@@ -55,6 +55,7 @@ window.addEventListener('DOMContentLoaded', () => {
       value: '',
       type: 'input',
     }).then((response) => {
+      console.log(response)
       const body = document.querySelector('#body');
       body && (body.style.cursor = 'progress');
       ipcRenderer.send('find-ip', response);

diff --git a/view/settings/index.html b/view/settings/index.html
@@ -17,7 +17,8 @@
       </div>
     </div>
 
-    <div id="container">
+    <div id="container" >
+      <!-- style="overflow-y: scroll !important" -->
 
     </div>
 

diff --git a/view/settings/style.css b/view/settings/style.css
@@ -5,6 +5,7 @@ body {
     background-color: #393E50;
     color: white;
     font-family: 'Montserrat', regular;
+    /* overflow-y: hidden; */
 }
 
 .tit {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,8 @@ @@
           </div>
         </div>
-        <div id="container">
+        <div id="container" >
+          <!-- style="overflow-y: scroll !important" -->
         </div>
@@ Expand Down @@