Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update link styles #213

Merged
merged 1 commit into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/electron/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ function createWindow() {
height: 600,

// Hides the default (empty) window title
//
titleBarStyle: "hidden",

trafficLightPosition: { x: 10, y: 16 },
Expand Down
5 changes: 0 additions & 5 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;

/* --accent: 255, 89%, 62%; */
--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;

Expand Down Expand Up @@ -101,10 +100,6 @@ div {
color: rgb(41, 58, 242);
}

.hover-underline:hover {
text-decoration: underline;
}

/**
* When first elements of each note have margin-top,
* like heading elements, it acts like extra padding in the
Expand Down
14 changes: 8 additions & 6 deletions src/typography.css
Original file line number Diff line number Diff line change
Expand Up @@ -787,29 +787,31 @@ li > ul {
margin-left: 2.03125rem;
}

a {
/* Commented the links out when I re-styled editor links, but keeping them here for reference */

/* a {
color: #3e3e3e;
text-decoration: none;
border-bottom: 1px solid #3e3e3e;
}
} */

a:hover,
/* a:hover,
a:active {
text-decoration: underline;
}
} */

a.gatsby-resp-image-link {
box-shadow: none;
}

a:hover {
/* a:hover {
text-decoration: none;
}

header a {
text-decoration: none;
border-bottom: none;
}
} */

blockQuote {
margin-top: 25px;
Expand Down
8 changes: 3 additions & 5 deletions src/views/documents/DocumentItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ export function DocumentItem(props: {
const { doc, edit, getName } = props;

return (
<Pane
<div
key={doc.id}
style={{ display: "flex" }}
onClick={() => edit(doc.id)}
cursor="default"
className="hover-underline"
className="cursor-pointer flex hover:underline hover:underline-offset"
>
{/* Without mono font, dates won't be a uniform width */}
<div className="mono" style={{ flexShrink: 0, marginRight: "24px" }}>
Expand All @@ -34,6 +32,6 @@ export function DocumentItem(props: {
</Badge>
</small>
</div>
</Pane>
</div>
);
}
15 changes: 1 addition & 14 deletions src/views/edit/PlateContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,7 @@ import { createFilesPlugin } from "./editor/plugins/createFilesPlugin";
import { IClient } from "../../preload/client/types";
const client: IClient = (window as any).chronicles.createClient();

import { EditorToolbar } from "./editor/toolbar/EditorToolbar";
import { EditorMode } from "./EditorMode";
import FrontMatter from "./FrontMatter";
import { Pane } from "evergreen-ui";
import { EditableDocument } from "./EditableDocument";
import { JournalResponse } from "../../hooks/useClient";

Expand All @@ -125,17 +122,7 @@ export interface Props {
}

export default observer(
({
children,
document,
journals,
saving,
value,
setValue,
selectedEditorMode,
setSelectedEditorMode,
}: React.PropsWithChildren<Props>) => {
// todo: Commented out stuff is post-copy paste edit from plate-ui (as recommended), and should used to guide next steps.
({ children, saving, value, setValue }: React.PropsWithChildren<Props>) => {
const plugins = createPlugins(
[
createCodeBlockNormalizationPlugin(),
Expand Down
10 changes: 5 additions & 5 deletions src/views/edit/editor/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { cn, withRef } from "@udecode/cn";
import { cva, VariantProps } from "class-variance-authority";

export const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
"inline-flex items-center justify-center whitespace-nowrap text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
{
variants: {
variant: {
Expand All @@ -21,10 +21,10 @@ export const buttonVariants = cva(
},
size: {
default: "h-10 px-4 py-2",
xs: "h-8 rounded-md px-3",
sm: "h-9 rounded-md px-3",
sms: "h-9 w-9 rounded-md px-0",
lg: "h-11 rounded-md px-8",
xs: "h-6 px-0",
sm: "h-7 px-2",
sms: "h-7 w-9 px-0",
lg: "h-11 px-8",
icon: "h-10 w-10",
none: "",
},
Expand Down
4 changes: 2 additions & 2 deletions src/views/edit/editor/components/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { withVariants } from "@udecode/cn";
import { cva } from "class-variance-authority";

export const inputVariants = cva(
"flex w-full rounded-md bg-transparent text-sm file:border-0 file:bg-background file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",
"flex w-full bg-transparent text-sm file:border-0 file:bg-background file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",
{
variants: {
variant: {
Expand All @@ -11,7 +11,7 @@ export const inputVariants = cva(
ghost: "border-none focus-visible:ring-transparent",
},
h: {
sm: "h-9 px-3 py-2",
sm: "h-9 px-2 py-1",
md: "h-10 px-3 py-2",
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/views/edit/editor/components/Popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const PopoverTrigger = PopoverPrimitive.Trigger;
export const PopoverAnchor = PopoverPrimitive.Anchor;

export const popoverVariants = cva(
"w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 print:hidden",
"w-72 border bg-popover text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 print:hidden",
);

export const PopoverContent = withRef<typeof PopoverPrimitive.Content>(
Expand Down
2 changes: 1 addition & 1 deletion src/views/edit/editor/elements/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const LinkElement = withRef<typeof PlateElement>(
ref={ref}
asChild
className={cn(
"font-medium text-primary underline decoration-primary underline-offset-4",
"text-primary cursor-pointer underline underline-offset-1 decoration-1",
className,
)}
{...(linkProps as any)}
Expand Down
6 changes: 3 additions & 3 deletions src/views/edit/editor/elements/LinkFloatingToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export function LinkFloatingToolbar({ state }: LinkFloatingToolbarProps) {
const editContent = editState.isEditing ? (
input
) : (
<div className="box-content flex h-9 items-center gap-1">
<div className="box-content flex h-7 items-center">
<button
type="button"
className={buttonVariants({ variant: "ghost", size: "sm" })}
Expand Down Expand Up @@ -144,15 +144,15 @@ export function LinkFloatingToolbar({ state }: LinkFloatingToolbarProps) {
<>
<div
ref={insertRef}
className={cn(popoverVariants(), "w-auto p-1")}
className={cn(popoverVariants(), "w-auto")}
{...insertProps}
>
{input}
</div>

<div
ref={editRef}
className={cn(popoverVariants(), "w-auto p-1")}
className={cn(popoverVariants(), "w-auto")}
{...editProps}
>
{editContent}
Expand Down
Loading