open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uninstall daisy. Migrate colors

Browse Source
This commit is contained in:
Sinclair Chen 2022-10-12 18:19:47 -07:00
parent eae1a89d90
commit 2e39d7b6cc
15 changed files with 24 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/charity.ts
View File

@ -246,7 +246,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
description: `At Rethink Charity, we’re excited about improving the world by providing vital support to high-impact charities and charitable projects. We equip them with tools to boost their impact, through our projects that empower their donors with tax-efficient giving options and strategically coordinated matching opportunities.
What we do:
- Rethink Charity Forward is a cause-neutral donation routing fund for high-impact charities around the world. Canadians have used RC Forward to donate $10 million to high-impact charities since the project was launched in late 2017.
- Rethink Charity Forward is a cause-gray-700 donation routing fund for high-impact charities around the world. Canadians have used RC Forward to donate $10 million to high-impact charities since the project was launched in late 2017.
- EA Giving Tuesday supports both donors and highly effective nonprofits participating in Facebook’s annual Giving Tuesday match. In addition to setting up systems and processes, the team provides analysis-based recommendations, detailed instructions, and responsive support. The team’s goal is to make it as easy as possible for donors to direct matching dollars to highly effective nonprofits.`,
},
@ -595,7 +595,8 @@ In addition to housing impact litigation, we provide free legal aid, education a
photo:
'https://firebasestorage.googleapis.com/v0/b/mantic-markets.appspot.com/o/user-images%2Fdefault%2Fci2h3hStFM.47?alt=media&token=0d2cdc3d-e4d8-4f5e-8f23-4a586b6ff637',
preview: 'Donate supplies to soldiers in Ukraine',
description: 'Donate supplies to soldiers in Ukraine, including tourniquets and plate carriers.',
description:
'Donate supplies to soldiers in Ukraine, including tourniquets and plate carriers.',
},
].map((charity) => {
const slug = charity.name.toLowerCase().replace(/\s/g, '-')

2
web/components/add-funds-modal.tsx
View File

@ -35,7 +35,7 @@ export function AddFundsModal(props: {
<div className="text-xl">{manaToUSD(amountSelected)}</div>
</div>
<div className="modal-action">
<div className="flex">
<Button color="gray-white" onClick={() => setOpen(false)}>
Back
</Button>

8
web/components/bet-panel.tsx
View File

@ -980,11 +980,11 @@ export function SellPanel(props: {
<Col className="mt-3 w-full gap-3 text-sm">
<Row className="items-center justify-between gap-2 text-gray-500">
Sale amount
<span className="text-neutral">{formatMoney(saleValue)}</span>
<span className="text-gray-700">{formatMoney(saleValue)}</span>
</Row>
<Row className="items-center justify-between gap-2 text-gray-500">
Profit
<span className="text-neutral">{formatMoney(profit)}</span>
<span className="text-gray-700">{formatMoney(profit)}</span>
</Row>
<Row className="items-center justify-between">
<div className="text-gray-500">
@ -1000,11 +1000,11 @@ export function SellPanel(props: {
<>
<Row className="mt-6 items-center justify-between gap-2 text-gray-500">
Loan payment
<span className="text-neutral">{formatMoney(-loanPaid)}</span>
<span className="text-gray-700">{formatMoney(-loanPaid)}</span>
</Row>
<Row className="items-center justify-between gap-2 text-gray-500">
Net proceeds
<span className="text-neutral">{formatMoney(netProceeds)}</span>
<span className="text-gray-700">{formatMoney(netProceeds)}</span>
</Row>
</>
)}

2
web/components/bets-list.tsx
View File

@ -550,7 +550,7 @@ function BetRow(props: {
return (
<tr>
<td className="text-neutral">
<td className="text-gray-700">
{isYourBet &&
!isCPMM &&
!isResolved &&

2
web/components/contract-search.tsx
View File

@ -438,7 +438,7 @@ function ContractSearchControls(props: {
}
return (
<Col className={clsx('bg-base-200 top-0 z-20 gap-3 pb-3', className)}>
<Col className={clsx('bg-greyscale-1 top-0 z-20 gap-3 pb-3', className)}>
<Row className="gap-1 sm:gap-2">
<Input
type="text"

2
web/components/groups/edit-group-button.tsx
View File

@ -77,7 +77,7 @@ export function EditGroupButton(props: { group: Group; className?: string }) {
/>
</div>
<div className="modal-action">
<div className="flex">
<Button
color="red"
size="xs"

2
web/components/groups/group-overview.tsx
View File

@ -377,7 +377,7 @@ export function GroupAbout(props: {
<div className={'inline-flex items-center'}>
<div className="mr-1 text-gray-500">Created by</div>
<UserLink
className="text-neutral"
className="text-gray-700"
name={creator.name}
username={creator.username}
/>

2
web/components/toast-clipboard.tsx
View File

@ -8,7 +8,7 @@ export function ToastClipboard(props: { className?: string }) {
return (
<Row
className={clsx(
'border-base-300 absolute items-center' +
'border-greyscale-4 absolute items-center' +
'gap-2 divide-x divide-gray-200 rounded-md border-2 bg-white ' +
'h-15 z-10 w-[15rem] p-2 pr-3 text-gray-500',
className

1
web/package.json
View File

@ -44,7 +44,6 @@
"d3-scale": "4.0.2",
"d3-selection": "3.0.0",
"d3-shape": "3.1.0",
"daisyui": "1.16.4",
"dayjs": "1.10.7",
"firebase": "9.9.3",
"gridjs": "5.0.2",

2
web/pages/_document.tsx
View File

@ -23,7 +23,7 @@ export default function Document() {
crossOrigin="anonymous"
/>
</Head>
<body className="font-readex-pro bg-base-200 min-h-screen">
<body className="font-readex-pro bg-greyscale-1 min-h-screen">
<Main />
<NextScript />
</body>

6
web/pages/create.tsx
View File

@ -479,10 +479,12 @@ export function NewContract(props: {
/>
</label>
{!deservesFreeMarket ? (
<div className="text-neutral pl-1 text-sm">{formatMoney(ante)}</div>
<div className="pl-1 text-sm text-gray-700">
{formatMoney(ante)}
</div>
) : (
<Row className="text-sm">
<div className="text-neutral pl-1 line-through">
<div className="pl-1 text-gray-700 line-through">
{formatMoney(ante)}
</div>
<div className="text-primary pl-1">FREE </div>

2
web/pages/groups.tsx
View File

@ -228,7 +228,7 @@ function GroupMembersList(props: { group: Group }) {
const { totalMembers } = group
if (totalMembers === 1) return <div />
return (
<div className="text-neutral flex flex-wrap gap-1">
<div className="flex flex-wrap gap-1 text-gray-700">
<span>{totalMembers} members</span>
</div>
)

2
web/pages/post/[...slugs]/index.tsx
View File

@ -86,7 +86,7 @@ export default function PostPage(props: {
<div className={'inline-flex'}>
<div className="mr-1 text-gray-500">Created by</div>
<UserLink
className="text-neutral"
className="text-gray-700"
name={creator.name}
username={creator.username}
/>

43
web/tailwind.config.js
View File

@ -16,6 +16,10 @@ module.exports = {
),
extend: {
colors: {
primary: '#11b981',
'primary-focus': '#069668',
warning: '#F59E0B', // amber-500 TODO: change color
error: '#ff5724', // TODO: change color
'red-25': '#FDF7F6',
'greyscale-1': '#FBFBFF',
'greyscale-1.5': '#F4F4FB',
@ -42,7 +46,6 @@ module.exports = {
require('@tailwindcss/forms'),
require('@tailwindcss/typography'),
require('@tailwindcss/line-clamp'),
require('daisyui'),
plugin(function ({ addUtilities }) {
addUtilities({
'.scrollbar-hide': {
@ -64,42 +67,4 @@ module.exports = {
})
}),
],
daisyui: {
themes: [
{
mantic: {
primary: '#11b981',
'primary-focus': '#069668',
// Foreground content color to use on primary color
'primary-content': '#ffffff',
secondary: '#a991f7',
'secondary-focus': '#8462f4',
// Foreground content color to use on secondary color
'secondary-content': '#ffffff',
accent: '#f6d860',
'accent-focus': '#f3cc30',
// Foreground content color to use on accent color
'accent-content': '#ffffff',
neutral: '#3d4451',
'neutral-focus': '#2a2e37',
// Foreground content color to use on neutral color
'neutral-content': '#ffffff',
'base-100': '#ffffff' /* Base page color, for blank backgrounds */,
'base-200': '#f9fafb' /* Base color, a little darker */,
'base-300': '#d1d5db' /* Base color, even more dark */,
// Foreground content color to use on base color
'base-content': '#1f2937',
info: '#2094f3',
success: '#009485',
warning: '#ff9900',
error: '#ff5724',
},
},
],
},
}

5
yarn.lock
View File

@ -5469,11 +5469,6 @@ d3-transition@3:
d3-interpolate "1 - 3"
d3-timer "1 - 3"
daisyui@1.16.4:
version "1.16.4"
resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-1.16.4.tgz#52773401c0962e37ef40507d29f0e513c7f2856f"
integrity sha512-bpPUlIR6PJdnaM+Vj+Rd0ljMwbdwjvFAW9E/bhxCRDEU48OnmpKQxnkwNGAtXbwWWATS6I1dEIlLdM8zCbV3uQ==
damerau-levenshtein@^1.0.7:
version "1.0.8"
resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"