diff --git a/src/components/Card.tsx b/src/components/Card.tsx index c5315237..dd5f0594 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -3,15 +3,22 @@ import OpenColor from "open-color"; import "./Card.scss"; export const Card: React.FC<{ - color: keyof OpenColor; + color: keyof OpenColor | "primary"; }> = ({ children, color }) => { return (
{children} diff --git a/src/components/IconPicker.scss b/src/components/IconPicker.scss index c0241660..5d0857f4 100644 --- a/src/components/IconPicker.scss +++ b/src/components/IconPicker.scss @@ -22,7 +22,7 @@ align-items: center; justify-content: center; - &:focus { + &:focus-visible { outline: transparent; background-color: var(--button-gray-2); & svg { diff --git a/src/components/Island.scss b/src/components/Island.scss index d6d784ad..499d13ad 100644 --- a/src/components/Island.scss +++ b/src/components/Island.scss @@ -3,7 +3,7 @@ --padding: 0; background-color: var(--island-bg-color); box-shadow: var(--shadow-island); - border-radius: 4px; + border-radius: var(--border-radius-lg); padding: calc(var(--padding) * var(--space-factor)); position: relative; transition: box-shadow 0.5s ease-in-out; diff --git a/src/components/LayerUI.tsx b/src/components/LayerUI.tsx index 9f65f97d..8bc9bd03 100644 --- a/src/components/LayerUI.tsx +++ b/src/components/LayerUI.tsx @@ -19,7 +19,6 @@ import { ExportCB, ImageExportDialog } from "./ImageExportDialog"; import { FixedSideContainer } from "./FixedSideContainer"; import { HintViewer } from "./HintViewer"; import { Island } from "./Island"; -import "./LayerUI.scss"; import { LoadingMessage } from "./LoadingMessage"; import { LockButton } from "./LockButton"; import { MobileMenu } from "./MobileMenu"; @@ -35,6 +34,9 @@ import { LibraryButton } from "./LibraryButton"; import { isImageFileHandle } from "../data/blob"; import { LibraryMenu } from "./LibraryMenu"; +import "./LayerUI.scss"; +import "./Toolbar.scss"; + interface LayerUIProps { actionManager: ActionManager; appState: AppState; @@ -305,7 +307,12 @@ const LayerUI = ({
{(heading) => ( - + ["setState"]; -}> = ({ appState, setAppState }) => { + isMobile?: boolean; +}> = ({ appState, setAppState, isMobile }) => { return (