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.

Sign up for GitHub

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

Jump to bottom

Daisy UI v4 #656

Merged
merged 10 commits into from
Dec 19, 2023
Merged

Daisy UI v4 #656

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fdf0fa0
update daisyUI version and add bg-base-200 in _app.tsx as background
technophile-04 Dec 11, 2023
f5c7bfe
use oklch instead of hsl
technophile-04 Dec 11, 2023
e9e9394
uppercase wallet address/ens name
technophile-04 Dec 11, 2023
602dd99
fix InputBase focus-within border
technophile-04 Dec 11, 2023
b3516e1
fix [address].tsx tabs
technophile-04 Dec 11, 2023
3d8591b
fix switch theme color
technophile-04 Dec 12, 2023
c73370e
fix merge conflicts with yarn install
technophile-04 Dec 18, 2023
81c22cc
remove uppercase from AddressInfoDropdown
technophile-04 Dec 19, 2023
f5b2e57
remove normal-case
technophile-04 Dec 19, 2023
6e48361
Merge branch 'main' into daisyUI-v4
technophile-04 Dec 19, 2023
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
2 changes: 1 addition & 1 deletion packages/nextjs/components/SwitchTheme.tsx
View file
Open in desktop
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/Input/InputBase.tsx
View file
Open in desktop
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
5 changes: 4 additions & 1 deletion ...ages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressInfoDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ export const AddressInfoDropdown = ({
return (
<>
<details ref={dropdownRef} className="dropdown dropdown-end leading-3">
<summary tabIndex={0} className="btn btn-secondary btn-sm pl-0 pr-2 shadow-md dropdown-toggle gap-0 !h-auto">
<summary
tabIndex={0}
className="btn btn-secondary uppercase btn-sm pl-0 pr-2 shadow-md dropdown-toggle gap-0 !h-auto"
carletex marked this conversation as resolved.
Show resolved Hide resolved
>
<BlockieAvatar address={address} size={30} ensImage={ensAvatar} />
<span className="ml-2 mr-1">{displayName}</span>
<ChevronDownIcon className="h-6 w-4 ml-2 sm:ml-0" />
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/package.json
View file
Open in desktop
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
View file
Open in desktop
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/styles/globals.css
View file
Open in desktop
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
View file
Open in desktop
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
Loading