Skip to content

Commit 7147c8f

Browse files
committed
feat: destroying margins, update ui component library
1 parent 0da7cbd commit 7147c8f

22 files changed

+69
-64
lines changed

web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@kleros/kleros-app": "^2.0.1",
8282
"@kleros/kleros-sdk": "workspace:^",
8383
"@kleros/kleros-v2-contracts": "workspace:^",
84-
"@kleros/ui-components-library": "^2.16.0",
84+
"@kleros/ui-components-library": "^2.17.0",
8585
"@lifi/wallet-management": "^3.4.6",
8686
"@lifi/widget": "^3.12.3",
8787
"@sentry/react": "^7.120.0",

web/src/components/CasesDisplay/Search.tsx

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ import { responsiveSize } from "styles/responsiveSize";
1818
const Container = styled.div`
1919
display: flex;
2020
flex-direction: column;
21-
gap: 4px;
21+
gap: ${responsiveSize(8, 16)};
2222
2323
${landscapeStyle(
24-
() =>
25-
css`
26-
flex-direction: row;
27-
gap: ${responsiveSize(4, 22)};
28-
`
24+
() => css`
25+
flex-direction: row;
26+
`
2927
)}
3028
`;
3129

web/src/components/CasesDisplay/StatsAndFilters.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import React from "react";
22
import styled from "styled-components";
33

4+
import { responsiveSize } from "styles/responsiveSize";
5+
46
import Filters from "./Filters";
57
import Stats, { IStats } from "./Stats";
68

79
const Container = styled.div`
810
display: flex;
911
flex-wrap: wrap;
1012
gap: 8px;
11-
margin-top: 11px;
12-
margin-bottom: 48px;
13+
margin-top: ${responsiveSize(4, 8)};
14+
margin-bottom: ${responsiveSize(16, 32)};
1315
justify-content: space-between;
1416
`;
1517

web/src/components/CasesDisplay/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const TitleContainer = styled.div`
1717
justify-content: space-between;
1818
align-items: center;
1919
flex-wrap: wrap;
20-
margin-bottom: ${responsiveSize(32, 48)};
20+
margin-bottom: ${responsiveSize(12, 24)};
2121
`;
2222

2323
const StyledTitle = styled.h1`

web/src/components/ExtraStatsDisplay.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const Container = styled.div`
99
display: flex;
1010
gap: 8px;
1111
align-items: center;
12-
margin-top: 24px;
1312
`;
1413

1514
const SVGContainer = styled.div`

web/src/components/LatestCases.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import { SkeletonDisputeCard } from "components/StyledSkeleton";
1313
import { Dispute_Filter } from "../graphql/graphql";
1414

1515
const Container = styled.div`
16-
margin-top: ${responsiveSize(48, 80)};
16+
margin-top: ${responsiveSize(28, 48)};
1717
`;
1818

1919
const Title = styled.h1`
20-
margin-bottom: ${responsiveSize(16, 48)};
20+
margin-bottom: ${responsiveSize(12, 24)};
2121
`;
2222

2323
const DisputeContainer = styled.div`

web/src/pages/Cases/CaseDetails/Tabs.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React, { useState, useEffect, useMemo } from "react";
22
import styled from "styled-components";
33

4+
import { responsiveSize } from "styles/responsiveSize";
5+
46
import { useNavigate, useLocation, useParams } from "react-router-dom";
57

68
import { Tabs as TabsComponent } from "@kleros/ui-components-library";
@@ -20,6 +22,7 @@ import { useAppealCost } from "queries/useAppealCost";
2022

2123
const StyledTabs = styled(TabsComponent)`
2224
width: 100%;
25+
margin-top: ${responsiveSize(12, 24)};
2326
> * {
2427
display: flex;
2528
flex-wrap: wrap;

web/src/pages/Cases/CaseDetails/Timeline.tsx

+11-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React, { useMemo } from "react";
22
import styled, { css } from "styled-components";
33

4+
import { landscapeStyle } from "styles/landscapeStyle";
5+
46
import { Box, Steps } from "@kleros/ui-components-library";
57

68
import { Periods } from "consts/periods";
@@ -10,34 +12,26 @@ import { secondsToDayHourMinute } from "utils/date";
1012

1113
import { DisputeDetailsQuery } from "queries/useDisputeDetailsQuery";
1214

13-
import { landscapeStyle } from "styles/landscapeStyle";
14-
import { responsiveSize } from "styles/responsiveSize";
15-
1615
import { StyledSkeleton } from "components/StyledSkeleton";
1716

1817
const TimeLineContainer = styled(Box)`
19-
display: block;
2018
width: 100%;
21-
height: 98px;
19+
height: auto;
2220
border-radius: 0px;
23-
padding: ${responsiveSize(16, 48)} 8px 0px ${responsiveSize(12, 22)};
24-
margin-top: ${responsiveSize(16, 48)};
25-
margin-bottom: ${responsiveSize(12, 22)};
26-
background-color: ${({ theme }) => theme.whiteBackground};
27-
28-
${landscapeStyle(
29-
() => css`
30-
display: block;
31-
padding: 28px 8px 8px 8px;
32-
`
33-
)}
21+
background-color: transparent;
3422
`;
3523

3624
const StyledSteps = styled(Steps)`
3725
display: flex;
3826
justify-content: space-between;
39-
width: 85%;
27+
width: 89%;
4028
margin: auto;
29+
30+
${landscapeStyle(
31+
() => css`
32+
width: 98%;
33+
`
34+
)}
4135
`;
4236

4337
const Timeline: React.FC<{

web/src/pages/Cases/CaseDetails/index.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ const HeaderContainer = styled.div`
3333
width: 100%;
3434
display: flex;
3535
align-items: center;
36-
margin-bottom: ${responsiveSize(32, 54)};
36+
margin-top: -2px;
37+
margin-bottom: ${responsiveSize(16, 24)};
3738
`;
3839

3940
const Header = styled.h1`
@@ -55,8 +56,8 @@ const CaseDetails: React.FC = () => {
5556
<Header>Case #{id}</Header>
5657
<MaintenanceButtons />
5758
</HeaderContainer>
58-
<Tabs />
5959
<Timeline {...{ currentPeriodIndex, dispute }} />
60+
<Tabs />
6061
<StyledCard>
6162
<Routes>
6263
<Route

web/src/pages/Cases/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import CasesFetcher from "./CasesFetcher";
1313
const Container = styled.div`
1414
width: 100%;
1515
background-color: ${({ theme }) => theme.lightBackground};
16-
padding: ${responsiveSize(32, 80)} ${responsiveSize(24, 136)} ${responsiveSize(76, 96)};
16+
padding: ${responsiveSize(32, 48)} ${responsiveSize(24, 136)} ${responsiveSize(40, 60)};
1717
max-width: ${MAX_WIDTH_LANDSCAPE};
1818
margin: 0 auto;
1919
`;

web/src/pages/Courts/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import TopSearch from "./TopSearch";
1212
const Container = styled.div`
1313
width: 100%;
1414
background-color: ${({ theme }) => theme.lightBackground};
15-
padding: ${responsiveSize(32, 80)} ${responsiveSize(24, 136)} ${responsiveSize(76, 96)};
15+
padding: ${responsiveSize(32, 48)} ${responsiveSize(24, 136)} ${responsiveSize(40, 60)};
1616
max-width: ${MAX_WIDTH_LANDSCAPE};
1717
margin: 0 auto;
1818
`;

web/src/pages/Dashboard/Courts/Header.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ const Container = styled.div`
1616
display: flex;
1717
flex-direction: column;
1818
width: 100%;
19-
gap: 12px;
19+
gap: 4px;
2020
align-items: flex-start;
2121
justify-content: space-between;
22-
margin-bottom: ${responsiveSize(32, 48)};
22+
margin-bottom: ${responsiveSize(16, 24)};
2323
2424
${landscapeStyle(
2525
() => css`

web/src/pages/Dashboard/Courts/index.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ import { useReadSortitionModuleGetJurorBalance } from "hooks/contracts/generated
99
import { useJurorStakeDetailsQuery } from "queries/useJurorStakeDetailsQuery";
1010

1111
import { landscapeStyle } from "styles/landscapeStyle";
12+
import { responsiveSize } from "styles/responsiveSize";
1213

1314
import CourtCard from "./CourtCard";
1415
import Header from "./Header";
1516

1617
const Container = styled.div`
17-
margin-top: 64px;
18+
margin-top: ${responsiveSize(24, 48)};
1819
`;
1920

2021
const CourtCardsContainer = styled.div`
2122
display: flex;
2223
flex-direction: column;
23-
gap: 12px;
24+
gap: 4px;
2425
z-index: 0;
2526
2627
${landscapeStyle(

web/src/pages/Dashboard/JurorInfo/Header.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const Container = styled.div`
1616
display: flex;
1717
flex-direction: column;
1818
justify-content: flex-start;
19-
margin-bottom: ${responsiveSize(32, 48)};
19+
margin-bottom: ${responsiveSize(16, 24)};
2020
gap: 12px;
2121
2222
${landscapeStyle(

web/src/pages/Dashboard/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ import JurorInfo from "./JurorInfo";
2525
const Container = styled.div`
2626
width: 100%;
2727
background-color: ${({ theme }) => theme.lightBackground};
28-
padding: ${responsiveSize(32, 80)} ${responsiveSize(24, 136)} ${responsiveSize(76, 96)};
28+
padding: ${responsiveSize(32, 48)} ${responsiveSize(24, 136)} ${responsiveSize(40, 60)};
2929
max-width: ${MAX_WIDTH_LANDSCAPE};
3030
margin: 0 auto;
3131
`;
3232

3333
const StyledCasesDisplay = styled(CasesDisplay)`
34-
margin-top: 64px;
34+
margin-top: ${responsiveSize(32, 48)};
3535
3636
.title {
37-
margin-bottom: ${responsiveSize(16, 48)};
37+
margin-bottom: ${responsiveSize(12, 24)};
3838
}
3939
`;
4040

web/src/pages/Home/Community/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import { responsiveSize } from "styles/responsiveSize";
1111
import { Element } from "./Element";
1212

1313
const Container = styled.div`
14-
margin-top: ${responsiveSize(44, 64)};
14+
margin-top: ${responsiveSize(24, 48)};
1515
1616
h1 {
17-
margin-bottom: ${responsiveSize(16, 48)};
17+
margin-bottom: ${responsiveSize(12, 24)};
1818
}
1919
`;
2020

web/src/pages/Home/CourtOverview/Chart.tsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
import React, { useMemo, useState } from "react";
22
import styled from "styled-components";
33

4+
import { responsiveSize } from "styles/responsiveSize";
5+
46
import { Tooltip } from "chart.js";
57
import { formatUnits } from "viem";
68

79
import { DropdownSelect } from "@kleros/ui-components-library";
810

911
import { useHomePageContext } from "hooks/useHomePageContext";
1012

11-
import { responsiveSize } from "styles/responsiveSize";
12-
1313
import { StyledSkeleton } from "components/StyledSkeleton";
1414

1515
import CasesByCourtsChart, { CasesByCourtsChartData } from "./CasesByCourtsChart";
1616
import StakedPNKByCourtsChart, { StakedPNKByCourtsChartData } from "./StakedPNKByCourtsChart";
1717
import TimeSeriesChart from "./TimeSeriesChart";
1818

1919
const Container = styled.div`
20-
margin-bottom: ${responsiveSize(32, 48)};
20+
margin-bottom: ${responsiveSize(16, 32)};
2121
display: flex;
2222
flex-direction: column;
2323
`;
2424

2525
const StyledDropdown = styled(DropdownSelect)`
2626
width: fit-content;
27-
align-self: end;
27+
align-self: start;
2828
`;
2929

3030
const CHART_OPTIONS = [
@@ -40,7 +40,6 @@ const ChartOptionsDropdown: React.FC<{
4040
<StyledDropdown
4141
smallButton
4242
simpleButton
43-
alignRight
4443
defaultValue={"stakedPNK"}
4544
items={CHART_OPTIONS}
4645
callback={(newValue: string | number) => {

web/src/pages/Home/CourtOverview/ExtraStats.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React, { useState } from "react";
22
import styled from "styled-components";
33

4+
import { responsiveSize } from "styles/responsiveSize";
5+
46
import { DropdownSelect } from "@kleros/ui-components-library";
57

68
import LawBalance from "svgs/icons/law-balance.svg";
@@ -13,8 +15,9 @@ import ExtraStatsDisplay from "components/ExtraStatsDisplay";
1315
const StyledCard = styled.div`
1416
display: flex;
1517
flex-wrap: wrap;
16-
gap: 0 24px;
18+
gap: 12px 24px;
1719
justify-content: center;
20+
margin-top: ${responsiveSize(12, 16)};
1821
`;
1922

2023
const StyledLabel = styled.label`

web/src/pages/Home/CourtOverview/Header.tsx

+11-6
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,36 @@ import styled from "styled-components";
33

44
import { responsiveSize } from "styles/responsiveSize";
55

6-
import { Link } from "react-router-dom";
7-
86
import { Button } from "@kleros/ui-components-library";
97

108
import Bookmark from "svgs/icons/bookmark.svg";
119

10+
import { InternalLink } from "components/InternalLink";
11+
1212
const StyledHeader = styled.div`
1313
display: flex;
1414
flex-wrap: wrap;
1515
justify-content: space-between;
16-
gap: 0 12px;
17-
margin-bottom: ${responsiveSize(16, 0)};
16+
gap: 8px 12px;
17+
margin-bottom: 12px;
1818
`;
1919

2020
const StyledH1 = styled.h1`
2121
font-size: ${responsiveSize(21, 24)};
22+
margin: 0;
23+
`;
24+
25+
const StyledInternalLink = styled(InternalLink)`
26+
height: 34px;
2227
`;
2328

2429
const Header: React.FC = () => {
2530
return (
2631
<StyledHeader>
2732
<StyledH1>Court Overview</StyledH1>
28-
<Link to={"/resolver"}>
33+
<StyledInternalLink to={"/resolver"}>
2934
<Button small Icon={Bookmark} text="Create a Case" />
30-
</Link>
35+
</StyledInternalLink>
3136
</StyledHeader>
3237
);
3338
};

web/src/pages/Home/TopJurors/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import Header from "./Header";
1414
import JurorCard from "./JurorCard";
1515

1616
const Container = styled.div`
17-
margin-top: ${responsiveSize(64, 80)};
17+
margin-top: ${responsiveSize(24, 48)};
1818
`;
1919

2020
const Title = styled.h1`
21-
margin-bottom: ${responsiveSize(16, 48)};
21+
margin-bottom: ${responsiveSize(12, 24)};
2222
`;
2323

2424
const ListContainer = styled.div`

web/src/pages/Home/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const Wrapper = styled.div`
2222
const Container = styled.div`
2323
width: 100%;
2424
background-color: ${({ theme }) => theme.lightBackground};
25-
padding: ${responsiveSize(32, 72)} ${responsiveSize(24, 132)} ${responsiveSize(76, 96)};
25+
padding: 16px ${responsiveSize(24, 132)} ${responsiveSize(40, 60)};
2626
max-width: ${MAX_WIDTH_LANDSCAPE};
2727
margin: 0 auto;
2828
`;

0 commit comments

Comments
 (0)