Skip to content

Commit

Permalink
feat: utillity max-width wrapper add
Browse files Browse the repository at this point in the history
  • Loading branch information
ostafinskim committed Dec 1, 2023
1 parent 0ca2b8c commit 9f329f4
Show file tree
Hide file tree
Showing 69 changed files with 1,789 additions and 1,927 deletions.
2 changes: 1 addition & 1 deletion public/css/fitzwilliam.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=3279ab0dbb55afbe7580f7801ccb6d89",
"/css/app.css": "/css/app.css?id=00682d9d33a6d9e1962621bd5b099350",
"/css/fitzwilliam.css": "/css/fitzwilliam.css?id=9b52db2de81abda4437ead5e66c0b806"
"/css/fitzwilliam.css": "/css/fitzwilliam.css?id=4dcb828540fb5a8911f908a8b69d45ba"
}
2 changes: 1 addition & 1 deletion resources/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ a.text-center.btn.btn-outline-light.btn__book {
*/

.col-12 {
.col-max-800 {
max-width: 800px;
margin: 0 auto;
}
Expand Down
30 changes: 15 additions & 15 deletions resources/views/aboutus/archived.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
@section('keywords', 'work,museum,jobs')
@section('content')

@if(!empty($vacancies->total() > 0))
<div class="row">
@foreach($vacancies->items()['data'] as $vacancy)
<x-vacancy :vacancy="$vacancy"></x-vacancy>
@endforeach
</div>
@else
<div class="col-12 shadow-sm p-3 mx-auto mb-3">
<p>
We currently have no vacancies, please check back again soon.
</p>
</div>
@endif
{{ $vacancies->appends(request()->except('page'))->setPath(route('vacancy.archive'))->links() }}
@if(!empty($vacancies->total() > 0))
<div class="row">
@foreach($vacancies->items()['data'] as $vacancy)
<x-vacancy :vacancy="$vacancy"></x-vacancy>
@endforeach
</div>
@else
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3">
<p>
We currently have no vacancies, please check back again soon.
</p>
</div>
@endif
{{ $vacancies->appends(request()->except('page'))->setPath(route('vacancy.archive'))->links() }}

@endsection
@endsection
34 changes: 16 additions & 18 deletions resources/views/aboutus/director.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,20 @@
@include('includes.elements.page-meta', $data = $director)
@section('title', $director['display_name'])
@section('content')
<div class="col-12 shadow-sm p-3 mx-auto mb-3 ">
@if(!is_null($director['hero_image']))
<figure class="figure">
<img src="{{ $director['hero_image']['data']['url'] }}"
alt="{{$director['hero_image_alt_text']}}"
loading="lazy" class="img-fluid"
/>
<figcaption class="figure-caption text-right">{{$director['hero_image_alt_text']}}</figcaption>
</figure>
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3 ">
@if(!is_null($director['hero_image']))
<figure class="figure">
<img src="{{ $director['hero_image']['data']['url'] }}" alt="{{$director['hero_image_alt_text']}}"
loading="lazy" class="img-fluid" />
<figcaption class="figure-caption text-right">{{$director['hero_image_alt_text']}}</figcaption>
</figure>
@endif
<p>
Dates of office: {{ $director['date_from'] }}
@if(!is_null($director['date_to']))
- {{ $director['date_to'] }}
@endif
<p>
Dates of office: {{ $director['date_from'] }}
@if(!is_null($director['date_to']))
- {{ $director['date_to'] }}
@endif
</p>
@markdown($director['biography'] ?? 'No content available')
</div>
@endsection
</p>
@markdown($director['biography'] ?? 'No content available')
</div>
@endsection
34 changes: 16 additions & 18 deletions resources/views/aboutus/directors.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,27 @@
@section('description', 'A list and timeline of our directors')
@section('keywords', 'directors,timeline,museum,cambridge,fitzwilliam')
@section('content')
<div class="col-12 shadow-sm p-3 mx-auto mb-3 ">
<div class="table-responsive">
<table class="table table-striped">
<thead class="thead-dark">
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3 ">
<div class="table-responsive">
<table class="table table-striped">
<thead class="thead-dark">
<tr>
<th scope="col">Date from</th>
<th scope="col">Date to</th>
<th scope="col">Director</th>
</tr>
</thead>
<tbody>
</thead>
<tbody>
@foreach($directors['data'] as $director)
<tr>
<td>{{ $director['date_from'] }}</td>
<td>{{ $director['date_to'] }}</td>
<td><a href="{{ route('director',[$director['slug']] ) }}">{{ $director['display_name'] }}</a>
</td>
</tr>
<tr>
<td>{{ $director['date_from'] }}</td>
<td>{{ $director['date_to'] }}</td>
<td><a href="{{ route('director',[$director['slug']] ) }}">{{ $director['display_name'] }}</a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</tbody>
</table>
</div>
@endsection


</div>
@endsection
34 changes: 17 additions & 17 deletions resources/views/aboutus/hockney.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
@section('description', 'Sign up for press images')
@section('keywords', 'press,release,fitzwilliam')
@foreach($terms['data'] as $term)
@section('hero_image', $term['hero_image']['data']['full_url'])
@section('hero_image', $term['hero_image']['data']['full_url'])
@endforeach
@section('content')
@foreach($terms['data'] as $term)
<div class="col-12 shadow-sm p-3 mx-auto">
{!!$term['terms'] !!}
</div>
@endforeach
<div class="col-12 shadow-sm py-3 mx-auto mt-4">
<div class="col-md-6">
<form method="GET" class="form" action="https://pages.wordfly.com/fitzwilliammuseum/pages/Subscribe/"
target="_blank">
<label for="wordfly-email">Subscribe to our list</label>
<input type="email" id="wordfly-email" name="email" placeholder="Email Address" required
class="form-control "/>
<button class="my-2 btn btn-dark">Submit your email</button>
</form>
</div>
@foreach($terms['data'] as $term)
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto">
{!!$term['terms'] !!}
</div>
@endforeach
<div class="col-12 col-max-800 shadow-sm py-3 mx-auto mt-4">
<div class="col-md-6">
<form method="GET" class="form" action="https://pages.wordfly.com/fitzwilliammuseum/pages/Subscribe/"
target="_blank">
<label for="wordfly-email">Subscribe to our list</label>
<input type="email" id="wordfly-email" name="email" placeholder="Email Address" required
class="form-control " />
<button class="my-2 btn btn-dark">Submit your email</button>
</form>
</div>
@endsection
</div>
@endsection
29 changes: 15 additions & 14 deletions resources/views/aboutus/press.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@
@section('keywords', 'press,release,fitzwilliam')

@section('press-contact')
<div class="col-12 shadow-sm p-3 mx-auto mb-3 rounded">
<p>
Contact the press team: @svg('fas-phone',['width' => 20, 'height' => 20]) 01223 332941 @svg('fas-at',['width' => 20, 'height' => 20])
<a href="mailto:press@fitzmuseum.cam.ac.uk">press@fitzmuseum.cam.ac.uk</a>
</p>
</div>
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3 rounded">
<p>
Contact the press team: @svg('fas-phone',['width' => 20, 'height' => 20]) 01223 332941 @svg('fas-at',['width' =>
20, 'height' => 20])
<a href="mailto:press@fitzmuseum.cam.ac.uk">press@fitzmuseum.cam.ac.uk</a>
</p>
</div>
@endsection
@section('releases')
<div class="container">
<div class="row">
@foreach($press->items()['data'] as $release)
<x-press-card :release="$release"></x-press-card>
@endforeach
</div>
{{ $press->appends(request()->except('page'))->links() }}
<div class="container">
<div class="row">
@foreach($press->items()['data'] as $release)
<x-press-card :release="$release"></x-press-card>
@endforeach
</div>
@endsection
{{ $press->appends(request()->except('page'))->links() }}
</div>
@endsection
21 changes: 9 additions & 12 deletions resources/views/aboutus/spoliation-claim.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
@section('keywords', 'spoliation,stories,museum,cambridge')
@section('title','Spoliation claim: ' . $claims['alt_text'])
@section('content')
<div class="col-12 shadow-sm p-3 mx-auto mb-3 article">
@markdown($claims['text'])
<a class="btn btn-info py-3 d-block" href="{{ route('article',[$claims['news_slug']]) }}">
Learn more about this claim
</a>
</div>
<img class="card-img-top"
src="{{ $claims['image']['data']['url']}}"
alt="{{ $claims['alt_text'] }}"
width="{{ $claims['image']['width'] }}"
loading="lazy"/>
@endsection
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3 article">
@markdown($claims['text'])
<a class="btn btn-info py-3 d-block" href="{{ route('article',[$claims['news_slug']]) }}">
Learn more about this claim
</a>
</div>
<img class="card-img-top" src="{{ $claims['image']['data']['url']}}" alt="{{ $claims['alt_text'] }}"
width="{{ $claims['image']['width'] }}" loading="lazy" />
@endsection
28 changes: 14 additions & 14 deletions resources/views/aboutus/vacancies.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
@section('description', 'An overview of current job vacancies')
@section('keywords', 'work,museum,jobs')
@section('content')
@if(!empty($vacancies['data']))
<div class="row">
@foreach($vacancies['data'] as $vacancy)
<x-vacancy :vacancy="$vacancy"></x-vacancy>
@endforeach
</div>
@else
<div class="col-12 shadow-sm p-3 mx-auto mb-3">
<p>
@if(!empty($vacancies['data']))
<div class="row">
@foreach($vacancies['data'] as $vacancy)
<x-vacancy :vacancy="$vacancy"></x-vacancy>
@endforeach
</div>
@else
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3">
<p>
We currently have no vacancies, please check back again soon.
</p>
</div>
@endif
<a href="{{ route('vacancy.archive') }}" class="btn btn-dark d-block my-2">View our archived vacancies</a>
@endsection
</p>
</div>
@endif
<a href="{{ route('vacancy.archive') }}" class="btn btn-dark d-block my-2">View our archived vacancies</a>
@endsection
50 changes: 25 additions & 25 deletions resources/views/aboutus/vacancy.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
@section('keywords',$vacancy['meta_keywords'])

@if(!empty($vacancy['hero_image']))
@section('hero_image', $vacancy['hero_image']['data']['url'])
@section('hero_image_title', $vacancy['hero_image_alt_text'])
@section('hero_image', $vacancy['hero_image']['data']['url'])
@section('hero_image_title', $vacancy['hero_image_alt_text'])
@else
@section('hero_image','https://fitz-cms-images.s3.eu-west-2.amazonaws.com/img_20190105_153947.jpg')
@section('hero_image_title', "The inside of our Founder's entrance")
@section('hero_image','https://fitz-cms-images.s3.eu-west-2.amazonaws.com/img_20190105_153947.jpg')
@section('hero_image_title', "The inside of our Founder's entrance")
@endif

@section('content')
<div class="col-12 shadow-sm p-3 mx-auto mb-3 article">
@if(Carbon\Carbon::parse($vacancy['expires'])->isPast())
@include('includes.structure.jobexpired')
@endif
@if(isset($vacancy['salary_range']))
<span class="badge bg-dark my-2">Salary range: £{{ $vacancy['salary_range'] }}</span>
@endif
<span class="badge bg-info my-2">Closing date:
{{ Carbon\Carbon::parse($vacancy['expires'])->format('j F Y') }}
</span>
@isset($vacancy['job_pack'])
<a href="{{ $vacancy['job_pack']['data']['full_url'] }}" class="btn btn-dark my-2" download>
@svg('fas-file-pdf', ['width' => 15, 'height' => 15]) Download the job pack
</a>
@endisset
@markdown($vacancy['job_description'])
<div class="col-12 col-max-800 shadow-sm p-3 mx-auto mb-3 article">
@if(Carbon\Carbon::parse($vacancy['expires'])->isPast())
@include('includes.structure.jobexpired')
@endif
@if(isset($vacancy['salary_range']))
<span class="badge bg-dark my-2">Salary range: £{{ $vacancy['salary_range'] }}</span>
@endif
<span class="badge bg-info my-2">Closing date:
{{ Carbon\Carbon::parse($vacancy['expires'])->format('j F Y') }}
</span>
@isset($vacancy['job_pack'])
<a href="{{ $vacancy['job_pack']['data']['full_url'] }}" class="btn btn-dark my-2" download>
@svg('fas-file-pdf', ['width' => 15, 'height' => 15]) Download the job pack
</a>
@endisset
@markdown($vacancy['job_description'])

@if(!Carbon\Carbon::parse($vacancy['expires'])->isPast())
@include('includes.structure.jobLink')
@endif
@if(!Carbon\Carbon::parse($vacancy['expires'])->isPast())
@include('includes.structure.jobLink')
@endif

</div>
@endsection
</div>
@endsection
Loading

0 comments on commit 9f329f4

Please sign in to comment.