Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap 5 migration #288

Merged
merged 3 commits into from
Apr 29, 2022
Merged

Bootstrap 5 migration #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8326ce4
Update change log
portableant Apr 29, 2022
19a1124
Update change log - remove unwanted line
portableant Apr 29, 2022
b776b93
Fix carousels
portableant Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Change log

## 29.04.2022

1. Migrated Bootstrap version
2. Fix all breaking changes
3. Remove docs folder

## 28.04.2022

1. Added curators and external curators to exhibition pages
2. Change order for exhibitions on homepage
3. Implemented better minification of css/js
4. Upgraded webpack

## 21.04.2022

1. Added True to Nature banner to homepage (this will need removal at end of the exhibition)
Expand Down
14 changes: 7 additions & 7 deletions resources/views/exhibitions/details.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,13 @@ class="stretched-link">{{ ucfirst($record['_source']['summary_title']) }}</a>
<div class="container-fluid bg-white py-2">
<div class="container">
<div class="bd-example mb-3">
<div id="carouselExampleCaptions" class="carousel slide" data-ride="carousel" data-interval="10000">
<div id="carouselExampleCaptions" class="carousel slide" data-bs-ride="carousel" data-interval="10000">
<ol class="carousel-indicators">
<li data-target="#carouselExampleCaptions" data-slide-to="0" class="active"></li>
<li data-target="#carouselExampleCaptions" data-slide-to="1" class=""></li>
<li data-target="#carouselExampleCaptions" data-slide-to="2" class=""></li>
<li data-bs-target="#carouselExampleCaptions" data-bs-slide-to="0" class="active"></li>
<li data-bs-target="#carouselExampleCaptions" data-bs-slide-to="1" class=""></li>
<li data-bs-target="#carouselExampleCaptions" data-bs-slide-to="2" class=""></li>
@if(array_key_exists('image_four_alt_text',$coll['exhibition_carousel'][0]['carousels_id']))
<li data-target="#carouselExampleCaptions" data-slide-to="3" class=""></li>
<li data-bs-target="#carouselExampleCaptions" data-bs-slide-to="3" class=""></li>
@endif
</ol>
<div class="carousel-inner">
Expand Down Expand Up @@ -303,11 +303,11 @@ class="stretched-link">{{ ucfirst($record['_source']['summary_title']) }}</a>
</div>
@endif
</div>
<a class="carousel-control-prev" href="#carouselExampleCaptions" role="button" data-slide="prev">
<a class="carousel-control-prev" href="#carouselExampleCaptions" role="button" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleCaptions" role="button" data-slide="next">
<a class="carousel-control-next" href="#carouselExampleCaptions" role="button" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/includes/elements/expander.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{-- https://stackoverflow.com/a/44242233 --}}
<div class="text-center">
<button type="button" class="btn btn-dark btn-circle btn-xl mb-5" data-toggle="collapse" data-target="#expand-more" aria-expanded="false" aria-controls="expand-more">
<button type="button" class="btn btn-dark btn-circle btn-xl mb-5" data-bs-toggle="collapse" data-bs-target="#expand-more" aria-expanded="false" aria-controls="expand-more">
<span class="collapsed">
@fa('plus')
</span>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/includes/structure/carousel-pages.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-inner">
<div class="carousel-item active" style="background-image: url({{ $page['carousel_associated'][0]['carousels_id']['image_one']['data']['full_url']}});">
<img class="d-block w-100" src="{{ $page['carousel_associated'][0]['carousels_id']['image_one']['data']['thumbnails'][2]['url']}}"
Expand Down Expand Up @@ -30,11 +30,11 @@
</div>
</div>

<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/includes/structure/carousel.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{-- @dd($carousel['data']) --}}
<div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
<div id="carouselExampleControls" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-inner carousel-front">
<div class="carousel-item active" >
<img class="d-block w-100" src="{{ $carousel['data']['image_one']['data']['thumbnails'][9]['url']}}"
Expand Down Expand Up @@ -30,11 +30,11 @@
</div>
</div>
</div>
<a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev">
<a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next">
<a class="carousel-control-next" href="#carouselExampleControls" role="button" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
Expand Down
12 changes: 6 additions & 6 deletions resources/views/learning/lookthinkdoactivity.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class="img-fluid" alt="{{ $look['title_of_work'] }}" loading="lazy"

{!! $look['look_text'] !!}
@if(isset($look['look_answers']))
<button type="button" class="btn btn-dark" data-toggle="modal"
data-target="#lookanswers">Answers
<button type="button" class="btn btn-dark" data-bs-toggle="modal"
data-bs-target="#lookanswers">Answers
</button>
@endif
</div>
Expand All @@ -71,8 +71,8 @@ class="img-fluid" alt="{{ $look['title_of_work'] }}" loading="lazy"

{!! $look['think_text'] !!}
@if(isset($look['think_answers']))
<button type="button" class="btn btn-dark" data-toggle="modal"
data-target="#thinkanswers">Answers
<button type="button" class="btn btn-dark" data-bs-toggle="modal"
data-bs-target="#thinkanswers">Answers
</button>
@endif
</div>
Expand All @@ -83,8 +83,8 @@ class="img-fluid" alt="{{ $look['title_of_work'] }}" loading="lazy"

{!! $look['do_text'] !!}
@if(isset($look['do_answers']))
<button type="button" class="btn btn-dark" data-toggle="modal"
data-target="#doanswers">Answers
<button type="button" class="btn btn-dark" data-bs-toggle="modal"
data-bs-target="#doanswers">Answers
</button>
@endif
</div>
Expand Down