Skip to content

Commit

Permalink
Updates for bootstrap 5 classes, layouts and syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
portableant committed Jul 22, 2023
1 parent 346af83 commit 969a4cc
Show file tree
Hide file tree
Showing 10 changed files with 402 additions and 566 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ source "https://rubygems.org"
# Happy Jekylling!
gem "jekyll", "~> 4.2.0"
# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem "minima", "~> 2.5"
gem "nokogiri"
gem "jekyll-sitemap"
gem "jemoji"
Expand All @@ -21,6 +20,7 @@ gem "jekyll-mentions"
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.12"
gem "jekyll-paginate"
gem "jekyll-seo-tag"
end

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
Expand All @@ -33,5 +33,4 @@ end
# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]


gem "webrick"
8 changes: 2 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.18.0)
nokogiri (1.14.2-x64-mingw32)
racc (~> 1.4)
Expand Down Expand Up @@ -109,14 +105,14 @@ DEPENDENCIES
jekyll-feed (~> 0.12)
jekyll-mentions
jekyll-paginate
jekyll-seo-tag
jekyll-sitemap
jemoji
minima (~> 2.5)
nokogiri
tzinfo (~> 2.0)
tzinfo-data
wdm (~> 0.1.1)
webrick

BUNDLED WITH
2.3.5
2.4.17
2 changes: 1 addition & 1 deletion _includes/structure/css.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- CSS -->
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Arbutus+Slab&family=Rubik&Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Arbutus+Slab&&family=Libre+Baskerville:ital@0&family=Rubik&Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" crossorigin="anonymous">
Expand Down
37 changes: 20 additions & 17 deletions _islander/exhibition.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,27 @@ images:
caption: "Islanders: exhibition section on Ancient Island economy and food practices"
---

<center>★★★★★</center>
<center>"Spellbinding… calling to mind Picasso and Brancusi at every turn."<br>
— The Observer</center>
<br>
<center>★★★★</center>
<center>"Many pieces have never ventured overseas… lovers of the ancient world should seize this chance."<br>
— The Times</center>
<br>
<center>
"There’s much to admire"<br>
★★★★★
{: .text-center .text-info .display-4 }

"Spellbinding… calling to mind Picasso and Brancusi at every turn."
— The Observer
{: .text-center }

★★★★
{: .text-center .text-info .display-4 }

"Many pieces have never ventured overseas… lovers of the ancient world should seize this chance."
— The Times
{: .text-center }

"There’s much to admire"
— The Telegraph
</center>
<br>
<center>
"Revelatory"<br>
— The Week
</center>
<br><br>
{: .text-center }

"Revelatory"
— The Week
{: .text-center }

This major free exhibition was hosted at the Fitzwilliam Museum between 24 February 2023 and the 4 June 2023. It brought together extraordinary loans examining the unique identity of islanders, transporting visitors to 6,000 years of island life and history from the ancient Mediterranean to today.

Expand Down
320 changes: 102 additions & 218 deletions _islander/objects.md

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions _research/conference.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ images:

The Fitzwilliam Museum and the Ashmolean Museum are pleased to announce an interdisciplinary conference to be held March 28–30, 2023 in Cambridge, London and Oxford. The first day (28 March 2023) will take place at the Old Divinity School, St John’s College, Cambridge, the second (29 March 2023) at the Cyprus House, St James' Square, London and the third (30 March 2023) at the Ashmolean Museum, Oxford.

<a href="https://www.eventbrite.co.uk/e/island-identities-tickets-574095463987" class="d-block btn btn-dark">Booking link for the Cambridge day</a>

<a href="https://www.eventbrite.com/e/new-research-at-knossos-tickets-569907427457" class="d-block btn btn-info">Booking link for the Oxford day</a>

The conference will accompany the two major exhibitions opening February 2023 in Cambridge Islanders: The Making of the Mediterranean (as part of the Being an Islander project) and Labyrinth: Knossos, Myth & Reality, in Oxford on the theme of the Mediterranean islands, exploring research questions which are complementary between the two projects.

The conference will include keynote lectures from leading researchers in the fields of Mediterranean archaeology, island archaeology, and the archaeology of Crete and Knossos, as well as neighbouring scientific fields (archaeobotany, archaeometallurgy and ceramic studies) in dialogue with the broader disciplines mentioned above.
Expand Down
Loading

0 comments on commit 969a4cc

Please sign in to comment.