Merge pull request #170 from iterative/webview-design-cleanup

Webview design cleanup
iterative · Mar 17, 2021 · 61b1dcd · 61b1dcd
2 parents 2ebad22 + bb039ec
commit 61b1dcd
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 128 deletions.
diff --git a/webview/src/components/Experiments/index.tsx b/webview/src/components/Experiments/index.tsx
@@ -68,7 +68,9 @@ export const ExperimentsTable: React.FC<{
 }> = ({ experiments: rawExperiments }) => {
   const [initialState, defaultColumn] = React.useMemo(() => {
     const initialState = {}
-    const defaultColumn: Partial<Column<Experiment>> = {}
+    const defaultColumn: Partial<Column<Experiment>> = {
+      width: 110
+    }
     return [initialState, defaultColumn]
   }, [])
 
@@ -83,7 +85,7 @@ export const ExperimentsTable: React.FC<{
           if (id === 'workspace') return id
           return id.slice(0, 7)
         },
-        width: 200
+        width: 150
       },
       {
         Header: 'Timestamp',
@@ -148,8 +150,8 @@ export const ExperimentsTable: React.FC<{
   return (
     <>
       <div className={styles.tableOptions}>
-        <SortIndicator instance={instance} />
         <ManageColumns instance={instance} />
+        <SortIndicator instance={instance} />
       </div>
       <Table instance={instance} />
     </>
@@ -163,6 +165,7 @@ const Experiments: React.FC<{
   return (
     <div className={styles.experiments}>
       <button
+        className={styles.experimentsButton}
         onClick={() => {
           vsCodeApi.postMessage({
             type: MessageFromWebviewType.onClickRunExperiment

diff --git a/webview/src/components/Menu/module.scss b/webview/src/components/Menu/module.scss
diff --git a/webview/src/components/Menu/styles.module.scss b/webview/src/components/Menu/styles.module.scss
@@ -3,10 +3,7 @@
   display: inline-block;
   max-width: 100%;
   &__toggle {
-    padding-top: 0.375rem;
-    padding-right: 0.5rem;
-    padding-bottom: 0.375rem;
-    padding-left: 0.5rem;
+    padding: 0.375rem 0.5rem;
     position: relative;
     display: flex;
     align-items: center;
@@ -15,7 +12,7 @@
     max-width: 100%;
     line-height: 1.5;
     color: #ffffff;
-    background-color: #4f5255;
+    background-color: inherit;
     border: none;
     &__text {
       overflow: hidden;

diff --git a/webview/src/components/SortIndicator/index.tsx b/webview/src/components/SortIndicator/index.tsx
@@ -13,7 +13,8 @@ const SortIndicator: React.FC<InstanceProp> = ({ instance }) => {
 
   return (
     <div className={styles.sortIndicator}>
-      <span className={styles.sortIndicator__text}>Sorted By</span>
+      <span className={styles.sortIndicator__text}>Sorted By: &nbsp; </span>
+      {''}
       <span className={styles.sortIndicator__subText}>
         {sortedByColumn ? (
           <>

diff --git a/webview/src/components/SortIndicator/styles.module.scss b/webview/src/components/SortIndicator/styles.module.scss
@@ -1,16 +1,16 @@
 .sortIndicator {
   display: flex;
-  flex-direction: column;
   align-items: baseline;
+
+  background-color: rgb(54, 54, 54);
+  min-width: 110px;
   padding: 0.375rem 0.5rem;
-  background-color: #4f5255;
-  min-width: 150px;
   color: #fafafa;
-  margin: 1rem 0;
+
   &__text {
-    font-size: 14px;
+    font-size: 16px;
   }
   &__subText {
-    font-size: 15px;
+    font-size: 16px;
   }
 }
diff --git a/webview/src/components/Table/index.tsx b/webview/src/components/Table/index.tsx
@@ -262,12 +262,12 @@ export const TableHead: React.FC<InstanceProp> = ({
 
   return (
     <div className={styles.thead}>
-      {headerGroups.slice(0, lastHeaderGroupIndex).map((headerGroup, i) => (
+      {/* {headerGroups.slice(0, lastHeaderGroupIndex).map((headerGroup, i) => (
         <ParentHeaderGroup
           headerGroup={headerGroup}
           key={`header-group-${i}`}
         />
-      ))}
+      ))} */}
       <PrimaryHeaderGroup headerGroup={lastHeaderGroup} />
     </div>
   )

diff --git a/webview/src/components/Table/styles.module.scss b/webview/src/components/Table/styles.module.scss
@@ -1,7 +1,7 @@
 // Variables
 
 $row-bg-color: var(--vscode-editor-background);
-$row-bg-alt-color: rgb(60, 60, 60, 1);
+$row-bg-alt-color: rgba(60, 60, 60, 0.7);
 
 // Extendable Silent Rules
 
@@ -95,6 +95,20 @@ $row-bg-alt-color: rgb(60, 60, 60, 1);
   height: 100%;
   display: flex;
   flex-flow: column nowrap;
+  .experimentsButton {
+    width: fit-content;
+    background-color: #4f4f4f;
+    align-self: flex-start;
+    display: inline-block;
+    cursor: pointer;
+    color: #e8e8e8;
+    font-size: 0.9rem;
+    font-weight: bold;
+    padding: 0.3rem 0.7rem;
+    margin: 0.5rem 1rem;
+    text-decoration: none;
+    outline: none;
+  }
   .firstCell {
     display: flex;
     flex-flow: row nowrap;
@@ -163,6 +177,7 @@ $row-bg-alt-color: rgb(60, 60, 60, 1);
   }
 
   .rowGroup {
+    font-family: 'monospace';
     margin: 0.5rem 0;
   }
   .normalRowGroup {
@@ -186,13 +201,13 @@ $row-bg-alt-color: rgb(60, 60, 60, 1);
   }
   .td {
     padding: 0 0.25rem;
-    font-size: 1.1rem;
+    font-size: 0.9rem;
     line-height: 2rem;
     align-items: center;
   }
   .experimentCell {
     text-align: left;
-    padding-left: 1rem;
+    padding-left: 0.7rem;
   }
   .groupedCell,
   .groupedHeader {
@@ -205,30 +220,57 @@ $row-bg-alt-color: rgb(60, 60, 60, 1);
   .parentHeaderCell {
     text-align: left;
     padding: 0.1rem 0.2rem;
-    font-size: 0.9rem;
+    font-size: 0.8rem;
   }
   .headersRow {
     text-align: center;
     font-weight: bold;
-    font-size: 1.2rem;
+    font-size: 0.9rem;
+    user-select: none;
+    background-color: inherit;
+    border-bottom: 1px solid white;
     .th {
+      border-bottom: 2px solid rgba(255, 255, 255, 0.5);
       padding: 0.4rem 0.25rem;
     }
+    .sortedHeader {
+      border-bottom: 2px solid rgba(255, 255, 255);
+    }
   }
 }
+.webviewHeader {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.experimentsButton:hover {
+  background-color: #414141;
+}
+.experimentsButton:active {
+  position: relative;
+  top: 1px;
+}
 
 .pageHeading {
-  font-size: 2rem;
+  font-size: 1.6rem;
   margin: 1rem;
 }
 
 .optionsPanel {
   margin: 0.5rem 1rem;
+  summary {
+    outline: none;
+  }
 }
 
 .tableOptions {
   display: flex;
-  align-items: flex-start;
-  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
   padding: 0 1rem;
+  button {
+    background-color: rgb(54, 54, 54);
+  }
 }
diff --git a/webview/src/fonts/Roboto-Light.ttf b/webview/src/fonts/Roboto-Light.ttf
diff --git a/webview/src/fonts/RobotoMono-Light.ttf b/webview/src/fonts/RobotoMono-Light.ttf
diff --git a/webview/src/style.scss b/webview/src/style.scss
@@ -1,6 +1,7 @@
 * {
   box-sizing: border-box;
   outline: none;
+  font-family: 'monospace', 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
 }
 
 html,
@@ -11,10 +12,10 @@ body,
 
 .react-root {
   display: inline-block;
+  max-width: fit-content;
+  width: inherit;
 }
-
 body {
-  font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
   margin: 0px;
   padding: 0px;
   border: 0px;

diff --git a/webview/webpack.config.ts b/webview/webpack.config.ts
@@ -58,7 +58,7 @@ module.exports = {
         ]
       },
       {
-        test: /\.(jpe?g|png|gif|eot|ttf|svg|woff|woff2|md)$/i,
+        test: /\.(jpe?g|png|gif|eot|svg|woff|woff2|md)$/i,
         loader: 'file-loader'
       },
       {
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ module.exports = { @@
             ]
           },
           {
-            test: /\.(jpe?g|png|gif|eot|ttf|svg|woff|woff2|md)$/i,
+            test: /\.(jpe?g|png|gif|eot|svg|woff|woff2|md)$/i,
             loader: 'file-loader'
           },
           {
@@ Expand Down @@