Skip to content

Commit 3f4061a

Browse files
JamieC24JamieC24
committed
Wrap all layout's main content in <main> tag
1 parent 3c00e05 commit 3f4061a

File tree

9 files changed

+243
-230
lines changed

9 files changed

+243
-230
lines changed

‎resources/views/exhibitions/templates/details-2024.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
}
1111
@endphp
12-
12+
<main>
1313
<x-exhibition-hero :hero="$hero"></x-exhibition-hero>
1414
<div class="breadcrumbs-su">
1515
@include('includes.structure.breadcrumb', ['class' => 'container container-fluid'])

‎resources/views/layouts/error.blade.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
@include('includes.structure.accessibility')
1212
@include('includes.structure.nav')
1313
@include('includes.structure.head')
14-
<div class="container">
15-
@yield('content')
16-
</div>
14+
<main>
15+
<div class="container">
16+
@yield('content')
17+
</div>
18+
</main>
1719
@include('includes.structure.footer')
1820
@include('includes.scripts.javascript')
1921
</body>

‎resources/views/layouts/exhibitions.blade.php‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,42 +29,43 @@
2929
@else
3030
@include('includes.structure.head')
3131
@endif
32+
<main>
33+
@include('includes.structure.open')
3234

33-
@include('includes.structure.open')
34-
35-
<div class="container mt-3">
36-
@include('includes.structure.breadcrumb')
37-
</div>
38-
<span id="site-content" class="visually-hidden"></span>
39-
@yield('content')
40-
@yield('ttn-actions')
41-
@yield('events-url')
42-
@yield('exhibition-shopify')
43-
@yield('exhibitions-files')
44-
@yield('exhibition-faqs')
45-
@yield('shopify')
46-
@yield('exhibitionCaseCards')
47-
@yield('exhibition-objects')
48-
@yield('exhibition-labels')
49-
@yield('exhibitionAudio')
50-
@yield('excarousel')
51-
@yield('youtube')
52-
@yield('curators')
53-
@yield('research-funders')
54-
@yield('current')
55-
@yield('sketchfab')
56-
@yield('displays')
57-
@yield('future')
58-
@yield('archive')
59-
@yield('galleries')
60-
@yield('departments')
61-
@yield('exhibition-thanks')
62-
@yield('360')
63-
@yield('mlt')
64-
@else
65-
@yield('exhibitions-2024')
66-
@yield('shopify')
67-
@endif
35+
<div class="container mt-3">
36+
@include('includes.structure.breadcrumb')
37+
</div>
38+
<span id="site-content" class="visually-hidden"></span>
39+
@yield('content')
40+
@yield('ttn-actions')
41+
@yield('events-url')
42+
@yield('exhibition-shopify')
43+
@yield('exhibitions-files')
44+
@yield('exhibition-faqs')
45+
@yield('shopify')
46+
@yield('exhibitionCaseCards')
47+
@yield('exhibition-objects')
48+
@yield('exhibition-labels')
49+
@yield('exhibitionAudio')
50+
@yield('excarousel')
51+
@yield('youtube')
52+
@yield('curators')
53+
@yield('research-funders')
54+
@yield('current')
55+
@yield('sketchfab')
56+
@yield('displays')
57+
@yield('future')
58+
@yield('archive')
59+
@yield('galleries')
60+
@yield('departments')
61+
@yield('exhibition-thanks')
62+
@yield('360')
63+
@yield('mlt')
64+
@else
65+
@yield('exhibitions-2024')
66+
@yield('shopify')
67+
@endif
68+
</main>
6869
@include('includes.structure.email-signup')
6970
@include('includes.structure.footer')
7071
@include('includes.structure.modal')

‎resources/views/layouts/highlights.blade.php‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,55 @@
2525

2626
@include('includes.structure.nav')
2727

28-
@include('includes.structure.highlight')
29-
30-
<div class="container mt-3">
31-
@include('includes.structure.breadcrumb')
32-
</div>
33-
<span id="site-content" class="visually-hidden"></span>
34-
<div class="container-fluid bg-white py-3">
35-
<div class="container bg-white">
36-
@yield('press-contact')
37-
@yield('content')
38-
@yield('adlib')
28+
<main>
29+
30+
@include('includes.structure.highlight')
31+
32+
<div class="container mt-3">
33+
@include('includes.structure.breadcrumb')
34+
</div>
35+
<span id="site-content" class="visually-hidden"></span>
36+
<div class="container-fluid bg-white py-3">
37+
<div class="container bg-white">
38+
@yield('press-contact')
39+
@yield('content')
40+
@yield('adlib')
41+
</div>
3942
</div>
40-
</div>
4143

4244

43-
@hasSection('collection-parallax')
44-
@include('includes.structure.parallax')
45-
@endif
45+
@hasSection('collection-parallax')
46+
@include('includes.structure.parallax')
47+
@endif
4648

47-
@hasSection('map')
48-
<div class="container-fluid map-box mb-3">
49-
@yield('map')
49+
@hasSection('map')
50+
<div class="container-fluid map-box mb-3">
51+
@yield('map')
52+
</div>
53+
@endif
54+
@hasSection('associated_pages')
55+
<div class="container-fluid bg-gbdo">
56+
@yield('associated_pages')
5057
</div>
51-
@endif
52-
@hasSection('associated_pages')
53-
<div class="container-fluid bg-gbdo">
54-
@yield('associated_pages')
55-
</div>
56-
@endif
58+
@endif
5759

58-
@hasSection('cons-areas')
59-
@yield('cons-areas')
60-
@endif
60+
@hasSection('cons-areas')
61+
@yield('cons-areas')
62+
@endif
63+
64+
@yield('sketchfab-collection')
65+
@yield('sketchfab')
66+
@yield('audio-guide')
67+
68+
<div class="container-fluid bg-gdbo py-3">
69+
@yield('pharos-pages')
70+
@yield('highlight')
71+
@yield('mlt')
72+
</div>
73+
@yield('artistsSimilar')
74+
@yield('shopify')
6175

62-
@yield('sketchfab-collection')
63-
@yield('sketchfab')
64-
@yield('audio-guide')
65-
66-
<div class="container-fluid bg-gdbo py-3">
67-
@yield('pharos-pages')
68-
@yield('highlight')
69-
@yield('mlt')
70-
</div>
71-
@yield('artistsSimilar')
72-
@yield('shopify')
76+
</main>
7377

7478
@include('includes.structure.email-signup')
7579

‎resources/views/layouts/home.blade.php‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,78 +22,78 @@
2222
@yield('homepage-hero')
2323
{{-- @dd($hero['parallax_one']['data']['url']); --}}
2424
@endif
25-
26-
<span id="site-content" class="visually-hidden"></span>
27-
@include('includes.structure.exhibitions', [
28-
'listing_type' => 'upcoming',
29-
'listing_title' => "What's on",
30-
'listing_source' => 'homepage',
31-
])
32-
33-
34-
@if (!empty($settings['coming_soon']))
35-
<div class="container-fluid parallax parallax-home"></div>
25+
<main>
26+
<span id="site-content" class="visually-hidden"></span>
3627
@include('includes.structure.exhibitions', [
37-
'listing_type' => 'future',
38-
'listing_title' => 'Coming soon',
28+
'listing_type' => 'upcoming',
29+
'listing_title' => "What's on",
3930
'listing_source' => 'homepage',
4031
])
41-
@endif
4232

4333

34+
@if (!empty($settings['coming_soon']))
35+
<div class="container-fluid parallax parallax-home"></div>
36+
@include('includes.structure.exhibitions', [
37+
'listing_type' => 'future',
38+
'listing_title' => 'Coming soon',
39+
'listing_source' => 'homepage',
40+
])
41+
@endif
4442

4543

46-
<div class="container-fluid parallax parallax-home"></div>
4744

48-
<div class="container container-home-cards">
49-
<div class="row row-home">
50-
@yield('custom-third-row')
51-
</div>
52-
</div>
5345

54-
<div class="container-fluid parallax parallax-home"></div>
46+
<div class="container-fluid parallax parallax-home"></div>
5547

56-
<div class="container container-home-cards">
57-
<div class="row row-home">
58-
@yield('custom-fourth-row')
48+
<div class="container container-home-cards">
49+
<div class="row row-home">
50+
@yield('custom-third-row')
51+
</div>
5952
</div>
60-
</div>
6153

62-
{{-- <div class="container container-home-cards">
63-
<h3><a href="{{ route('news') }}">Latest news</a></h3>
64-
<div class="row row-home">
65-
@yield('news')
66-
</div>
67-
</div> --}}
54+
<div class="container-fluid parallax parallax-home"></div>
6855

69-
{{-- <div class="container-fluid parallax parallax-home"></div> --}}
56+
<div class="container container-home-cards">
57+
<div class="row row-home">
58+
@yield('custom-fourth-row')
59+
</div>
60+
</div>
7061

71-
{{-- <div class="container container-home-cards">
72-
<h3><a href="{{ route('objects') }}">Collections highlights</a></h3>
73-
<div class="row row-home">
74-
@yield('themes')
75-
</div>
76-
</div> --}}
62+
{{-- <div class="container container-home-cards">
63+
<h3><a href="{{ route('news') }}">Latest news</a></h3>
64+
<div class="row row-home">
65+
@yield('news')
66+
</div>
67+
</div> --}}
7768

78-
{{-- <div class="container-fluid parallax parallax-home"></div> --}}
69+
{{-- <div class="container-fluid parallax parallax-home"></div> --}}
7970

80-
{{-- <div class="container container-home-cards">
81-
<h3><a href="{{ route('research') }}">Our research</a></h3>
82-
<div class="row row-home">
83-
@yield('research')
84-
</div>
85-
</div> --}}
71+
{{-- <div class="container container-home-cards">
72+
<h3><a href="{{ route('objects') }}">Collections highlights</a></h3>
73+
<div class="row row-home">
74+
@yield('themes')
75+
</div>
76+
</div> --}}
8677

87-
{{-- <div class="container-fluid parallax parallax-home"></div> --}}
78+
{{-- <div class="container-fluid parallax parallax-home"></div> --}}
8879

89-
{{-- @yield('fundraising') --}}
80+
{{-- <div class="container container-home-cards">
81+
<h3><a href="{{ route('research') }}">Our research</a></h3>
82+
<div class="row row-home">
83+
@yield('research')
84+
</div>
85+
</div> --}}
9086

91-
<div class="container-fluid parallax parallax-home"></div>
87+
{{-- <div class="container-fluid parallax parallax-home"></div> --}}
9288

93-
{{-- <div class="container-fluid bg-gdbo py-3">
94-
@yield('shopify')
95-
</div> --}}
89+
{{-- @yield('fundraising') --}}
90+
91+
<div class="container-fluid parallax parallax-home"></div>
9692

93+
{{-- <div class="container-fluid bg-gdbo py-3">
94+
@yield('shopify')
95+
</div> --}}
96+
</main>
9797
@include('includes.structure.email-signup')
9898
@include('includes.structure.footer')
9999
@include('includes.scripts.javascript')

0 commit comments

Comments
 (0)