Skip to content

Commit 4837c6e

Browse files
bedroesbbedroesb
committed
Merge branch 'main' of github.com:ELIXIR-Belgium/elixir-toolkit-theme into main
2 parents bdc6970 + 74890fd commit 4837c6e

Some content is hidden

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

71 files changed

+1755
-1208
lines changed

‎Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.6)
4+
activesupport (6.0.6.1)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
@@ -14,21 +14,21 @@ GEM
1414
execjs
1515
coffee-script-source (1.11.1)
1616
colorator (1.1.0)
17-
commonmarker (0.23.6)
18-
concurrent-ruby (1.1.10)
17+
commonmarker (0.23.7)
18+
concurrent-ruby (1.2.0)
1919
dnsruby (1.61.9)
2020
simpleidn (~> 0.1)
2121
em-websocket (0.5.3)
2222
eventmachine (>= 0.12.9)
2323
http_parser.rb (~> 0)
24-
ethon (0.15.0)
24+
ethon (0.16.0)
2525
ffi (>= 1.15.0)
2626
eventmachine (1.2.7)
2727
execjs (2.8.1)
28-
faraday (2.6.0)
28+
faraday (2.7.4)
2929
faraday-net_http (>= 2.0, < 3.1)
3030
ruby2_keywords (>= 0.0.4)
31-
faraday-net_http (3.0.1)
31+
faraday-net_http (3.0.2)
3232
ffi (1.15.5)
3333
forwardable-extended (2.6.0)
3434
gemoji (3.0.1)
@@ -202,24 +202,24 @@ GEM
202202
kramdown-parser-gfm (1.1.0)
203203
kramdown (~> 2.0)
204204
liquid (4.0.3)
205-
listen (3.7.1)
205+
listen (3.8.0)
206206
rb-fsevent (~> 0.10, >= 0.10.3)
207207
rb-inotify (~> 0.9, >= 0.9.10)
208208
mercenary (0.3.6)
209209
minima (2.5.1)
210210
jekyll (>= 3.5, < 5.0)
211211
jekyll-feed (~> 0.9)
212212
jekyll-seo-tag (~> 2.1)
213-
minitest (5.16.3)
214-
nokogiri (1.13.10-x86_64-linux)
213+
minitest (5.17.0)
214+
nokogiri (1.14.1-x86_64-linux)
215215
racc (~> 1.4)
216216
octokit (4.25.1)
217217
faraday (>= 1, < 3)
218218
sawyer (~> 0.9)
219219
pathutil (0.16.2)
220220
forwardable-extended (~> 2.6)
221221
public_suffix (4.0.7)
222-
racc (1.6.1)
222+
racc (1.6.2)
223223
rb-fsevent (0.11.2)
224224
rb-inotify (0.10.1)
225225
ffi (~> 1.0)
@@ -243,13 +243,13 @@ GEM
243243
thread_safe (0.3.6)
244244
typhoeus (1.4.0)
245245
ethon (>= 0.9.0)
246-
tzinfo (1.2.10)
246+
tzinfo (1.2.11)
247247
thread_safe (~> 0.1)
248248
unf (0.1.4)
249249
unf_ext
250250
unf_ext (0.0.8.2)
251251
unicode-display_width (1.8.0)
252-
zeitwerk (2.6.1)
252+
zeitwerk (2.6.6)
253253

254254
PLATFORMS
255255
x86_64-linux

‎_data/sidebars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ subitems:
5858
- title: 404 page not found
5959
url: /404
6060
hr: true
61-
61+

‎_includes/footer.html

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,30 @@
4343
{%- unless site.data.footer.copyright == nil %}
4444
<div class="d-flex align-items-center mb-3 mb-lg-0 mx-auto mx-lg-0 text-center">{{ site.data.footer.copyright | markdownify }}</div>
4545
{%- endunless %}
46-
<div class="d-flex align-items-center mx-auto ms-lg-4 me-lg-0"><a class="text-nowrap" href="https://elixir-belgium.github.io/elixir-toolkit-theme">Powered by <img alt="ELIXIR Toolkit Logo" width="30px" src="{{'assets/img/ett_compact_logo.svg' | relative_url}}"></a></div>
46+
<div class="d-flex align-items-center mx-auto ms-lg-4 me-lg-0">
47+
<a id="ett-logo" class="text-nowrap" href="https://elixir-belgium.github.io/elixir-toolkit-theme">Built with
48+
<svg data-name="ETT logo" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 77.2 77.12">
49+
<defs>
50+
<style>
51+
.cls-2,
52+
.cls-3 {
53+
fill: #fff;
54+
pointer-events: none;
55+
}
56+
57+
.cls-2 {
58+
opacity: 0.18;
59+
}
60+
</style>
61+
</defs>
62+
<g>
63+
<circle class="cls-1" cx="38.56" cy="38.56" r="38.56" />
64+
<path class="cls-2" d="M9,48.08a44.19,44.19,0,0,0,4.68,19.84A38.56,38.56,0,1,0,55.16,3.72c-.59,0-1.19-.05-1.79-.05A44.4,44.4,0,0,0,9,48.08Z" />
65+
<path class="cls-3" d="M54,20.52H13.64a.85.85,0,0,0-.84.85v34a.84.84,0,0,0,.84.84H30a.84.84,0,0,0,.85-.84V51.16a.85.85,0,0,0-.85-.85H20.07a.85.85,0,0,1-.85-.85V42a.85.85,0,0,1,.85-.84h8.66a.85.85,0,0,0,.85-.85V36.06a.85.85,0,0,0-.85-.85H20.07a.85.85,0,0,1-.85-.84V27.29a.85.85,0,0,1,.85-.85H38.26a.85.85,0,0,1,.85.85V55.38a.84.84,0,0,0,.85.84h4.73a.84.84,0,0,0,.85-.84V27.29a.85.85,0,0,1,.84-.85H61.27a.85.85,0,0,1,.84.85V55.38a.84.84,0,0,0,.85.84h4.73a.84.84,0,0,0,.85-.84V27.29a.85.85,0,0,1,.85-.85h6.77a.84.84,0,0,0,.84-.85V21.37a.84.84,0,0,0-.84-.85Z" />
66+
</g>
67+
</svg>
68+
</a>
69+
</div>
4770
</div>
4871
</div>
4972
</footer>

‎_includes/section-navigation-tiles-simple.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{%- assign allcountries = site.data.countries %}
2+
{%- assign except = include.except | split: ", " %}
23
<div class="row row-cols-1 row-cols-md-2 g-3 mb-5 navigation-tiles">
34
{%- for current_page in site.pages | sorted %}
45
{%- if current_page.title and current_page.search_exclude != true and current_page.type == include.type %}
6+
{%- unless except contains current_page.name %}
57
<div class="col d-grid">
68
<a role="button" class="btn bg-light py-4 fs-3 hover-primary" href="{{ current_page.url | relative_url }}">{{current_page.title}}<span class="flag-icon ms-3 flag-icon-{{current_page.country_code | downcase }}"></span></a>
79
</div>
10+
{% endunless %}
811
{%- endif %}
912
{%- endfor %}
1013
</div>

‎_includes/section-navigation-tiles.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- unless include.affiliations == nil and include.search == nil and include.related_pages == nil %}
1+
{%- unless include.affiliations == nil and include.search == nil %}
22
{%- assign allcountries = site.data.countries %}
33
{%- for current_page in site.pages | sorted %}
44
{%- if current_page.affiliations and current_page.search_exclude != true and current_page.type == include.type %}
@@ -147,7 +147,7 @@ <h3 class="card-title m-0">{{current_page.title}}</h3>
147147
{%- if country_link %}
148148
<a role="button" href="{{country_link.url | relative_url}}" data-bs-toggle="tooltip" title="{{allcountries[country]}}" class="btn btn-sm bg-white hover-primary">
149149
{%- else %}
150-
<a role="button" data-bs-toggle="tooltip" title="{{allcountries[country]}}" class="btn btn-sm bg-white hover-primary disabled" aria-disabled="true">
150+
<a role="button" data-bs-toggle="tooltip" title="{{allcountries[country]}}" class="btn btn-sm bg-white hover-primary disabled border-white" aria-disabled="true">
151151
{%- endif %}
152152
<div class="d-block h-24px">
153153
<span class="flag-icon flag-icon-{{affiliation | downcase}} align-items-center"></span>

‎_includes/topnav.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,15 @@
5858
{%- endif %}
5959
{%- if site.theme_variables.topnav.github or site.theme_variables.topnav.github == nil %}
6060
<li class="nav-item ms-0 ms-lg-3 mt-2 mt-lg-0">
61-
<a class="nav-link ps-2 d-flex align-items-center" href="{{site.github.repository_url}}"><i class="fa-brands fa-github me-2"></i>{{site.theme_variables.git_host | default: 'GitHub' }}</a>
61+
<a class="nav-link ps-2 d-flex align-items-center" href="{{site.github.repository_url}}">
62+
{%- assign git_host = site.theme_variables.git_host | downcase %}
63+
{%- if git_host == 'gitlab' %}
64+
<i class="fa-brands fa-gitlab me-2"></i>
65+
{%- else %}
66+
<i class="fa-brands fa-github me-2"></i>
67+
{%- endif %}
68+
{{site.theme_variables.git_host | default: 'GitHub' }}
69+
</a>
6270
</li>
6371
{%- endif %}
6472
{%- unless include.search == false %}

‎_sass/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ $footer-color: $dark;
6868
$footer-link-color: $dark;
6969
$footer-link-color-hover: $primary;
7070
$footer-copyright-bg: $gray-200;
71+
$footer-ett: $dark;

‎_sass/bootstrap/_accordion.scss

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,70 @@
22
// Base styles
33
//
44

5+
.accordion {
6+
// scss-docs-start accordion-css-vars
7+
--#{$prefix}accordion-color: #{$accordion-color};
8+
--#{$prefix}accordion-bg: #{$accordion-bg};
9+
--#{$prefix}accordion-transition: #{$accordion-transition};
10+
--#{$prefix}accordion-border-color: #{$accordion-border-color};
11+
--#{$prefix}accordion-border-width: #{$accordion-border-width};
12+
--#{$prefix}accordion-border-radius: #{$accordion-border-radius};
13+
--#{$prefix}accordion-inner-border-radius: #{$accordion-inner-border-radius};
14+
--#{$prefix}accordion-btn-padding-x: #{$accordion-button-padding-x};
15+
--#{$prefix}accordion-btn-padding-y: #{$accordion-button-padding-y};
16+
--#{$prefix}accordion-btn-color: #{$accordion-button-color};
17+
--#{$prefix}accordion-btn-bg: #{$accordion-button-bg};
18+
--#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon)};
19+
--#{$prefix}accordion-btn-icon-width: #{$accordion-icon-width};
20+
--#{$prefix}accordion-btn-icon-transform: #{$accordion-icon-transform};
21+
--#{$prefix}accordion-btn-icon-transition: #{$accordion-icon-transition};
22+
--#{$prefix}accordion-btn-active-icon: #{escape-svg($accordion-button-active-icon)};
23+
--#{$prefix}accordion-btn-focus-border-color: #{$accordion-button-focus-border-color};
24+
--#{$prefix}accordion-btn-focus-box-shadow: #{$accordion-button-focus-box-shadow};
25+
--#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x};
26+
--#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y};
27+
--#{$prefix}accordion-active-color: #{$accordion-button-active-color};
28+
--#{$prefix}accordion-active-bg: #{$accordion-button-active-bg};
29+
// scss-docs-end accordion-css-vars
30+
}
31+
532
.accordion-button {
633
position: relative;
734
display: flex;
835
align-items: center;
936
width: 100%;
10-
padding: $accordion-button-padding-y $accordion-button-padding-x;
37+
padding: var(--#{$prefix}accordion-btn-padding-y) var(--#{$prefix}accordion-btn-padding-x);
1138
@include font-size($font-size-base);
12-
color: $accordion-button-color;
39+
color: var(--#{$prefix}accordion-btn-color);
1340
text-align: left; // Reset button style
14-
background-color: $accordion-button-bg;
41+
background-color: var(--#{$prefix}accordion-btn-bg);
1542
border: 0;
1643
@include border-radius(0);
1744
overflow-anchor: none;
18-
@include transition($accordion-transition);
45+
@include transition(var(--#{$prefix}accordion-transition));
1946

2047
&:not(.collapsed) {
21-
color: $accordion-button-active-color;
22-
background-color: $accordion-button-active-bg;
23-
box-shadow: inset 0 ($accordion-border-width * -1) 0 $accordion-border-color;
48+
color: var(--#{$prefix}accordion-active-color);
49+
background-color: var(--#{$prefix}accordion-active-bg);
50+
box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list
2451

2552
&::after {
26-
background-image: escape-svg($accordion-button-active-icon);
27-
transform: $accordion-icon-transform;
53+
background-image: var(--#{$prefix}accordion-btn-active-icon);
54+
transform: var(--#{$prefix}accordion-btn-icon-transform);
2855
}
2956
}
3057

3158
// Accordion icon
3259
&::after {
3360
flex-shrink: 0;
34-
width: $accordion-icon-width;
35-
height: $accordion-icon-width;
61+
width: var(--#{$prefix}accordion-btn-icon-width);
62+
height: var(--#{$prefix}accordion-btn-icon-width);
3663
margin-left: auto;
3764
content: "";
38-
background-image: escape-svg($accordion-button-icon);
65+
background-image: var(--#{$prefix}accordion-btn-icon);
3966
background-repeat: no-repeat;
40-
background-size: $accordion-icon-width;
41-
@include transition($accordion-icon-transition);
67+
background-size: var(--#{$prefix}accordion-btn-icon-width);
68+
@include transition(var(--#{$prefix}accordion-btn-icon-transition));
4269
}
4370

4471
&:hover {
@@ -47,9 +74,9 @@
4774

4875
&:focus {
4976
z-index: 3;
50-
border-color: $accordion-button-focus-border-color;
77+
border-color: var(--#{$prefix}accordion-btn-focus-border-color);
5178
outline: 0;
52-
box-shadow: $accordion-button-focus-box-shadow;
79+
box-shadow: var(--#{$prefix}accordion-btn-focus-box-shadow);
5380
}
5481
}
5582

@@ -58,14 +85,15 @@
5885
}
5986

6087
.accordion-item {
61-
background-color: $accordion-bg;
62-
border: $accordion-border-width solid $accordion-border-color;
88+
color: var(--#{$prefix}accordion-color);
89+
background-color: var(--#{$prefix}accordion-bg);
90+
border: var(--#{$prefix}accordion-border-width) solid var(--#{$prefix}accordion-border-color);
6391

6492
&:first-of-type {
65-
@include border-top-radius($accordion-border-radius);
93+
@include border-top-radius(var(--#{$prefix}accordion-border-radius));
6694

6795
.accordion-button {
68-
@include border-top-radius($accordion-inner-border-radius);
96+
@include border-top-radius(var(--#{$prefix}accordion-inner-border-radius));
6997
}
7098
}
7199

@@ -75,22 +103,22 @@
75103

76104
// Only set a border-radius on the last item if the accordion is collapsed
77105
&:last-of-type {
78-
@include border-bottom-radius($accordion-border-radius);
106+
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
79107

80108
.accordion-button {
81109
&.collapsed {
82-
@include border-bottom-radius($accordion-inner-border-radius);
110+
@include border-bottom-radius(var(--#{$prefix}accordion-inner-border-radius));
83111
}
84112
}
85113

86114
.accordion-collapse {
87-
@include border-bottom-radius($accordion-border-radius);
115+
@include border-bottom-radius(var(--#{$prefix}accordion-border-radius));
88116
}
89117
}
90118
}
91119

92120
.accordion-body {
93-
padding: $accordion-body-padding-y $accordion-body-padding-x;
121+
padding: var(--#{$prefix}accordion-body-padding-y) var(--#{$prefix}accordion-body-padding-x);
94122
}
95123

96124

@@ -112,7 +140,10 @@
112140
&:last-child { border-bottom: 0; }
113141

114142
.accordion-button {
115-
@include border-radius(0);
143+
&,
144+
&.collapsed {
145+
@include border-radius(0);
146+
}
116147
}
117148
}
118149
}

‎_sass/bootstrap/_alert.scss

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,24 @@
33
//
44

55
.alert {
6+
// scss-docs-start alert-css-vars
7+
--#{$prefix}alert-bg: transparent;
8+
--#{$prefix}alert-padding-x: #{$alert-padding-x};
9+
--#{$prefix}alert-padding-y: #{$alert-padding-y};
10+
--#{$prefix}alert-margin-bottom: #{$alert-margin-bottom};
11+
--#{$prefix}alert-color: inherit;
12+
--#{$prefix}alert-border-color: transparent;
13+
--#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color);
14+
--#{$prefix}alert-border-radius: #{$alert-border-radius};
15+
// scss-docs-end alert-css-vars
16+
617
position: relative;
7-
padding: $alert-padding-y $alert-padding-x;
8-
margin-bottom: $alert-margin-bottom;
9-
border: $alert-border-width solid transparent;
10-
@include border-radius($alert-border-radius);
18+
padding: var(--#{$prefix}alert-padding-y) var(--#{$prefix}alert-padding-x);
19+
margin-bottom: var(--#{$prefix}alert-margin-bottom);
20+
color: var(--#{$prefix}alert-color);
21+
background-color: var(--#{$prefix}alert-bg);
22+
border: var(--#{$prefix}alert-border);
23+
@include border-radius(var(--#{$prefix}alert-border-radius));
1124
}
1225

1326
// Headings for larger alerts
@@ -47,6 +60,7 @@
4760
$alert-background: shift-color($value, $alert-bg-scale);
4861
$alert-border: shift-color($value, $alert-border-scale);
4962
$alert-color: shift-color($value, $alert-color-scale);
63+
5064
@if (contrast-ratio($alert-background, $alert-color) < $min-contrast-ratio) {
5165
$alert-color: mix($value, color-contrast($alert-background), abs($alert-color-scale));
5266
}

‎_sass/bootstrap/_badge.scss

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,25 @@
44
// `background-color`.
55

66
.badge {
7+
// scss-docs-start badge-css-vars
8+
--#{$prefix}badge-padding-x: #{$badge-padding-x};
9+
--#{$prefix}badge-padding-y: #{$badge-padding-y};
10+
@include rfs($badge-font-size, --#{$prefix}badge-font-size);
11+
--#{$prefix}badge-font-weight: #{$badge-font-weight};
12+
--#{$prefix}badge-color: #{$badge-color};
13+
--#{$prefix}badge-border-radius: #{$badge-border-radius};
14+
// scss-docs-end badge-css-vars
15+
716
display: inline-block;
8-
padding: $badge-padding-y $badge-padding-x;
9-
@include font-size($badge-font-size);
10-
font-weight: $badge-font-weight;
17+
padding: var(--#{$prefix}badge-padding-y) var(--#{$prefix}badge-padding-x);
18+
@include font-size(var(--#{$prefix}badge-font-size));
19+
font-weight: var(--#{$prefix}badge-font-weight);
1120
line-height: 1;
12-
color: $badge-color;
21+
color: var(--#{$prefix}badge-color);
1322
text-align: center;
1423
white-space: nowrap;
1524
vertical-align: baseline;
16-
@include border-radius($badge-border-radius);
25+
@include border-radius(var(--#{$prefix}badge-border-radius));
1726
@include gradient-bg();
1827

1928
// Empty badges collapse automatically

0 commit comments

Comments
 (0)