Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Daisy UI v4 #656

Merged
merged 10 commits into from
Dec 19, 2023
4 changes: 2 additions & 2 deletions packages/nextjs/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const Footer = () => {
<div className="flex flex-col md:flex-row gap-2 pointer-events-auto">
{nativeCurrencyPrice > 0 && (
<div>
<div className="btn btn-primary btn-sm font-normal normal-case gap-1 cursor-auto">
<div className="btn btn-primary btn-sm font-normal gap-1 cursor-auto">
<CurrencyDollarIcon className="h-4 w-4" />
<span>{nativeCurrencyPrice}</span>
</div>
Expand All @@ -33,7 +33,7 @@ export const Footer = () => {
{isLocalNetwork && (
<>
<Faucet />
<Link href="/blockexplorer" passHref className="btn btn-primary btn-sm font-normal normal-case gap-1">
<Link href="/blockexplorer" passHref className="btn btn-primary btn-sm font-normal gap-1">
<MagnifyingGlassIcon className="h-4 w-4" />
<span>Block Explorer</span>
</Link>
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/components/SwitchTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const SwitchTheme = ({ className }: { className?: string }) => {
<input
id="theme-toggle"
type="checkbox"
className="toggle toggle-primary bg-primary"
className="toggle toggle-primary bg-primary hover:bg-primary border-primary"
onChange={toggle}
checked={isDarkMode}
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/components/scaffold-eth/Faucet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const Faucet = () => {

return (
<div>
<label htmlFor="faucet-modal" className="btn btn-primary btn-sm font-normal normal-case gap-1">
<label htmlFor="faucet-modal" className="btn btn-primary btn-sm font-normal gap-1">
<BanknotesIcon className="h-4 w-4" />
<span>Faucet</span>
</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const InputBase = <T extends { toString: () => string } | undefined = str
<div className={`flex border-2 border-base-300 bg-base-200 rounded-full text-accent ${modifier}`}>
{prefix}
<input
className="input input-ghost focus:outline-none focus:bg-transparent focus:text-gray-400 h-[2.2rem] min-h-[2.2rem] px-4 border w-full font-medium placeholder:text-accent/50 text-gray-400"
className="input input-ghost focus-within:border-transparent focus:outline-none focus:bg-transparent focus:text-gray-400 h-[2.2rem] min-h-[2.2rem] px-4 border w-full font-medium placeholder:text-accent/50 text-gray-400"
placeholder={placeholder}
name={name}
value={value?.toString()}
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@uniswap/sdk-core": "^4.0.1",
"@uniswap/v2-sdk": "^3.0.1",
"blo": "^1.0.1",
"daisyui": "^3.5.1",
"daisyui": "^4.4.19",
"next": "^13.1.6",
"nextjs-progressbar": "^0.0.16",
"qrcode.react": "^3.1.0",
Expand Down
16 changes: 5 additions & 11 deletions packages/nextjs/pages/blockexplorer/address/[address].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,29 +79,23 @@ const AddressPage = ({ address, contractData }: PageProps) => {
</div>
</div>
{isContract && (
<div className="tabs">
<div className="tabs tabs-lifted w-min">
<button
className={`tab tab-lifted ${activeTab === "transactions" ? "tab-active" : ""}`}
className={`tab ${activeTab === "transactions" ? "tab-active" : ""}`}
onClick={() => setActiveTab("transactions")}
>
Transactions
</button>
<button
className={`tab tab-lifted ${activeTab === "code" ? "tab-active" : ""}`}
onClick={() => setActiveTab("code")}
>
<button className={`tab ${activeTab === "code" ? "tab-active" : ""}`} onClick={() => setActiveTab("code")}>
Code
</button>
<button
className={`tab tab-lifted ${activeTab === "storage" ? "tab-active" : ""}`}
className={`tab ${activeTab === "storage" ? "tab-active" : ""}`}
onClick={() => setActiveTab("storage")}
>
Storage
</button>
<button
className={`tab tab-lifted ${activeTab === "logs" ? "tab-active" : ""}`}
onClick={() => setActiveTab("logs")}
>
<button className={`tab ${activeTab === "logs" ? "tab-active" : ""}`} onClick={() => setActiveTab("logs")}>
Logs
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/pages/debug.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const Debug: NextPage = () => {
<div className="flex flex-row gap-2 w-full max-w-7xl pb-1 px-6 lg:px-10 flex-wrap">
{contractNames.map(contractName => (
<button
className={`btn btn-secondary btn-sm normal-case font-thin ${
className={`btn btn-secondary btn-sm font-thin ${
contractName === selectedContract ? "bg-base-300" : "bg-base-100"
}`}
key={contractName}
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

:root,
[data-theme] {
background: hsl(var(--b2));
background: oklch(var(--b2));
}

body {
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module.exports = {

".tooltip": {
"--tooltip-tail": "6px",
"--tooltip-color": "hsl(var(--p))",
"--tooltip-color": "oklch(var(--p))",
},
".link": {
textUnderlineOffset: "2px",
Expand Down