Merge branch 'master' into fix-issues

RetroShare · Nov 18, 2023 · ca26e85 · ca26e85
2 parents 305297c + dae0c13
commit ca26e85
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/webui-src/app/home.js b/webui-src/app/home.js
@@ -79,8 +79,6 @@ const retroshareId = () => {
           'textarea[readonly].textArea',
           {
             id: 'retroId',
-            rows: 1,
-            cols: v.attrs.ownCert.length + 2,
             placeholder: 'certificate',
             onclick: () => {
               document.getElementById('retroId').select();

diff --git a/webui-src/app/login.js b/webui-src/app/login.js
@@ -52,7 +52,12 @@ function loginComponent() {
   const buttonLogin = () =>
     m(
       'button[type=submit].submit-btn#loginBtn',
-      { onclick: () => verifyLogin(uname, passwd, url) },
+      {
+        onclick: (ev) => {
+          ev.preventDefault();
+          verifyLogin(uname, passwd, url);
+        },
+      },
       'Login'
     );
 

diff --git a/webui-src/app/scss/pages/_home.scss b/webui-src/app/scss/pages/_home.scss
@@ -53,7 +53,9 @@
         border-radius: 4px;
         background: transparentize($dark-color, 0.95);
         & .textArea {
-          padding: 0.25rem;
+          padding: 0;
+          width: 100%;
+          min-height: 75px;
           font-size: 1rem;
           font-family: monospace;
           background: transparent;

diff --git a/webui-src/styles.css b/webui-src/styles.css