Skip to content

Commit b342f71

Browse files
lenderomlenderom
committed
Merge branch 'main' into fix/gb-london-fip-guide
2 parents 036f028 + 12b364f commit b342f71

7 files changed

Lines changed: 173 additions & 116 deletions

File tree

‎assets/sass/fonts.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC,
120120
U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
121121
U+2212, U+2215, U+FEFF, U+FFFD;
122-
font-display: block; // Do not display icons until font is fully loaded
123122
}
124123

125124
body,

‎assets/sass/search.scss‎

Lines changed: 167 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -10,138 +10,195 @@ $search-z-index-focus: 12;
1010
display: none;
1111
}
1212

13-
.pagefind-ui__search-input,
14-
.pagefind-ui__message {
15-
font-family: "Roboto", Arial, Helvetica, sans-serif;
16-
font-weight: 400;
17-
}
18-
19-
.pagefind-ui__message {
20-
padding: 1rem;
21-
}
13+
.pagefind-ui {
14+
width: 100%;
2215

23-
.pagefind-ui__results-area {
24-
margin-top: 0;
25-
max-height: 50vh;
26-
padding: 0 1rem;
27-
overflow-y: scroll;
16+
&__form {
17+
position: relative;
18+
19+
&::before {
20+
content: "search";
21+
position: absolute;
22+
top: 23px;
23+
left: 20px;
24+
z-index: $search-z-index + 1;
25+
font-family: "Material Symbols Rounded";
26+
opacity: 0.7;
27+
pointer-events: none;
28+
line-height: 1;
29+
}
30+
}
2831

29-
@media (max-width: #{$breakpoint-md}) {
30-
max-height: calc(100dvh - 17rem);
32+
&__message {
33+
padding: 1rem;
34+
margin-bottom: 0;
3135
}
32-
}
3336

34-
.pagefind-ui__results li:last-child {
35-
border-bottom: none;
36-
}
37+
&__results-area {
38+
max-height: 50vh;
39+
padding: 0 1rem;
40+
overflow-y: scroll;
3741

38-
input.pagefind-ui__search-input {
39-
z-index: $search-z-index;
40-
outline: 0.2rem solid transparent;
41-
border: var(--border);
42-
box-shadow: var(--box-shadow);
43-
border-radius: var(--border-radius-l);
42+
@media (max-width: #{$breakpoint-md}) {
43+
max-height: calc(100dvh - 17rem);
44+
}
45+
}
4446

45-
@include focus-indicator(0.2rem);
47+
&__results {
48+
padding-left: 0;
49+
margin-bottom: 0;
50+
}
4651

47-
&::placeholder {
48-
opacity: 0.7;
52+
&__search-input {
53+
z-index: $search-z-index;
54+
outline: 0.2rem solid transparent;
55+
border: var(--border);
56+
box-shadow: var(--box-shadow);
57+
border-radius: var(--border-radius-l);
58+
height: 64px;
59+
background-color: var(--bg-default);
4960
color: var(--color-body);
61+
padding: 0 70px 0 54px;
62+
font-size: 2rem;
63+
position: relative;
64+
display: flex;
65+
width: 100%;
66+
box-sizing: border-box;
67+
font-family: "Roboto", Arial, Helvetica, sans-serif;
68+
69+
@include focus-indicator(0.2rem);
70+
71+
&::placeholder {
72+
opacity: 0.7;
73+
color: var(--color-body);
74+
}
75+
76+
// When results are visible
77+
&:has(
78+
+ .pagefind-ui__search-clear
79+
+ .pagefind-ui__drawer
80+
.pagefind-ui__results-area
81+
) {
82+
border-radius: var(--border-radius-l) var(--border-radius-l) 0 0;
83+
}
5084
}
5185

52-
// This selector is used to identify if search results are visible
53-
&:has(
54-
+ .pagefind-ui__search-clear
55-
+ .pagefind-ui__drawer
56-
.pagefind-ui__results-area
57-
) {
58-
border-radius: var(--border-radius-l) var(--border-radius-l) 0 0;
86+
&__search-clear {
87+
display: none;
5988
}
60-
}
61-
62-
button.pagefind-ui__search-clear {
63-
display: none;
64-
}
65-
66-
.pagefind-ui__suppressed {
67-
display: none;
68-
}
6989

70-
.pagefind-ui__form::before {
71-
z-index: $search-z-index + 1;
72-
}
73-
74-
.pagefind-ui__drawer {
75-
background-color: var(--bg-default);
76-
padding: 0;
77-
overscroll-behavior: contain;
78-
overflow: hidden;
79-
position: absolute;
80-
width: 100%;
81-
z-index: $search-z-index;
82-
border: var(--border);
83-
border-radius: 0 0 var(--border-radius-l) var(--border-radius-l);
84-
}
85-
86-
.pagefind-ui__result {
87-
padding: 2rem 0;
88-
margin: 0 1rem;
89-
border-top: 0.2rem solid grey;
90-
}
91-
92-
.pagefind-ui__result-inner,
93-
.pagefind-ui__result-thumb {
94-
margin-top: 0;
95-
}
96-
97-
.pagefind-ui__result-thumb {
98-
width: 10rem;
99-
100-
@media (max-width: #{$breakpoint-md}) {
90+
&__suppressed {
10191
display: none;
10292
}
103-
}
10493

105-
.pagefind-ui__result-link {
106-
color: var(--link-default);
107-
text-decoration: underline;
108-
border-radius: var(--border-radius-s);
94+
&__drawer {
95+
background-color: var(--bg-default);
96+
overscroll-behavior: contain;
97+
overflow: hidden;
98+
position: absolute;
99+
width: 100%;
100+
z-index: $search-z-index;
101+
border: var(--border);
102+
border-radius: 0 0 var(--border-radius-l) var(--border-radius-l);
103+
box-sizing: border-box;
104+
}
109105

110-
&:hover,
111-
&:focus {
112-
color: var(--link-hovered);
106+
&__result {
107+
list-style-type: none;
108+
display: flex;
109+
align-items: flex-start;
110+
gap: 3.2rem;
111+
padding: 2rem 0;
112+
border-top: 0.2rem solid grey;
113+
margin: 0 1rem;
114+
115+
&-inner,
116+
&-thumb {
117+
margin-top: 0;
118+
}
119+
120+
&-thumb {
121+
width: 10rem;
122+
height: auto;
123+
aspect-ratio: 3 / 2;
124+
125+
@media (max-width: #{$breakpoint-md}) {
126+
display: none;
127+
}
128+
}
129+
130+
&-title {
131+
display: inline-block;
132+
font-weight: 700;
133+
margin: 0;
134+
}
135+
136+
&-nested {
137+
display: flex;
138+
flex-direction: column;
139+
padding-top: 0.8rem;
140+
padding-left: 2.4rem;
141+
142+
.pagefind-ui__result-link {
143+
font-size: 1.8rem;
144+
}
145+
146+
.pagefind-ui__result-link::before {
147+
content: "subdirectory_arrow_right";
148+
font-family: "Material Symbols Rounded";
149+
position: absolute;
150+
left: -2.4rem;
151+
}
152+
}
153+
154+
&-excerpt {
155+
margin-bottom: 0;
156+
margin-top: 0.4rem;
157+
}
113158
}
114-
}
115159

116-
.pagefind-ui__result-link:hover,
117-
.pagefind-ui__result-link:focus {
118-
color: var(--link-hovered);
119-
}
160+
&__result-link {
161+
position: relative;
162+
font-size: 2.2rem;
163+
}
120164

121-
.pagefind-ui__result-link {
122-
@include focus-indicator(0.2rem);
123-
}
165+
&__button {
166+
border: 0.2rem solid var(--link-default);
167+
border-radius: var(--border-radius-m);
168+
background: transparent;
169+
color: var(--body-color);
170+
height: 4.8rem;
171+
padding: 1.2rem;
172+
margin-bottom: 1rem;
173+
width: 100%;
174+
text-align: center;
175+
font-weight: 700;
176+
transition:
177+
background 0.2s,
178+
color 0.2s;
179+
180+
&:hover,
181+
&:focus {
182+
background: rgba($link-hovered, 0.15);
183+
}
184+
}
124185

125-
.pagefind-ui__result-link::before {
126-
top: -0.2rem;
127-
}
186+
&__hidden {
187+
display: none;
188+
}
128189

129-
.pagefind-ui--reset mark {
130-
background-color: var(--bg-accent);
131-
color: black;
132-
}
190+
&--reset {
191+
mark {
192+
background-color: var(--bg-accent);
193+
color: black;
194+
}
195+
}
133196

134-
button.pagefind-ui__button {
135-
border: 0.2rem solid var(--link-default);
136-
border-radius: var(--border-radius-m);
137-
background: transparent;
138-
color: var(--body-color);
139-
margin-top: 0;
140-
margin-bottom: 1rem;
141-
142-
&:hover,
143-
&:focus {
144-
background: rgba($link-hovered, 0.15);
197+
&__loading {
198+
color: var(--bg-neutral);
199+
background-color: var(--bg-neutral);
200+
border-radius: var(--border-radius-s);
201+
pointer-events: none;
145202
}
146203
}
147204
}

‎content/operator/gb/index.fr.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ Heathrow Express propose une liaison rapide et directe entre London Paddington e
213213

214214
À Heathrow, les billets avec réduction FIP peuvent être achetés directement aux portiques auprès du personnel. [Les billets aller-retour](#achat-de-billets-et-réservations) avec réduction FIP peuvent être moins chers que deux allers simples avec la [Elizabeth Line](#elizabeth-line). Les prix sont de 50 % (ou 75 %) des prix simples ou aller-retour publiés sur le [site du Heathrow Express](https://www.heathrowexpress.com/ticket-fares). [^4]
215215

216-
{{% /expander %}}
217-
218216
{{% /train-category %}}
219217

220218
{{% train-category

‎layouts/_default/home.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
<div class="o-startpage__image">
99
{{ $image := resources.Get "images/startpage.webp" }}
10-
{{ partial "image" (dict "image" $image "eager" true) }}
10+
{{ partial "image" (dict "image" $image "eager" true "fetchpriority" "high") }}
1111
</div>
1212
</div>
1313

‎layouts/partials/head.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{{ printf "%s | %s" .Title site.Title }}
99
{{ end }}
1010
</title>
11-
{{ partialCached "head/js" . }}
1211
{{ $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed") }}
1312
{{ with resources.Get "sass/main.scss" }}
1413
{{ $style := (resources.ExecuteAsTemplate "sass/main_templated.scss" $ .) | toCSS $options | minify }}
@@ -19,13 +18,15 @@
1918
as="style"
2019
/>
2120
{{ end }}
22-
<link rel="stylesheet" href="/pagefind/pagefind-ui.css" />
2321
<script src="/pagefind/pagefind-ui.js" defer></script>
2422
<script type="module">
2523
await import("/pagefind/pagefind-highlight.js");
2624
new PagefindHighlight({ highlightParam: "highlight" });
2725
</script>
2826

27+
{{ partialCached "head/js" . }}
28+
29+
2930
<!-- include a favicon for your site if you have it, else omit the line below
3031
Location of favicon can be in mytheme/static/favicon.ico -->
3132
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />

‎layouts/partials/head/js.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
src="{{ .RelPermalink }}"
1313
integrity="{{- .Data.Integrity }}"
1414
crossorigin="anonymous"
15+
defer
1516
></script>
1617
{{- end }}
1718
{{- end }}

‎layouts/partials/image.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
data-decorative="true"
5151
{{- end }}
5252
loading="{{ $loading }}"
53+
{{- with .fetchpriority -}}fetchpriority="{{ . }}"{{- end -}}
5354
srcset="{{ delimit $srcset ", " }}"
5455
sizes="(max-width: 576px) calc(100vw - 3.2rem), (max-width: 768px) 540px, (max-width: 992px) 720px, (max-width: 1200px) 960px, (max-width: 1400px) 1140px, 1320px"
5556
style="{{ delimit $styles "; " | safeCSS }}"

0 commit comments

Comments
 (0)