Merge pull request #694 from NeurodataWithoutBorders/space-forms-prop…

…erly Space Form Inputs Properly
NeurodataWithoutBorders · Mar 18, 2024 · 2867123 · 2867123
2 parents 71af5ea + 56e2ffa
commit 2867123
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/renderer/src/stories/BasicTable.js b/src/renderer/src/stories/BasicTable.js
@@ -9,7 +9,6 @@ import * as promises from "../promises";
 import "./Button";
 import { sortTable } from "./Table";
 import tippy from "tippy.js";
-import { getIgnore } from "./JSONSchemaForm";
 
 export class BasicTable extends LitElement {
     static get styles() {
@@ -39,6 +38,11 @@ export class BasicTable extends LitElement {
                 position: relative;
                 overflow: auto;
                 max-height: 400px;
+                border: 1px solid gray;
+            }
+
+            table tr:first-child td {
+                border-top: 0px;
             }
 
             table {
@@ -53,7 +57,8 @@ export class BasicTable extends LitElement {
             }
 
             th {
-                border: 1px solid silver;
+                border-right: 1px solid gray;
+                border-bottom: 1px solid gray;
                 color: #222;
                 font-weight: 400;
                 text-align: center;
@@ -81,7 +86,9 @@ export class BasicTable extends LitElement {
             }
 
             td {
-                border: 1px solid gainsboro;
+                border: 1px solid gray;
+                border-left: none;
+                border-bottom: none;
                 background: white;
                 user-select: none;
             }

diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js
@@ -101,6 +101,12 @@ const componentCSS = `
       width:100%;
     }
 
+
+
+    .form-section:not(:last-child), .link:not(:last-child){
+        margin-bottom: 15px;
+    }
+
     .form-section {
         display: flex;
         flex-direction: column;
@@ -127,7 +133,6 @@ const componentCSS = `
     }
 
     .link {
-      margin: 20px 0px;
       border: 1px solid black;
       border-radius: 4px;
       position: relative;
@@ -460,7 +465,7 @@ export class JSONSchemaForm extends LitElement {
         if (!container) return;
 
         const nChildren = container.children.length;
-        container.innerHTML = "";
+        container.remove();
 
         // Track errors and warnings
         if (type === "errors") this.#nErrors -= nChildren;

diff --git a/src/renderer/src/stories/SimpleTable.js b/src/renderer/src/stories/SimpleTable.js
@@ -948,7 +948,7 @@ export class SimpleTable extends LitElement {
                     </tfoot>
                 </table>
             </div>
-            <p style="margin: 10px 0px">
+            <p style="margin: 0; margin-top: 10px">
                 <small style="color: gray;">Right click to add or remove rows.</small>
             </p>
         `;

diff --git a/src/renderer/src/stories/Table.js b/src/renderer/src/stories/Table.js
@@ -698,7 +698,7 @@ export class Table extends LitElement {
     render() {
         return html`
             <div></div>
-            <p style="width: 100%; margin: 10px 0px">
+            <p style="width: 100%; margin: 0; margin-top: 10px;">
                 <small id="description" style="color: gray;"></small>
             </p>
         `;

diff --git a/src/renderer/src/stories/preview/inspector/InspectorList.js b/src/renderer/src/stories/preview/inspector/InspectorList.js
@@ -78,6 +78,9 @@ export class InspectorListItem extends LitElement {
                 text-wrap: wrap;
                 padding: 10px;
                 font-size: 12px;
+            }
+
+            :host(:not(:last-child)) {
                 margin: 0 0 1em;
             }