Update app.ts, editor.ts

Nate Butler created 3 years ago

Change summary

styles/app.ts        | 63 +++++++++++++++++++--------------------------
styles/components.ts |  4 ++
styles/editor.ts     |  4 +-
styles/theme.ts      | 12 ++++++++
styles/workspace.ts  |  4 +-
5 files changed, 47 insertions(+), 40 deletions(-)

Detailed changes

styles/app.ts

@@ -1,10 +1,10 @@
-import { backgroundColor, text } from "./components";
-import selectorModal from "./selector-modal";
-import workspace from "./workspace";
+import chatPanel from "./chat-panel";
+import { backgroundColor, border, borderColor, player, text } from "./components";
 import editor from "./editor";
-import Theme from "./theme";
 import projectPanel from "./project-panel";
-import chatPanel from "./chat-panel";
+import selectorModal from "./selector-modal";
+import Theme from "./theme";
+import workspace from "./workspace";
 
 export const panel = {
   padding: { top: 12, left: 12, bottom: 12, right: 12 },
@@ -35,27 +35,27 @@ export default function app(theme: Theme): Object {
     contactsPanel: {
       extends: "$panel",
       hostRowHeight: 28,
-      treeBranchColor: "$surface.100",
+      treeBranchColor: borderColor(theme, "muted"),
       treeBranchWidth: 1,
       hostAvatar: {
         cornerRadius: 10,
         width: 18,
       },
       hostUsername: {
-        extends: "$text.primary",
+        ...text(theme, "mono", "muted"),
         padding: {
           left: 8,
         },
       },
       hoveredSharedProject: {
-        background: "$state.hover",
-        cornerRadius: 6,
         extends: "$contacts_panel.sharedProject",
+        background: theme.editor.line.active.value,
+        cornerRadius: 6,
       },
       hoveredUnsharedProject: {
-        background: "$state.hover",
-        cornerRadius: 6,
         extends: "$contacts_panel.unsharedProject",
+        background: theme.editor.line.active.value,
+        cornerRadius: 6,
       },
       project: {
         guestAvatarSpacing: 4,
@@ -65,7 +65,7 @@ export default function app(theme: Theme): Object {
           width: 14,
         },
         name: {
-          extends: "$text.secondary",
+          extends: text(theme, "mono", "secondary"),
           margin: {
             right: 6,
           },
@@ -77,7 +77,7 @@ export default function app(theme: Theme): Object {
       sharedProject: {
         extends: "$contactsPanel.project",
         name: {
-          color: "$text.primary.color",
+          color: text(theme, "mono", "primary"),
         },
       },
       unsharedProject: {
@@ -86,28 +86,25 @@ export default function app(theme: Theme): Object {
     },
     search: {
       background: backgroundColor(theme, 300),
-      matchBackground: "$state.highlightedLine",
+      matchBackground: theme.editor.highlight.match,
       tabIconSpacing: 4,
       tabIconWidth: 14,
       activeHoveredOptionButton: {
-        background: "$surface.100",
         extends: "$search.option_button",
+        background: backgroundColor(theme, 100),
       },
       activeOptionButton: {
-        background: "$surface.100",
         extends: "$search.option_button",
+        background: backgroundColor(theme, 100),
       },
       editor: {
-        background: "$surface.500",
+        background: backgroundColor(theme, 500),
         cornerRadius: 6,
         maxWidth: 400,
-        placeholderText: "$text.muted",
-        selection: "$selection.host",
-        text: "$text.primary",
-        border: {
-          color: "$border.primary",
-          width: 1,
-        },
+        placeholderText: text(theme, "mono", "placeholder"),
+        selection: player(theme, 1).selection,
+        text: text(theme, "mono", "primary"),
+        border: border(theme, "primary"),
         margin: {
           bottom: 5,
           left: 5,
@@ -122,28 +119,22 @@ export default function app(theme: Theme): Object {
         },
       },
       hoveredOptionButton: {
-        background: "$surface.100",
         extends: "$search.optionButton",
+        background: backgroundColor(theme, 100),
       },
       invalidEditor: {
         extends: "$search.editor",
-        border: {
-          color: "$status.bad",
-          width: 1,
-        },
+        border: border(theme, "error"),
       },
       matchIndex: {
-        extends: "$text.secondary",
+        ...text(theme, "mono", "secondary"),
         padding: 6,
       },
       optionButton: {
+        ...text(theme, "mono", "secondary"),
         background: backgroundColor(theme, 300),
         cornerRadius: 6,
-        extends: "$text.secondary",
-        border: {
-          color: "$border.primary",
-          width: 1,
-        },
+        border: border(theme, "primary"),
         margin: {
           left: 1,
           right: 1,
@@ -162,7 +153,7 @@ export default function app(theme: Theme): Object {
         },
       },
       resultsStatus: {
-        extends: "$text.primary",
+        ...text(theme, "mono", "primary"),
         size: 18,
       },
     },

styles/components.ts

@@ -47,6 +47,10 @@ export function border(
   };
 }
 
+export function borderColor(theme: Theme, color: keyof Theme["borderColor"]) {
+  return theme.borderColor[color].value;
+}
+
 export function iconColor(theme: Theme, color: keyof Theme["iconColor"]) {
   return theme.iconColor[color].value;
 }

styles/editor.ts

@@ -4,7 +4,7 @@ import {
   iconColor,
   player,
   text,
-  TextColor,
+  TextColor
 } from "./components";
 import Theme from "./theme";
 
@@ -89,7 +89,7 @@ export default function editor(theme: Theme) {
     diagnosticHeader: {
       background: theme.editor.background.value,
       iconWidthFactor: 1.5,
-      textScaleFactor: 0.857,
+      textScaleFactor: 0.857, // NateQ: Will we need dynamic sizing for text? If so let's create tokens for these.
       border: border(theme, "secondary", {
         bottom: true,
         top: true,

styles/theme.ts

@@ -71,6 +71,18 @@ export default interface Theme {
     active: {
       value: Color;
     };
+    ok: {
+      value: Color;
+    };
+    error: {
+      value: Color;
+    };
+    warning: {
+      value: Color;
+    };
+    info: {
+      value: Color;
+    };
   };
   textColor: {
     primary: {

styles/workspace.ts

@@ -42,8 +42,8 @@ export default function workspace(theme: Theme) {
   };
 
   const sidebarItem = {
-    height: "$workspace.tab.height",
-    iconColor: "$text.muted.color",
+    height: 32,
+    iconColor: iconColor(theme, "secondary"),
     iconSize: 18,
   };
   const sidebar = {