Skip to content

Commit 7ac5043

Browse files
authored
Fix style inconsistencies (#471)
* fix up qualifier page styles * make navbar look like figma spacing
1 parent 0eb37ab commit 7ac5043

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

frontend/src/components/Inputs/Chip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function Chip({
5858
onClick={handleClick}
5959
className={combineClasses(
6060
`${variant}-chip`,
61-
"px-2",
61+
"px-4",
6262
"paragraph-3",
6363
active && "active",
6464
addClass

frontend/src/pages/Authentication/LoginForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function LoginForm() {
2424

2525
return (
2626
<div>
27-
<h3 className="mb-10 text-4xl font-bold">Log in</h3>
27+
<h3 className="mb-8 text-4xl font-bold">Log in</h3>
2828
<form onSubmit={handleSubmit(onSubmit)} noValidate>
2929
<TextField
3030
label="Email"

frontend/src/pages/QualifierPage/QualifierComponents.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function QualifierTitle({ children, title }: QualifierTitleProps) {
1313
return (
1414
<Fragment>
1515
<h1 className="title-2 mt-6">{title}</h1>
16-
<p className="paragraph-1 row justify-center mt-3">{children}</p>
16+
<p className="paragraph-1 row justify-center my-3">{children}</p>
1717
</Fragment>
1818
);
1919
}

frontend/src/pages/QualifierPage/QualifierPageRoles.tsx

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,35 @@ function CopRoles({ copDatum }: CopRolesProps) {
6565

6666
return (
6767
<div className="row fill flex-center-x my-1">
68-
<div className="col-7">
69-
<div className="row align-center my-2">
70-
<copDatum.icon
71-
fill="black"
72-
strokeWidth="0.2"
73-
height="21"
74-
aria-hidden="true"
75-
/>
76-
<span className="title-4 ml-1">{copDatum.title}</span>
68+
<div className="col-8">
69+
<div className="row align-center my-3 justify-between">
70+
<div className="flex items-center">
71+
<copDatum.icon
72+
fill="black"
73+
strokeWidth="0.2"
74+
height="21"
75+
aria-hidden="true"
76+
/>
77+
<span className="title-4 ml-1">{copDatum.title}</span>
78+
</div>
79+
<span
80+
className="links"
81+
tabIndex={0}
82+
role="button"
83+
aria-pressed={isAllSelected}
84+
onClick={handleSelectAll}
85+
onKeyDown={(e) => onKey(handleSelectAll, "Enter")(e)}
86+
>
87+
{isAllSelected ? "Deselect all" : "Select all"}
88+
</span>
7789
</div>
7890
<div>
7991
{copDatum.roles.map((role, index) => {
8092
return (
8193
<Chip
8294
key={index}
8395
variant="multi"
84-
addClass="mr-2 mb-2"
96+
addClass="mr-4 mb-4"
8597
checked={isRoleChecked[index]}
8698
value={role}
8799
onClick={(active, value) => {
@@ -95,18 +107,6 @@ function CopRoles({ copDatum }: CopRolesProps) {
95107
})}
96108
</div>
97109
</div>
98-
<div className="col-1 text-right">
99-
<span
100-
className="links"
101-
tabIndex={0}
102-
role="button"
103-
aria-pressed={isAllSelected}
104-
onClick={handleSelectAll}
105-
onKeyDown={(e) => onKey(handleSelectAll, "Enter")(e)}
106-
>
107-
{isAllSelected ? "Deselect all" : "Select all"}
108-
</span>
109-
</div>
110110
</div>
111111
);
112112
}

frontend/src/tw-components/HeaderNav.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function HeaderNav() {
3535
};
3636

3737
return (
38-
<header className="h-16 py-1 px-3 w-full flex items-center justify-between shadow-[-1px_1px_2px_rgb(51,51,51,0.2)]">
38+
<header className="h-16 py-1 px-3 w-full flex items-center justify-between lg:justify-around shadow-[-1px_1px_2px_rgb(51,51,51,0.2)]">
3939
<div>
4040
<Logo />
4141
</div>
@@ -48,7 +48,7 @@ function HeaderNav() {
4848
{menuItems.map((item, index) => {
4949
return (
5050
<a
51-
className="hover:underline font-bold mr-4"
51+
className="hover:underline font-bold md:mx-6 lg:mx-8"
5252
href={item.link}
5353
rel="noopener noreferrer"
5454
key={index}
@@ -59,7 +59,7 @@ function HeaderNav() {
5959
})}
6060
</nav>
6161

62-
<Link to="/login">
62+
<Link to="/login" className="mg:ml-6 lg:ml-8">
6363
<Button color="primary" size="sm">
6464
Log In
6565
</Button>

0 commit comments

Comments
 (0)