Skip to content

Commit c1fe5a1

Browse files
authored
Merge pull request #248 from nulib/deploy/staging
Production updates.
2 parents 4f1f909 + b27db3f commit c1fe5a1

File tree

15 files changed

+124
-64
lines changed

15 files changed

+124
-64
lines changed

components/BloomWrapper.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ const StyledBloomIIIFWrapper = styled("div", {
1515
display: "none",
1616
},
1717

18-
"@sm": {
18+
"@xs": {
1919
"& > div > div": {
2020
alignItems: "center",
21+
textAlign: "center",
2122

2223
"& > div": {
2324
"&:last-child": {

components/Facets/Facets.styled.ts

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { StyledToggle } from "@/components/Shared/Switch.styled";
21
import { Wrapper as WorkTypeWrapper } from "@/components/Facets/WorkType/WorkType.styled";
32
import { styled } from "@/stitches.config";
43

@@ -7,23 +6,28 @@ import { styled } from "@/stitches.config";
76
const StyledFacets = styled("div", {
87
display: "flex",
98
justifyContent: "space-between",
10-
margin: "1.618rem 0",
119
position: "relative",
10+
margin: "$gr4 0",
1211
left: "0",
13-
transition: "$dcAll",
12+
transition: "$dcScrollLeft",
1413
zIndex: "1",
1514

1615
[`& ${WorkTypeWrapper}`]: {
1716
borderRight: "1px solid $black10",
1817
paddingRight: "$gr2",
1918
transition: "$dcWidth",
19+
20+
"@sm": {
21+
marginTop: "$gr3",
22+
borderRight: "none",
23+
paddingRight: "0",
24+
},
2025
},
2126

2227
"@sm": {
23-
[`& ${WorkTypeWrapper}`]: {
24-
width: "0",
25-
opacity: "0",
26-
},
28+
padding: "$gr4 0",
29+
flexDirection: "column",
30+
alignItems: "center",
2731
},
2832
});
2933

@@ -32,41 +36,61 @@ const Width = styled("span", {
3236
width: "100%",
3337
});
3438

39+
const FacetExtras = styled("div", {
40+
display: "flex",
41+
42+
"@sm": {
43+
marginTop: "$gr4",
44+
flexDirection: "column-reverse",
45+
alignItems: "center",
46+
},
47+
});
48+
3549
const Wrapper = styled("div", {
50+
height: "38px",
51+
transition: "$dcScrollHeight",
52+
margin: "$gr4 0",
53+
54+
"@sm": {
55+
margin: "-$gr4 0 $gr4",
56+
backgroundColor: "$gray6",
57+
height: "225px",
58+
},
59+
3660
".facets-ui-container": {
3761
transition: "$dcAll",
3862
},
3963

4064
"&[data-filter-fixed='true']": {
41-
margin: "1.618rem 0",
4265
flexGrow: "0",
4366
flexShrink: "1",
4467
height: "38px",
4568

46-
[`& ${WorkTypeWrapper}`]: {
69+
"@sm": {
70+
backgroundColor: "transparent",
71+
margin: "0",
72+
},
73+
74+
[`& ${FacetExtras}`]: {
4775
width: "0",
4876
opacity: "0",
4977
},
5078

5179
[`& ${StyledFacets}`]: {
5280
position: "fixed",
53-
top: "50px",
81+
margin: "0",
82+
top: "$gr6",
5483
left: "50%",
5584
zIndex: "1",
5685
transform: "translate(-50%)",
5786
backfaceVisibility: "hidden",
5887
webkitFontSmoothing: "subpixel-antialiased",
59-
},
6088

61-
[`& ${StyledToggle}`]: {
62-
width: "0",
63-
opacity: "0",
89+
"@sm": {
90+
top: "$gr5",
91+
},
6492
},
6593
},
6694
});
6795

68-
const FacetExtras = styled("div", {
69-
display: "flex",
70-
});
71-
7296
export { FacetExtras, StyledFacets, Width, Wrapper };

components/Facets/Filter/Clear.styled.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const FilterClearStyled = styled("button", {
1717
marginLeft: "$gr2",
1818
padding: "0 $gr3",
1919
transition: "$dcAll",
20+
whiteSpace: "nowrap",
2021

2122
"&:focus, &:hover": {
2223
color: "$purple",

components/Header/Header.styled.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ const Primary = styled("div", {
7676
position: "relative",
7777
top: "unset",
7878
height: "$gr5",
79+
boxShadow: "2px 2px 5px #0001",
7980

8081
[`& ${ContainerStyled}`]: {
8182
display: "flex",
@@ -86,15 +87,15 @@ const Primary = styled("div", {
8687
transition: "$dcAll",
8788

8889
[`& ${NavStyled}`]: {
89-
backgroundColor: "$gray6",
90-
color: "$purple",
90+
backgroundColor: "$purple120",
9191
fontSize: "$gr4",
92-
fontFamily: "$northwesternSansBold",
93-
paddingTop: "2px",
92+
fontFamily: "$northwesternSansRegular",
9493
display: "flex",
9594
height: "$gr5",
95+
boxShadow: "3px -3px 19px #fff1",
9696

9797
a: {
98+
color: "$white",
9899
display: "flex",
99100
height: "100%",
100101
justifyContent: "center",
@@ -120,6 +121,8 @@ const Primary = styled("div", {
120121
},
121122

122123
"&[data-search-fixed='true']": {
124+
zIndex: "2",
125+
123126
[`& ${ContainerStyled}`]: {
124127
position: "fixed",
125128
top: "0",
@@ -143,10 +146,6 @@ const Primary = styled("div", {
143146
opacity: "0",
144147
},
145148

146-
button: {
147-
backgroundColor: "$purple10",
148-
},
149-
150149
[`& ${SearchStyled}`]: {
151150
marginRight: "0",
152151
},
@@ -209,6 +208,8 @@ const HeaderStyled = styled("header", {
209208
},
210209

211210
[`& ${Primary}`]: {
211+
boxShadow: "unset",
212+
212213
[`& ${SearchStyled}, & ${NavStyled}`]: {
213214
boxShadow: "8px 8px 19px #0003",
214215
},

components/Heading/Heading.styled.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ const StyledHeading = styled("h2", {
1919
letterSpacing: "-0.015em",
2020
margin: "$gr6 0 $gr4",
2121

22+
"@sm": {
23+
fontSize: "$gr7 !important",
24+
},
25+
2226
"&::before": {
2327
height: "$gr1",
2428
width: "$gr7",

components/Homepage/Overview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const HomepageOverview = () => {
2525
audiovisual materials - as well as licensed art historical images
2626
for teaching and reference.
2727
</p>
28-
<Button isPrimary onClick={() => router.push("/about")}>
28+
<Button isPrimary isLowercase onClick={() => router.push("/about")}>
2929
Learn More
3030
</Button>
3131
</Content>

components/Search/Search.styled.ts

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@ const SearchStyled = styled("form", {
1010
backgroundColor: "$white",
1111
height: "$gr5",
1212
marginRight: "$gr5",
13-
boxShadow: "inset 0 -1px 0 #f0f0f0",
13+
boxShadow: "3px -3px 19px #fff1",
1414
transition: "$dcAll",
1515

1616
"@sm": {
1717
width: "100%",
1818
marginRight: "0",
1919
},
2020

21+
"@lg": {
22+
marginRight: "$gr3",
23+
},
24+
2125
svg: {
2226
position: "absolute",
2327
display: "flex",
@@ -41,19 +45,30 @@ const Input = styled("input", {
4145
width: "100%",
4246
border: "none",
4347
backgroundColor: "transparent",
44-
padding: "2px $gr5 0",
48+
padding: "1px $gr3 0 $gr5",
4549
fontSize: "$gr3",
4650
zIndex: "1",
4751
fontFamily: "$northwesternSansRegular",
52+
whiteSpace: "nowrap",
53+
54+
"&::placeholder": {
55+
overflow: "hidden",
56+
color: "$black80",
57+
textOverflow: "ellipsis",
58+
marginRight: "$gr5",
59+
},
4860
});
4961

5062
const Button = styled("button", {
63+
display: "flex",
64+
justifyContent: "center",
65+
alignItems: "center",
5166
border: "none",
52-
backgroundColor: "$gray6",
53-
padding: "2px $3 0",
54-
color: "$purple",
67+
backgroundColor: "$purple120",
68+
padding: "0 $gr3 ",
69+
color: "$white",
5570
fontSize: "$gr4",
56-
fontFamily: "$northwesternSansBold",
71+
fontFamily: "$northwesternSansRegular",
5772
cursor: "pointer",
5873
textRendering: "optimizeLegibility",
5974
});
@@ -63,18 +78,25 @@ const Clear = styled("button", {
6378
display: "flex",
6479
right: "5rem",
6580
height: "$gr5",
66-
width: "$gr5",
81+
width: "calc($gr5 + $gr2)",
6782
justifyContent: "center",
6883
textAlign: "center",
6984
alignItems: "center",
7085
cursor: "pointer",
7186
border: "none",
72-
backgroundColor: "transparent",
87+
background: "linear-gradient(90deg, #fff0 0, #fff 38.2%)",
7388
zIndex: "1",
89+
fill: "$black80",
90+
91+
"&:focus, &:hover": {
92+
fill: "$purple30",
93+
},
7494

7595
svg: {
76-
fill: "$black50",
77-
padding: "$gr1",
96+
fill: "inherit",
97+
padding: "$gr2",
98+
marginLeft: "$gr2",
99+
transition: "$dcAll",
78100
},
79101
});
80102

components/Search/Search.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import { Button, Clear, Input, SearchStyled } from "./Search.styled";
2-
import { IconClear, IconSearch } from "@/components/Shared/SVG/Icons";
2+
import {
3+
IconArrowForward,
4+
IconClear,
5+
IconSearch,
6+
} from "@/components/Shared/SVG/Icons";
37
import React, {
48
ChangeEvent,
59
FocusEvent,
@@ -98,7 +102,7 @@ const Search: React.FC<SearchProps> = ({ isSearchActive }) => {
98102
</Clear>
99103
)}
100104
<Button type="submit" data-testid="submit-button">
101-
Search
105+
Search <IconArrowForward />
102106
</Button>
103107
{isLoaded && <IconSearch />}
104108
</SearchStyled>

components/SharedLink/SharedLink.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ const work: Work = {
153153
},
154154
file_sets: [
155155
{
156+
accession_number: "inu-dil-12b39039-68af-4a31-8b04-1b025d95a0b8",
156157
duration: null,
157158
height: 4050,
158159
id: "7ad42e60-a8b6-444d-b4cf-f53f9c2756f6",

components/Work/TopInfo.styled.ts

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ const ActionButtons = styled("div", {
77
display: "flex",
88
flexDirection: "row",
99
justifyContent: "flext-start",
10-
padding: "1rem 0",
10+
padding: "$gr2 0",
1111

1212
button: {
13-
marginRight: "$4",
13+
marginRight: "$gr3",
1414
fontFamily: "$northwesternSansLight",
15-
paddingTop: "$3",
15+
paddingTop: "$gr3",
1616

1717
"&:last-child": {
1818
marginRight: "0",
@@ -30,9 +30,9 @@ const ActionButtons = styled("div", {
3030

3131
const TopInfoContent = styled("div", {
3232
display: "grid",
33-
gap: "$7",
33+
gap: "$gr7",
3434
gridTemplateColumns: "618fr 382fr",
35-
margin: "$3 0",
35+
margin: "$gr3 0",
3636

3737
"@md": {
3838
gap: "$gr5",
@@ -45,7 +45,7 @@ const TopInfoContent = styled("div", {
4545
});
4646

4747
const TopInfoWrapper = styled("section", {
48-
margin: "$6 0",
48+
margin: "$gr5 0",
4949

5050
[`> header`]: {
5151
display: "flex",
@@ -58,28 +58,26 @@ const TopInfoWrapper = styled("section", {
5858
letterSpacing: "-0.015em",
5959
margin: "0",
6060

61-
"&::before": {
62-
height: "$1",
63-
width: "$7",
64-
display: "block",
65-
backgroundColor: "$purple10",
66-
content: "",
67-
position: "relative",
68-
top: "-$4",
61+
"@sm": {
62+
fontSize: "$gr7",
6963
},
7064
},
7165

7266
p: {
73-
fontSize: "$5",
67+
fontSize: "$gr5",
7468
color: "$black50",
7569
fontFamily: "$northwesternSansLight",
7670
lineHeight: "1.47em",
71+
72+
"@sm": {
73+
fontSize: "$gr4",
74+
},
7775
},
7876
},
7977
});
8078

8179
const TopInfoCollection = styled("div", {
82-
padding: "1rem 0",
80+
padding: "$gr4 0",
8381

8482
[`& ${StyledHeading}`]: {
8583
color: "$black80",

0 commit comments

Comments
 (0)