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

Lighten resolve buttons

Browse Source
This commit is contained in:
James Grugett 2022-04-18 17:54:22 -05:00
parent 2118229953
commit 1cec5b78de
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/components/answers/answers-panel.tsx
View File

@ -82,13 +82,14 @@ export function AnswersPanel(props: {
return ( return (
<Col className="gap-3"> <Col className="gap-3">
{(resolveOption || resolution === 'MKT') && {(resolveOption === 'CHOOSE' ||
resolveOption === 'CHOOSE_MULTIPLE' ||
resolution === 'MKT') &&
sortedAnswers.map((answer) => ( sortedAnswers.map((answer) => (
<AnswerItem <AnswerItem
key={answer.id} key={answer.id}
answer={answer} answer={answer}
contract={contract} contract={contract}
user={user}
showChoice={showChoice} showChoice={showChoice}
chosenProb={chosenAnswers[answer.id]} chosenProb={chosenAnswers[answer.id]}
totalChosenProb={chosenTotal} totalChosenProb={chosenTotal}
@ -101,9 +102,10 @@ export function AnswersPanel(props: {
<div className="pb-4 text-gray-500">No answers yet...</div> <div className="pb-4 text-gray-500">No answers yet...</div>
)} )}
{tradingAllowed(contract) && !resolveOption && ( {tradingAllowed(contract) &&
<CreateAnswerPanel contract={contract} /> (!resolveOption || resolveOption === 'CANCEL') && (
)} <CreateAnswerPanel contract={contract} />
)}
{user?.id === creatorId && !resolution && ( {user?.id === creatorId && !resolution && (
<> <>

2
web/components/yes-no-selector.tsx
View File

@ -195,7 +195,7 @@ function Button(props: {
color === 'red' && 'bg-red-400 text-white hover:bg-red-500', color === 'red' && 'bg-red-400 text-white hover:bg-red-500',
color === 'yellow' && 'bg-yellow-400 text-white hover:bg-yellow-500', color === 'yellow' && 'bg-yellow-400 text-white hover:bg-yellow-500',
color === 'blue' && 'bg-blue-400 text-white hover:bg-blue-500', color === 'blue' && 'bg-blue-400 text-white hover:bg-blue-500',
color === 'gray' && 'bg-gray-300 text-gray-700 hover:bg-gray-400', color === 'gray' && 'bg-gray-200 text-gray-700 hover:bg-gray-300',
className className
)} )}
onClick={onClick} onClick={onClick}