Skip to content

Commit 971297a

Browse files
committed
style: fix header styles
1 parent 90e561f commit 971297a

File tree

10 files changed

+26
-13
lines changed

10 files changed

+26
-13
lines changed

web/src/components/EnsureAuth.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const EnsureAuth: React.FC<IEnsureAuth> = ({ children, className }) => {
3030
<Button
3131
text="Sign In"
3232
onClick={handleClick}
33-
disabled={isSigningIn || !address}
33+
isDisabled={isSigningIn || !address}
3434
isLoading={isSigningIn}
3535
{...{ className }}
3636
/>

web/src/layout/Header/navbar/Explore.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const Explore: React.FC<IExplore> = ({ isMobileNavbar }) => {
3737
key={text}
3838
className={cn(
3939
"flex items-center p-2 pl-0 rounded-[7px] lg:py-4 lg:px-2",
40-
"no-underline text-base",
40+
"no-underline text-base leading-tight",
4141
isActive(to) ? "text-klerosUIComponentsPrimaryText lg:text-white" : "text-primary-text-73 lg:text-white-73",
4242
isMobileNavbar ? "hover:text-klerosUIComponentsPrimaryText" : "hover:text-white",
4343
isMobileNavbar && isActive(to) ? "font-semibold" : "font-normal"

web/src/layout/Header/navbar/Menu/Settings/General.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { EnsureChain } from "components/EnsureChain";
66

77
export const DisconnectWalletButton: React.FC = () => {
88
const { disconnect } = useDisconnect();
9-
return <Button text={`Disconnect`} onClick={() => disconnect()} />;
9+
return <Button className="text-klerosUIComponentsWhiteBackground" text={`Disconnect`} onClick={() => disconnect()} />;
1010
};
1111

1212
const General: React.FC = () => {

web/src/layout/Header/navbar/Menu/Settings/Notifications/FormContactDetails/EmailVerificationInfo.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Button } from "@kleros/ui-components-library";
55
import HourglassIcon from "svgs/icons/hourglass.svg";
66
import { useAtlasProvider } from "@kleros/kleros-app";
77
import { errorToast, infoToast, successToast } from "utils/wrapWithToast";
8+
import clsx from "clsx";
89

910
interface IEmailInfo {
1011
toggleIsSettingsOpen: () => void;
@@ -40,7 +41,15 @@ const EmailVerificationInfo: React.FC<IEmailInfo> = ({ toggleIsSettingsOpen }) =
4041
<h3 className="m-0">Email Verification Pending</h3>
4142
<label>
4243
We sent you a verification email. Please, verify it.
43-
<br /> Didn’t receive the email? <Button text="Resend it" onClick={resendVerificationEmail} />
44+
<br /> Didn’t receive the email?{" "}
45+
<Button
46+
className={clsx(
47+
"inline-block bg-transparent p-0 focus:bg-transparent hover:bg-transparent",
48+
"[&_.button-text]:text-sm [&_.button-text]:font-normal [&_.button-text]:text-klerosUIComponentsPrimaryBlue"
49+
)}
50+
text="Resend it"
51+
onClick={resendVerificationEmail}
52+
/>
4453
</label>
4554
</div>
4655
</div>

web/src/layout/Header/navbar/Menu/Settings/Notifications/FormContactDetails/FormContact.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const FormContact: React.FC<IForm> = ({
3939
<>
4040
<label className="flex justify-between mb-[10px]">{contactLabel}</label>
4141
<TextField
42-
className="flex flex-col items-center w-full"
42+
className="flex flex-col items-center w-full [&_input]:text-sm"
4343
variant={fieldVariant}
4444
value={contactInput}
4545
onChange={(value) => setContactInput(value)}

web/src/layout/Header/navbar/Menu/Settings/Notifications/FormContactDetails/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const FormContactDetails: React.FC<ISettings> = ({ toggleIsSettingsOpen }) => {
111111
<Button
112112
type="submit"
113113
text="Save"
114-
disabled={
114+
isDisabled={
115115
!isEditingEmail || !emailIsValid || isAddingUser || isFetchingUser || isUpdatingUser || !isEmailUpdateable
116116
}
117117
/>

web/src/layout/Header/navbar/Menu/Settings/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import clsx from "clsx";
99

1010
const TABS = [
1111
{
12+
id: 0,
1213
text: "General",
13-
value: 0,
1414
},
1515
{
16+
id: 1,
1617
text: "Notifications",
17-
value: 1,
1818
},
1919
];
2020

@@ -33,12 +33,12 @@ const Settings: React.FC<ISettings> = ({ toggleIsSettingsOpen, initialTab }) =>
3333
className={clsx(
3434
"flex flex-col absolute max-h-[80vh] overflow-y-auto top-[5%] left-1/2 transform -translate-x-1/2 z-1",
3535
"bg-klerosUIComponentsWhiteBackground border border-solid border-klerosUIComponentsStroke rounded-[3px]",
36-
"lg:mt-16 lg:top-0 lg:right-0 lg:left-auto lg:transform-none"
36+
"lg:mt-16 lg:top-0 lg:right-0 lg:left-auto lg:transform-none lg:translate-x-0"
3737
)}
3838
>
3939
<div className="flex justify-center text-2xl mt-6 text-klerosUIComponentsPrimaryText">Settings</div>
4040
<Tabs
41-
className="py-0 px-[calc(8px+(32-8)*((100vw-300px)/(1250-300)))] max-w-[660px] lg:w-[calc(300px+(424-300)*((100vw-300px)/(1250-300)))]"
41+
className="py-0 px-[calc(8px+(32-8)*((100vw-300px)/(1250-300)))] max-w-[660px] w-[86vw] lg:w-[calc(300px+(424-300)*((100vw-300px)/(1250-300)))]"
4242
currentValue={currentTab}
4343
items={TABS}
4444
callback={(n: number) => {

web/src/layout/Header/navbar/Menu/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ const Menu: React.FC<ISettings & IHelp> = ({ toggleIsHelpOpen, toggleIsSettingsO
3636
return (
3737
<div className="flex flex-col lg:flex-row">
3838
{buttons.map(({ text, Icon, onClick }) => (
39-
<div key={Icon} className="flex items-center min-h-8 [&_.button-text]:block lg:[&_.button-text]:hidden">
39+
<div
40+
key={Icon}
41+
className="flex items-center min-h-8 [&_.button-text]:block lg:[&_.button-text]:hidden not-dark:not-lg:[&_.button-svg]:fill-black/75 not-dark:not-lg:hover:[&_.button-svg]:fill-black"
42+
>
4043
<LightButton {...{ text, onClick, Icon }} />
4144
</div>
4245
))}

web/src/layout/Header/navbar/Product.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const Product: React.FC<IProduct> = ({ text, url, Icon }) => {
2020
rel="noopener noreferrer"
2121
className={clsx(
2222
"flex flex-col items-center pt-4 pb-7 px-2 max-w-[100px] rounded-[3px] gap-2",
23-
"cursor-pointer bg-klerosUIComponentsLightBackground hover:bg-klerosUIComponentsLightGrey",
23+
"cursor-pointer bg-klerosUIComponentsLightBackground hover:bg-light-grey dark:hover:bg-klerosUIComponentsLightGrey",
2424
"hover:transition-[transform_0.15s,background-color_0.3s] hover:scale-[1.02]"
2525
)}
2626
style={{ width: responsiveSize(100, 130) }}
@@ -38,7 +38,7 @@ const Product: React.FC<IProduct> = ({ text, url, Icon }) => {
3838
) : (
3939
<Icon className="w-12 h-12" />
4040
)}
41-
<small className="flex font-normal text-center leading-[19px]">{text}</small>
41+
<small className="flex font-normal text-center leading-snug">{text}</small>
4242
</a>
4343
);
4444
};

web/src/layout/Header/navbar/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const NavBar: React.FC = () => {
4747
)}
4848
>
4949
<LightButton
50+
className="not-dark:[&_.button-svg]:fill-black/75 not-dark:hover:[&_.button-svg]:fill-black"
5051
text="Kleros Solutions"
5152
onClick={() => {
5253
toggleIsDappListOpen();

0 commit comments

Comments
 (0)