Skip to content
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
2 changes: 1 addition & 1 deletion apps/app/src/components/IconProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { IconContext } from 'react-icons';

export const IconProvider = ({ children }: { children: React.ReactNode }) => {
return (
<IconContext.Provider value={{ className: 'stroke-[1.5]' }}>
<IconContext.Provider value={{ className: 'stroke-1' }}>
{children}
</IconContext.Provider>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { useFileUpload } from '@/hooks/useFileUpload';
import { cn } from '@op/ui/utils';
import type { Editor } from '@tiptap/react';
import {
AlignCenter,
Expand Down Expand Up @@ -110,7 +111,12 @@ export function RichTextEditorToolbar({
`shrink-0 rounded p-2 hover:bg-gray-100 ${active ? 'bg-gray-200' : ''}`;

return (
<div className={`justify-between border-b px-6 py-2 ${className}`}>
<div
className={cn(
'justify-between border-b px-6 py-2 text-neutral-charcoal',
className,
)}
>
<div className="mx-auto scrollbar-hide flex max-w-fit min-w-0 items-center gap-1 overflow-x-auto">
{/* Undo/Redo */}
<button
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { Button } from '@op/ui/Button';
import { Header4 } from '@op/ui/Header';
import { Sidebar, useSidebar } from '@op/ui/Sidebar';
import type { IconType } from 'react-icons';
import { LuAlignJustify } from 'react-icons/lu';
Expand Down Expand Up @@ -96,9 +97,7 @@ function SidebarContent({
</div>

<div className="mt-2 md:mt-4">
<h3 className="mb-2 text-sm font-medium text-neutral-gray4">
{t('Fields')}
</h3>
<Header4 className="mb-2">{t('Fields')}</Header4>
<ul className="space-y-1">
{fields.map((field) => {
const Icon =
Expand All @@ -109,7 +108,7 @@ function SidebarContent({
}
return (
<li key={field.id}>
<div className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm text-neutral-charcoal">
<div className="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-base text-neutral-charcoal">
<Icon className="size-4 shrink-0 text-neutral-gray4" />
<span className="truncate">{field.label}</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,12 @@ export function ProposalCardOwnerActions({
return (
<>
<div className="flex w-full items-center gap-4">
<ButtonLink href={editHref} color="secondary" className="w-full">
<ButtonLink
href={editHref}
color="secondary"
size="small"
className="w-full"
>
<Pencil className="size-4" />
{t('Edit')}
</ButtonLink>
Expand All @@ -129,6 +134,7 @@ export function ProposalCardOwnerActions({
<Button
onPress={() => setIsDeleteModalOpen(true)}
color="secondary"
size="small"
className="w-full"
isDisabled={deleteProposalMutation.isPending}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function ProposalCard({
<Surface
variant={isDraft ? 'filled' : 'empty'}
className={cn(
'relative flex w-full min-w-80 flex-col justify-between gap-4 p-6',
'relative flex w-full min-w-80 flex-col justify-between gap-3 p-4',
className,
)}
{...props}
Expand Down Expand Up @@ -383,10 +383,7 @@ export function ProposalCardPreview({

return (
<p
className={cn(
'mb-4 line-clamp-3 text-base text-neutral-charcoal',
className,
)}
className={cn('line-clamp-3 text-base text-neutral-charcoal', className)}
>
{displayText}
</p>
Expand Down
7 changes: 4 additions & 3 deletions apps/app/src/components/decisions/ProposalEditorLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { Button } from '@op/ui/Button';
import { Header4 } from '@op/ui/Header';
import { LoadingSpinner } from '@op/ui/LoadingSpinner';
import { useRouter } from 'next/navigation';
import { ReactNode, useState } from 'react';
Expand Down Expand Up @@ -61,10 +62,10 @@ export function ProposalEditorLayout({
<span className="hidden sm:block">{t('Back')}</span>
</button>

<div className="flex justify-center text-lg font-medium text-neutral-black">
<span className="hidden sm:block">
<div className="flex justify-center">
<Header4 className="hidden sm:block">
{title ? title : t('Untitled Proposal')}
</span>
</Header4>
</div>

<div className="flex items-center justify-end gap-4">
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/FileDropZone.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const dropZoneStyles = tv({
root: 'group/dropzone flex w-full',
button: [
'flex flex-1 cursor-pointer flex-col items-center justify-center gap-6',
'rounded-2xl border border-dashed border-neutral-gray2 bg-neutral-offWhite',
'px-12 py-8',
'rounded-lg border border-dashed border-neutral-gray2 bg-neutral-offWhite',
'px-12 py-6',
'outline-hidden transition-colors duration-200',
'focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-teal-500',
'group-data-[drop-target]/dropzone:border-teal-500 group-data-[drop-target]/dropzone:bg-teal-50/30',
Expand Down
16 changes: 16 additions & 0 deletions packages/ui/src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ export const Header3 = ({
);
};

export const Header4 = ({
children,
className,
}: {
children: React.ReactNode;
className?: string;
}) => {
return (
<h4
className={cn('font-serif text-title-sm14 text-neutral-black', className)}
>
{children}
</h4>
);
};

export const GradientHeader = ({
children,
className,
Expand Down
Loading