Fixed the Settings Menu (#3044)

brimdata · Apr 10, 2024 · 66059b8 · 66059b8
1 parent 18dc5e8
commit 66059b8
Show file tree

Hide file tree

Showing 64 changed files with 1,393 additions and 1,407 deletions.
diff --git a/apps/zui/package.json b/apps/zui/package.json
@@ -154,6 +154,7 @@
     "tmp": "^0.1.0",
     "tree-model": "^1.0.7",
     "use-resize-observer": "^8.0.0",
+    "utopia-core-scss": "^1.0.1",
     "web-file-polyfill": "^1.0.4",
     "web-streams-polyfill": "^3.2.0",
     "zed": "brimdata/zed#d1a78b8450b6c4c6bc80cb3d608133b447acf2f3",

diff --git a/apps/zui/src/components/forms.module.css b/apps/zui/src/components/forms.module.css
diff --git a/apps/zui/src/components/h1.tsx b/apps/zui/src/components/h1.tsx
diff --git a/apps/zui/src/components/icon-button.tsx b/apps/zui/src/components/icon-button.tsx
@@ -22,7 +22,7 @@ const BG = styled.button`
   align-items: center;
   justify-content: center;
   flex-shrink: 0;
-  transition: background var(--quick), transform var(--quick);
+  transition: background var(--hover-duration), transform var(--hover-duration);
   -webkit-app-region: no-drag;
 
   &:disabled {

diff --git a/apps/zui/src/components/popover-modal.tsx b/apps/zui/src/components/popover-modal.tsx
@@ -37,7 +37,7 @@ export const PopoverModal = forwardRef(function PopoverModal(
         data-debut="popover:drop-in"
         className={classNames(
           props.className,
-          "width:full bg:normal shadow:l radius:l border:solid"
+          "width:full bg:normal shadow:l radius:l border:solid h-fit overflow-hidden"
         )}
       >
         {props.children}

diff --git a/apps/zui/src/css/_blocks.scss b/apps/zui/src/css/_blocks.scss
@@ -1,37 +1,39 @@
 .field {
-    &>*+* {
-        margin-block-start: var(--space-2xs);
-    }
+  & > * + * {
+    margin-block-start: var(--space-2xs);
+  }
 }
 
 .field-stack {
-    &>*+* {
-        margin-block-start: var(--space-s);
-    }
+  & > * + * {
+    margin-block-start: var(--space-s);
+  }
 }
 
 .modal {
-    background: var(--bg-color);
-    box-shadow: 0 20px 50px 10px rgb(0 0 0 /0.25);
-    border-radius: 8px;
-    border: none;
-    padding: 0;
-    will-change: opacity, transform;
-    color: var(--fg-color);
+  background: var(--bg-color);
+  box-shadow: 0 20px 50px 10px rgb(0 0 0 /0.25);
+  border-radius: 8px;
+  border: none;
+  padding: 0;
+  will-change: opacity, transform;
+  color: var(--fg-color);
 }
 
 .modal::backdrop {
-    background-color: black;
-    opacity: 0.25;
-    will-change: opacity;
+  background-color: black;
+  opacity: 0.25;
+  will-change: opacity;
 }
 
 @media (prefers-color-scheme: dark) {
-    .modal::backdrop {
-        opacity: 0.8;
-    }
+  .modal::backdrop {
+    opacity: 0.8;
+  }
 
-    .modal {
-        border: 1px solid var(--border-color);
-    }
+  .modal {
+    border: 1px solid var(--border-color);
+  }
 }
+
+
diff --git a/apps/zui/src/css/_global.scss b/apps/zui/src/css/_global.scss
@@ -21,55 +21,10 @@ body {
   width: 100%;
 }
 
-body {
-  line-height: 1.5;
-  font-size: var(--step-0);
-  -webkit-font-smoothing: antialiased;
-  font-family: var(--body-font);
-  color: var(--fg-color);
-
-  &:not(.is-mac) {
-    background-color: var(--window-color);
-  }
-}
-
-
-input,
-button,
-textarea,
-select {
-  color: var(--fg-color);
-  font: inherit;
-}
-
-p,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  overflow-wrap: break-word;
-}
-
-h4 {
-  font-size: var(--step-1);
+body:not(.is-mac) {
+  background-color: var(--window-color);
 }
 
-h3 {
-  font-size: var(--step-2);
-}
-
-h2 {
-  font-size: var(--step-3);
-}
-
-h1 {
-  font-size: var(--step-4);
-}
-
-
-
 pre,
 code {
   border-radius: 3px;
@@ -106,7 +61,6 @@ button {
   height: 0.75rem;
 }
 
-
 *::-webkit-scrollbar-track {
   background-color: var(--emphasis-bg-less);
 }
@@ -133,17 +87,6 @@ dd {
   user-select: none;
 }
 
-label {
-  display: block;
-  font-weight: bold;
-  color: var(--fg-color-less);
-  opacity: 0.9;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.8px;
-  font-size: var(--step--1);
-}
-
 input {
   font-size: inherit;
 }