Skip to content

Commit 654a3e6

Browse files
authored
Merge pull request #713 from FitzwilliamMuseum/hotfix/fifty-fifty-heading
hotfix: refactor heading rendering logic
2 parents d711fd4 + 6d5ea4b commit 654a3e6

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

public/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"/js/app.js": "/js/app.js?id=186fc5ec23f2fa6f870cee9d2ef7b85f",
3-
"/css/app.css": "/css/app.css?id=3edb3ad06ecf43f0044064359d7307eb",
3+
"/css/app.css": "/css/app.css?id=f75a69cf643755ccd034a3d3733319df",
44
"/css/fitzwilliam.css": "/css/fitzwilliam.css?id=e86ba8627b5815b2315ba31344b2fd8c"
55
}

resources/sass/support-us/_grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
font-size: 18px;
6464
}
6565

66-
.support .card-fitz .card-body {
66+
.support .card-body {
6767
padding-left: 0;
6868
}
6969

resources/views/support/components/fiftyfifty.blade.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
@endphp
2121
<div class="col-md-4 mb-3 container-home-card container-support-card">
22-
<div class="card card-fitz h-100">
22+
<div class="card {{ !empty($card_content['card_link']) ? 'card-fitz' : '' }} h-100">
2323
@if(!empty($image_asset))
2424
<img class="card-img-top" src="{{ $image_asset['data']['thumbnails'][10]['url'] }}" alt="{{ !empty($image_asset['data']['description']) ? $image_asset['data']['description'] : '' }}" width="416" height="416" load="lazy">
2525
@else
@@ -28,17 +28,17 @@
2828
@if(!empty($card_content))
2929
<div class="card-body h-100">
3030
<div class="contents-label mb-3">
31-
<h2>
32-
@if(!empty($card_content['card_link']))
33-
<a href="{{ $card_content['card_link'] }}">
34-
@endif
35-
@if(!empty($card_content['card_link']))
36-
{{ $card_content['heading'] }}
37-
@endif
38-
@if(!empty($card_content['card_link']))
39-
</a>
40-
@endif
41-
</h2>
31+
@if(!empty($card_content['heading']))
32+
<h2>
33+
@if(!empty($card_content['card_link']))
34+
<a href="{{ $card_content['card_link'] }}">
35+
{{ $card_content['heading'] }}
36+
</a>
37+
@else
38+
{{ $card_content['heading'] }}
39+
@endif
40+
</h2>
41+
@endif
4242
@if(!empty($card_content['body']))
4343
<p class="text-dark">
4444
{{ $card_content['body'] }}
@@ -53,4 +53,4 @@
5353
@endif
5454
</div>
5555
</div>
56-
@endif
56+
@endif

0 commit comments

Comments
 (0)