Skip to content

Commit eda928f

Browse files
authored
Merge pull request #61 from OpenDataScotland/copilot/upgrade-bootstrap-3-to-bootstrap-5
Upgrade Bootstrap 3 to Bootstrap 5
2 parents 6cb30c7 + 9383e28 commit eda928f

56 files changed

Lines changed: 1657 additions & 1415 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_WITHOUT: ""

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.2"
5+
ruby "3.2.9"
66

77
gem "jekyll", "~> 4.3"
88
gem "jekyll-sitemap"

_data/categories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
featured: true
44
- name: Budget / Finance
55
logo: /assets/img/categories/budget-finance.svg
6-
logo_credit: Renan Ferreira Santos from the Noun Project
6+
logo_credit: Lulis Dian RP from the Noun Project
77
featured: true
88
- name: Business and Economy
99
logo: /assets/img/categories/business_and_economy.svg

_data/schemas/default.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,15 @@ dataset_fields:
66
datajson: title
77
- field_name: organization
88
label: Organization
9-
form_template: form/organization.html
109
datajson: publisher.name
1110
- field_name: notes
1211
label: Description
13-
form_template: form/textarea.html
1412
datajson: description
1513
- field_name: license
1614
label: License
17-
form_template: form/license.html
1815
datajson: license
1916
- field_name: category
2017
label: Category
21-
form_template: form/category.html
22-
display_template: display/category.html
2318
datajson: category
2419
- field_name: maintainer
2520
label: Maintainer
@@ -38,8 +33,6 @@ dataset_fields:
3833
datajson: records
3934
- field_name: original_dataset_link
4035
label: Original dataset link
41-
display_template: display/link.html
42-
html_id: original-dataset-link
4336
datajson: original_dataset_link
4437

4538

@@ -53,7 +46,6 @@ resource_fields:
5346
- field_name: format
5447
label: Format
5548
datajson: distribution.format
56-
form_template: form/dropdown.html
5749
values:
5850
- api
5951
- csv
@@ -74,8 +66,6 @@ organization_fields:
7466
label: Logo
7567
- field_name: type
7668
label: Type
77-
form_template: form/org_type.html
78-
display_template: display/org_type.html
7969
datajson: org_type
8070
- field_name: portal_url
8171
label: Portal URL
@@ -93,7 +83,6 @@ organization_fields:
9383
label: WhatDoTheyKnow organization ID
9484
- field_name: portal_type
9585
label: Portal type
96-
form_template: form/dropdown.html
9786
values:
9887
- CKAN
9988
- DKAN
@@ -114,7 +103,6 @@ category_fields:
114103
label: Logo Credit
115104
- field_name: featured
116105
label: Featured on Homepage
117-
form_template: form/checkbox.html
118106

119107
organization_type_fields:
120108
- field_name: title

_includes/addons/opengraph.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
1+
<meta property="og:title" content="{% if page.title %}{{ page.title }} - {% endif %}{% if page.organization %}{{ page.organization }} - {% endif %}{{ site.title }}" />
22
<meta property="og:site_name" content="{{ site.title }}" />
33
{% assign description = page.notes | default: site.description %}
44
<meta property="og:description" content="{{ description | strip_html | truncate: 200 }}" />

_includes/addons/twittercard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<meta name="twitter:card" content="summary" />
22
<meta name="twitter:site" content="{{ site.twittercard.username }}" />
33
<!-- Twitter truncates twitter:title to 70 characters. -->
4-
{% capture title %}{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}{% endcapture %}
4+
{% capture title %}{% if page.title %}{{ page.title }} - {% endif %}{% if page.organization %}{{ page.organization }} - {% endif %}{{ site.title }}{% endcapture %}
55
<meta name="twitter:title" content="{{ title | truncate: 70 }}" />
66
<!-- Twitter truncates twitter:description at the word to 200 characters. -->
77
{% assign description = page.notes | default: site.description %}

_includes/breadcrumbs.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
<ol class="breadcrumb{% if page.full_width %} container{% endif %}">
1+
<nav{% if page.full_width %} class="container"{% endif %} aria-label="breadcrumb">
2+
<ol class="breadcrumb bg-body-tertiary rounded px-3 py-2 mb-3">
23
{% if page.title == site.title %}
3-
<li class="active">
4+
<li class="breadcrumb-item active" aria-current="page">
45
<i class="fa-solid fa-home" aria-label="Home"></i>
56
</li>
67
{% else %}
7-
<li>
8+
<li class="breadcrumb-item">
89
<a href="{{ site.baseurl }}/">
910
<i class="fa-solid fa-home" aria-label="Home"></i>
1011
</a>
1112
</li>
1213
{% if include.parent %}
1314
{% assign parent = site.pages | where : "title", include.parent | first %}
1415
{% if parent %}
15-
<li>
16+
<li class="breadcrumb-item">
1617
<a href="{{ site.baseurl }}{{ parent.url }}">{{ parent.title }}</a>
1718
</li>
1819
{% else %}
19-
<li>{{ include.parent }}</li>
20+
<li class="breadcrumb-item">{{ include.parent }}</li>
2021
{% endif %}
2122
{% endif %}
22-
<li class="active">{{ page.title }}</li>
23+
<li class="breadcrumb-item active" aria-current="page">{{ page.title }}</li>
2324
{% endif %}
24-
</ol>
25+
</ol>
26+
</nav>

_includes/display/category.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

_includes/display/link.html

Lines changed: 0 additions & 10 deletions
This file was deleted.

_includes/display/org_type.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)