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

Fix merging issues

Browse Source
This commit is contained in:
Pico2x 2022-10-03 10:41:00 +01:00
parent 00ee90bf7f
commit a78f2c1429
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/components/confirmation-button.tsx
View File

@ -76,7 +76,7 @@ export function ConfirmationButton(props: {
</Modal> </Modal>
<Button <Button
className={clsx(openModalBtn.className)} className={openModalBtn.className}
onClick={() => { onClick={() => {
if (disabled) { if (disabled) {
return return

4
web/components/contract/contract-overview.tsx
View File

@ -121,7 +121,9 @@ const BinaryOverview = (props: { contract: BinaryContract; bets: Bet[] }) => {
contract={contract} contract={contract}
large large
/> />
<ContractReportResolution contract={contract} /> {contract.isResolved && (
<ContractReportResolution contract={contract} />
)}
</Row> </Row>
</Row> </Row>
</Col> </Col>

4
web/components/contract/contract-report-resolution.tsx
View File

@ -32,8 +32,8 @@ export function ContractReportResolution(props: { contract: Contract }) {
} }
const flagClass = clsx( const flagClass = clsx(
'mx-2 flex flex-col items-center gap-1 w-6 h-6 text-gray-500 rounded-md bg-gray-100 px-2 py-1 hover:bg-gray-300', 'mx-2 flex flex-col items-center gap-1 w-6 h-6 rounded-md !bg-gray-100 px-2 py-1 hover:bg-gray-300',
userReported && 'text-red-500' userReported ? '!text-red-500' : '!text-gray-500'
) )
return ( return (