Skip to content

Commit 9a5b43a

Browse files
authored
Merge branch 'master' into fix/news-section-sorting-402
2 parents b85b5b3 + a29c365 commit 9a5b43a

File tree

5 files changed

+72
-13
lines changed

5 files changed

+72
-13
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ group :jekyll_plugins do
1313
gem 'jekyll-sitemap'
1414
gem 'jekyll-redirect-from'
1515
gem "jekyll-last-modified-at"
16+
gem 'jekyll-mermaid'
1617
end
1718

1819
gem 'jemoji'

_config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,9 @@ algolia:
261261
search_only_api_key: 760ed6be3e165d08b4a798ac4aa82fe4
262262
nodes_to_index: 'p,code,table' # html tags to include in search index
263263

264+
mermaid:
265+
src: 'https://cdn.jsdelivr.net/npm/mermaid@11.12.3/dist/mermaid.min.js'
266+
264267
plugins:
265268
- jekyll-redirect-from
266269
- jekyll-sitemap

_includes/head.html

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<meta http-equiv="X-UA-Compatible" content="IE=edge">
33
<meta name="viewport" content="width=device-width, initial-scale=1">
44
{% if page.summary %}
5-
<meta name="description" content="{{ page.summary | strip_html | strip_newlines }}">
5+
<meta name="description" content="{{ page.summary | strip_html | strip_newlines }}">
66
{% endif %}
77
<meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
88
<meta name="theme-color" content="#0A76BB">
@@ -15,13 +15,25 @@
1515
<meta property="og:title" content="{{ page.title }}" />
1616
<meta property="og:site_name" content="preCICE.org" />
1717
<meta property="og:type" content="website" />
18-
<meta property="og:url" content="{{ 'page.url' | absolute_url }}" />
19-
<meta property="og:image" content="{{ 'images/icon.svg' | absolute_url }}" />
18+
<meta property="og:url" content="{{ page.url | absolute_url }}" />
19+
<meta property="og:image" content="{{ 'images/icon-310x310.png' | absolute_url }}" />
2020
{% if page.summary -%}
2121
<meta property="og:description" content="{{ page.summary | strip_html | strip_newlines }}">
22+
{%- elsif site.description -%}
23+
<meta property="og:description" content="{{ site.description | strip_html | strip_newlines }}">
2224
{%- endif %}
2325

24-
<!-- Cannonical link -->
26+
<!-- Twitter Card metadata -->
27+
<meta name="twitter:card" content="summary" />
28+
<meta name="twitter:title" content="{{ page.title }}" />
29+
{% if page.summary -%}
30+
<meta name="twitter:description" content="{{ page.summary | strip_html | strip_newlines }}">
31+
{%- elsif site.description -%}
32+
<meta name="twitter:description" content="{{ site.description | strip_html | strip_newlines }}">
33+
{%- endif %}
34+
<meta name="twitter:image" content="{{ 'images/icon-310x310.png' | absolute_url }}" />
35+
36+
<!-- Canonical link -->
2537
{% if page.url == "/index.html" -%}
2638
<link rel="canonical" href="{{ site.url }}" >
2739
{%- else -%}
@@ -90,5 +102,32 @@
90102
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/instantsearch.js@2.6.0/dist/instantsearch.min.css">
91103
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/instantsearch.js@2.6.0/dist/instantsearch-theme-algolia.min.css">
92104

105+
<!-- QR code for printed pages -->
106+
<script defer src="https://cdn.jsdelivr.net/npm/qrcode-generator@1.4.4/qrcode.min.js"></script>
107+
<script>
108+
document.addEventListener("DOMContentLoaded", function () {
109+
var qrDiv = document.createElement("div");
110+
qrDiv.id = "print-qr-code";
111+
var qr = qrcode(0, "M");
112+
qr.addData("{{ page.url | replace: 'index.html', '' | absolute_url }}");
113+
qr.make();
114+
qrDiv.innerHTML = qr.createImgTag(3, 0);
115+
document.body.appendChild(qrDiv);
116+
});
117+
</script>
118+
<style>
119+
#print-qr-code {
120+
display: none;
121+
}
122+
@media print {
123+
#print-qr-code {
124+
display: block;
125+
position: fixed;
126+
top: 0;
127+
right: 0;
128+
}
129+
}
130+
</style>
131+
93132
<!-- Plausible Analytics -->
94-
<script async defer data-domain="precice.org" src="https://plausible.io/js/plausible.js"></script>
133+
<script async defer data-domain="precice.org" src="https://plausible.io/js/plausible.js"></script>

content/docs/configuration/advanced/configuration-coupling-multi.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ Still, even with only explicit schemes, you can do very strange combinations. So
4848

4949
The mesh over which the data is communicated plays no role. We get a circular dependency:
5050

51-
```txt
52-
A -- first to second --> B;
53-
B -- first to second --> C;
54-
C -- first to second --> A;
55-
```
51+
{% mermaid %}
52+
graph LR
53+
A -->|first to second| B
54+
B -->|first to second| C
55+
C -->|first to second| A
56+
{% endmermaid %}
5657

5758
All three participants are a second participant in a serial coupling scheme, in which they receive data. Thus, they all wait for data in `initialize`, which is, however, only sent in the `advance` call of another participant, as explained on the [coupling flow pages](couple-your-code-coupling-flow.html).
5859

css/landing-page.css

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,16 +281,16 @@ div.logo-holder > img {
281281
text-overflow: ellipsis;
282282
display: -webkit-box;
283283
-webkit-line-clamp: 2;
284-
line-clamp: 2;
284+
line-clamp: 2;
285285
-webkit-box-orient: vertical;
286-
height: 2.8em;
286+
color: #000;
287287
}
288288

289289
.news-card p:first-of-type {
290290
overflow: hidden;
291291
text-overflow: ellipsis;
292292
display: -webkit-box;
293-
-webkit-line-clamp: 5;
293+
-webkit-line-clamp: 5;
294294
line-clamp: 5;
295295
-webkit-box-orient: vertical;
296296
}
@@ -314,3 +314,18 @@ div.logo-holder > img {
314314
flex: 1 1 100%;
315315
}
316316
}
317+
318+
/* Responsive title line-clamp for news cards */
319+
@media (max-width: 992px) {
320+
.news-card h4 {
321+
-webkit-line-clamp: 3;
322+
line-clamp: 3;
323+
}
324+
}
325+
326+
@media (max-width: 768px) {
327+
.news-card h4 {
328+
-webkit-line-clamp: 4;
329+
line-clamp: 4;
330+
}
331+
}

0 commit comments

Comments
 (0)