From 4ea176007d2228364d4d3fa4519898047cef988f Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Sun, 24 Sep 2023 11:27:24 -0700 Subject: feat: :lipstick: setting to change font size --- continuedev/src/continuedev/core/autopilot.py | 2 +- continuedev/src/continuedev/plugins/steps/main.py | 2 +- extension/react-app/src/components/EditableDiv.tsx | 6 ++++-- .../react-app/src/components/ModelSettings.tsx | 5 +++-- extension/react-app/src/components/PillButton.tsx | 6 ++++-- .../react-app/src/components/StepContainer.tsx | 12 ++++++++--- .../src/components/StyledMarkdownPreview.tsx | 8 ++++++-- extension/react-app/src/components/Suggestions.tsx | 7 ++++--- .../react-app/src/components/TimelineItem.tsx | 11 +++++----- .../src/components/UserInputContainer.tsx | 11 +++++++--- extension/react-app/src/components/index.ts | 20 ++++++++++++++++-- extension/react-app/src/pages/gui.tsx | 2 +- extension/react-app/src/pages/settings.tsx | 24 +++++++++++++++++++--- extension/react-app/src/util/index.ts | 5 +++++ 14 files changed, 91 insertions(+), 30 deletions(-) diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py index 5804ce6b..0155e755 100644 --- a/continuedev/src/continuedev/core/autopilot.py +++ b/continuedev/src/continuedev/core/autopilot.py @@ -68,7 +68,7 @@ def get_error_title(e: Exception) -> str: ): return e._message elif isinstance(e, ClientPayloadError): - return "The request to OpenAI failed. Please try again." + return "The request failed. Please try again." elif isinstance(e, openai_errors.APIConnectionError): return 'The request failed. Please check your internet connection and try again. If this issue persists, you can use our API key for free by going to VS Code settings and changing the value of continue.OPENAI_API_KEY to ""' elif isinstance(e, openai_errors.InvalidRequestError): diff --git a/continuedev/src/continuedev/plugins/steps/main.py b/continuedev/src/continuedev/plugins/steps/main.py index 241afe31..0698f1ae 100644 --- a/continuedev/src/continuedev/plugins/steps/main.py +++ b/continuedev/src/continuedev/plugins/steps/main.py @@ -333,7 +333,7 @@ class EditHighlightedCodeStep(Step): if len(range_in_files) == 0: raise ContinueCustomException( message="Please highlight some code and try again.", - title="No Code Selected", + title="No Code Selected (highlight and select with cmd+shift+M)", ) # If all of the ranges are point ranges, only edit the last one diff --git a/extension/react-app/src/components/EditableDiv.tsx b/extension/react-app/src/components/EditableDiv.tsx index a86bd692..1c295843 100644 --- a/extension/react-app/src/components/EditableDiv.tsx +++ b/extension/react-app/src/components/EditableDiv.tsx @@ -5,12 +5,13 @@ import { secondaryDark, vscForeground, } from "."; +import { getFontSize } from "../util"; -const Div = styled.div` +const Div = styled.div<{ fontSize?: number }>` resize: none; padding: 8px; - font-size: 13px; + font-size: ${(props) => props.fontSize || getFontSize()}px; font-family: inherit; border-radius: ${defaultBorderRadius}; margin: 8px auto; @@ -45,6 +46,7 @@ interface EditableDivProps { function EditableDiv(props: EditableDivProps) { return (
{ diff --git a/extension/react-app/src/components/ModelSettings.tsx b/extension/react-app/src/components/ModelSettings.tsx index 06516687..ac5a344b 100644 --- a/extension/react-app/src/components/ModelSettings.tsx +++ b/extension/react-app/src/components/ModelSettings.tsx @@ -10,6 +10,7 @@ import { } from "."; import { useState } from "react"; import { useFormContext } from "react-hook-form"; +import { getFontSize } from "../util"; const Div = styled.div<{ dashed: boolean }>` border: 1px ${(props) => (props.dashed ? "dashed" : "solid")} ${lightGray}; @@ -56,7 +57,7 @@ function ModelSettings(props: { llm: any | undefined; role: string }) {
{typeof modelOptions.api_key !== undefined && ( <> - + - + ` border: none; color: ${vscForeground}; background-color: ${secondaryDark}; @@ -27,7 +28,7 @@ const Button = styled.button` padding-left: 8px; padding-right: 8px; overflow: hidden; - font-size: 13px; + font-size: ${(props) => props.fontSize || getFontSize()}px; cursor: pointer; `; @@ -120,6 +121,7 @@ const PillButton = (props: PillButtonProps) => { return (
{ setIsHovered(true); diff --git a/extension/react-app/src/components/StepContainer.tsx b/extension/react-app/src/components/StepContainer.tsx index 61529227..e7264c5d 100644 --- a/extension/react-app/src/components/StepContainer.tsx +++ b/extension/react-app/src/components/StepContainer.tsx @@ -5,6 +5,7 @@ import { ArrowPathIcon, XMarkIcon } from "@heroicons/react/24/outline"; import { HistoryNode } from "../../../schema/HistoryNode"; import HeaderButtonWithText from "./HeaderButtonWithText"; import StyledMarkdownPreview from "./StyledMarkdownPreview"; +import { getFontSize } from "../util"; interface StepContainerProps { historyNode: HistoryNode; @@ -41,12 +42,12 @@ const ButtonsDiv = styled.div` height: 0; `; -const ContentDiv = styled.div<{ isUserInput: boolean }>` +const ContentDiv = styled.div<{ isUserInput: boolean; fontSize?: number }>` padding: 2px; padding-right: 0px; background-color: ${(props) => props.isUserInput ? secondaryDark : vscBackground}; - font-size: 13px; + font-size: ${(props) => props.fontSize || getFontSize()}px; border-radius: ${defaultBorderRadius}; overflow: hidden; `; @@ -122,8 +123,13 @@ function StepContainer(props: StepContainerProps) { )} -