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
6 changes: 3 additions & 3 deletions frontend/app/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ const buttonStyles = cva(
variants: {
intent: {
default:
'text-sm hover:bg-gradient-to-r hover:from-wm-green hover:to-wm-green-fade',
'text-sm bg-white hover:bg-gradient-to-r hover:from-wm-green hover:to-wm-green-fade',
reset:
'text-sm hover:from-wm-purple hover:to-[#7f7fff] hover:text-white hover:bg-gradient-to-r',
'text-sm bg-white hover:from-wm-purple hover:to-[#7f7fff] hover:text-white hover:bg-gradient-to-r',
danger:
'disabled:bg-red-200 bg-red-500 hover:bg-red-600 shadow-md text-white',
icon: 'enabled:hover:bg-gradient-to-r enabled:hover:from-wm-green enabled:hover:to-wm-green-fade aspect-square shadow-md max-w-[30px] disabled:bg-gray-200 disabled:hover:bg-gray-200!',
icon: 'bg-white enabled:hover:bg-gradient-to-r enabled:hover:from-wm-green enabled:hover:to-wm-green-fade aspect-square shadow-md max-w-[30px] disabled:bg-gray-200 disabled:hover:bg-gray-200!',
invisible: 'px-1 border-none text-white'
},
size: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/components/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
)}
<div
className={cx(
'flex relative w-full p-2 h-9',
'flex relative w-full bg-white p-2 h-9',
withBorder && 'border rounded-lg'
)}
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/components/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const Select = ({
placeholder={placeholder}
/>
) : (
<Combobox.Button className="w-full max-h-8 h-8 border-none py-2 pl-3 pr-10 text-sm text-left text-gray-900 outline-none overflow-y-hidden">
<Combobox.Button className="w-full max-h-8 h-8 border-none py-2 pl-3 pr-10 text-sm text-left text-gray-900 outline-none whitespace-nowrap overflow-hidden text-ellipsis">
<>{internalValue ? internalValue.label : placeholder}</>
</Combobox.Button>
)}
Expand Down
10 changes: 9 additions & 1 deletion frontend/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { useEffect, useState } from 'react'
import stylesheet from '~/tailwind.css?url'
import { Button, Footer, Header, Snackbar } from './components/index.js'
import { XCircle } from './components/icons.js'
import { cx } from 'class-variance-authority'

export const loader = async ({ request }: LoaderFunctionArgs) => {
const url = new URL(request.url)
Expand Down Expand Up @@ -56,7 +57,14 @@ export default function App() {
</head>
<body className="h-screen">
<main className="h-auto min-h-full flex flex-col justify-between">
<div className="h-full flex flex-col bg-[url(/images/bg-tile.svg)] bg-[auto_25em]">
<div
className={cx(
'h-full flex flex-col',
!contentOnly
? 'bg-[url(/images/bg-tile.svg)] bg-[auto_25em]'
: 'bg-transparent'
)}
>
{!contentOnly && <Header />}
<Outlet />
</div>
Expand Down
Loading