From a1b4d24907ab41783f09484dbc01fb8d6dc007d4 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Thu, 15 Feb 2024 15:55:32 -0800 Subject: [PATCH] Better button highlight border --- src-web/components/GlobalHooks.tsx | 2 +- src-web/components/core/Button.tsx | 6 +++--- src-web/components/core/Editor/extensions.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src-web/components/GlobalHooks.tsx b/src-web/components/GlobalHooks.tsx index afbd1611..63833273 100644 --- a/src-web/components/GlobalHooks.tsx +++ b/src-web/components/GlobalHooks.tsx @@ -30,7 +30,7 @@ export function GlobalHooks() { // if no component references them useRecentWorkspaces(); useRecentEnvironments(); - console.log(useRecentRequests()); + useRecentRequests(); useSyncAppearance(); diff --git a/src-web/components/core/Button.tsx b/src-web/components/core/Button.tsx index cc55226d..8a340acb 100644 --- a/src-web/components/core/Button.tsx +++ b/src-web/components/core/Button.tsx @@ -61,13 +61,13 @@ export const Button = forwardRef(function Button size === 'sm' && 'h-sm px-2.5 text-sm', size === 'xs' && 'h-xs px-2 text-sm', // Solids - variant === 'solid' && color === 'custom' && 'ring-blue-500/50', + variant === 'solid' && color === 'custom' && 'ring-blue-400', variant === 'solid' && color === 'default' && - 'text-gray-700 enabled:hocus:bg-gray-700/10 enabled:hocus:text-gray-800 ring-blue-500/50', + 'text-gray-700 enabled:hocus:bg-gray-700/10 enabled:hocus:text-gray-800 ring-blue-400', variant === 'solid' && color === 'gray' && - 'text-gray-800 bg-highlight enabled:hocus:text-gray-1000 ring-gray-400', + 'text-gray-800 bg-highlight enabled:hocus:text-gray-1000 ring-blue-400', variant === 'solid' && color === 'primary' && 'bg-blue-400 text-white ring-blue-700', variant === 'solid' && color === 'secondary' && 'bg-violet-400 text-white ring-violet-700', variant === 'solid' && color === 'warning' && 'bg-orange-400 text-white ring-orange-700', diff --git a/src-web/components/core/Editor/extensions.ts b/src-web/components/core/Editor/extensions.ts index 9dd25e0c..b0969abf 100644 --- a/src-web/components/core/Editor/extensions.ts +++ b/src-web/components/core/Editor/extensions.ts @@ -133,7 +133,6 @@ export const baseExtensions = [ return (a.boost ?? 0) - (b.boost ?? 0); }, }), - keymap.of([indentWithTab]), syntaxHighlighting(myHighlightStyle), myTheme, EditorState.allowMultipleSelections.of(true), @@ -160,6 +159,7 @@ export const multiLineExtensions = [ highlightActiveLineGutter(), highlightSelectionMatches({ minSelectionLength: 2 }), keymap.of([ + indentWithTab, ...closeBracketsKeymap, ...defaultKeymap, ...searchKeymap,