Skip to content

Commit 3120529

Browse files
authored
Merge pull request #166 from vindevoy/develop
Version 1.4.1
2 parents db1d4c2 + ce5933b commit 3120529

File tree

14 files changed

+148
-26
lines changed

14 files changed

+148
-26
lines changed

HISTORY.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# Release v1.4.1
2+
3+
4+
- author: Yves Vindevogel (vindevoy)
5+
- date: 2020-04-25
6+
7+
## Fixes
8+
9+
- Colour of the background for code is now aligned with the colour of the boxes
10+
- Blue border is gone on the buttons on the home page (primary buttons)
11+
- Margin problem on the tags for smaller screens
12+
- No data showing in the version widget on smaller screens
13+
- External links go in a new tab or window
14+
- Tags now also display page x of y
15+
- MIT License is linked to a Wikipedia page
16+
17+
### Github
18+
19+
For more information on this release, see the issues for this milestone:
20+
21+
- [https://github.com/vindevoy/cherryblog/milestone/10](https://github.com/vindevoy/cherryblog/milestone/10)
22+
23+
124
# Release v1.4.0
225

326

src/data/codeversion/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22

33
text:
4-
- 'Production: v.1.4.0 (master branch)'
5-
- 'Next version: v.1.4.1 (2020-04-28)'
4+
- 'Production: v.1.4.1 (<a href="https://github.com/vindevoy/cherryblog/tree/master" target="_blank">master branch</a>)'
5+
- 'Next version: v.1.5.0 (<a href="https://github.com/vindevoy/cherryblog/tree/develop" target="_blank">develop branch</a>)'

src/data/i8n/blog.yml

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

33
title: "CherryBlog"
4-
copyright: "CherryBlog is licensed under the MIT license"
4+
copyright: "CherryBlog is licensed under the <a class='text-white' href='https://en.wikipedia.org/wiki/MIT_License' target='_blank'>MIT license</a>"

src/data/pages/releases.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,29 @@ date: "2020-04-25"
99

1010
----------
1111

12+
# Release v1.4.1
13+
14+
15+
- author: Yves Vindevogel (vindevoy)
16+
- date: 2020-04-25
17+
18+
## Fixes
19+
20+
- Colour of the background for code is now aligned with the colour of the boxes
21+
- Blue border is gone on the buttons on the home page (primary buttons)
22+
- Margin problem on the tags for smaller screens
23+
- No data showing in the version widget on smaller screens
24+
- External links go in a new tab or window
25+
- Tags now also display page x of y
26+
- MIT License is linked to a Wikipedia page
27+
28+
### Github
29+
30+
For more information on this release, see the issues for this milestone:
31+
32+
- [https://github.com/vindevoy/cherryblog/milestone/10](https://github.com/vindevoy/cherryblog/milestone/10)
33+
34+
1235
# Release v1.4.0
1336

1437

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
3+
title: "Release v1.4.1"
4+
5+
author: "Yves Vindevogel"
6+
date: "2020-04-25"
7+
8+
image: "cherry3.jpg"
9+
10+
summary: "This release fixes a couple of minor bugs in the theme code."
11+
12+
tags:
13+
- History
14+
- Bug fixes
15+
16+
----------
17+
18+
This release fixes a couple of minor bugs in the theme code.
19+
20+
## Release info
21+
22+
- author: Yves Vindevogel (vindevoy)
23+
- date: 2020-04-25
24+
25+
## Fixes
26+
27+
- Colour of the background for code is now aligned with the colour of the boxes
28+
- Blue border is gone on the buttons on the home page (primary buttons)
29+
- Margin problem on the tags for smaller screens
30+
- No data showing in the version widget on smaller screens
31+
- External links go in a new tab or window
32+
- Tags now also display page x of y
33+
- MIT License is linked to a Wikipedia page
34+
35+
### Github
36+
37+
For more information on this release, see the issues for this milestone:
38+
39+
- [https://github.com/vindevoy/cherryblog/milestone/10](https://github.com/vindevoy/cherryblog/milestone/10)

src/theme/default/elements/_html/footer.html

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
<ul class="list-unstyled m-0 p-0">
88
{% for menu in data.footer_menu %}
99
<li>
10-
<a class="text-white" href="{{ menu.ref }}">{{ menu.label }}</a>
10+
{% if menu.ref.startswith('http') %}
11+
<a class="text-white" href="{{ menu.ref }}" target="_blank">{{ menu.label }}</a>
12+
{% else %}
13+
<a class="text-white" href="{{ menu.ref }}">{{ menu.label }}</a>
14+
{% endif %}
1115
</li>
1216
{% endfor %}
1317
</ul>
@@ -24,9 +28,13 @@
2428
<ul class="list-unstyled m-0 p-0">
2529
{% for menu in data.footer_menu %}
2630
<li>
27-
<a class="text-white" href="{{ menu.ref }}">{{ menu.label }}</a>
31+
{% if menu.ref.startswith('http') %}
32+
<a class="text-white" href="{{ menu.ref }}" target="_blank">{{ menu.label }}</a>
33+
{% else %}
34+
<a class="text-white" href="{{ menu.ref }}">{{ menu.label }}</a>
35+
{% endif %}
2836
</li>
29-
{% endfor %}
37+
{% endfor %}
3038
</ul>
3139
</div>
3240
</div>

src/theme/default/elements/_html/navigation.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,20 @@ <h1 class="navbar-brand p-0 px-2">{{ data.i8n.blog.title }}</h1>
2929
{% for menu in data.main_menu %}
3030
{% if data.url == menu.ref %}
3131
<li class="nav-item active">
32-
<a class="nav-link" href="{{ menu.ref }}">{{ menu.label }}</a>
32+
{% if menu.ref.startswith('http') %}
33+
<a class="nav-link" href="{{ menu.ref }}" target="_blank">{{ menu.label }}</a>
34+
{% else %}
35+
<a class="nav-link" href="{{ menu.ref }}">{{ menu.label }}</a>
36+
{% endif %}
3337
</li>
3438
{% endif %}
3539
{% if data.url != menu.ref %}
3640
<li class="nav-item">
37-
<a class="nav-link" href="{{ menu.ref }}">{{ menu.label }}</a>
41+
{% if menu.ref.startswith('http') %}
42+
<a class="nav-link" href="{{ menu.ref }}" target="_blank">{{ menu.label }}</a>
43+
{% else %}
44+
<a class="nav-link" href="{{ menu.ref }}">{{ menu.label }}</a>
45+
{% endif %}
3846
</li>
3947
{% endif %}
4048
{% endfor %}

src/theme/default/elements/_html/title.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@ <h1>
55
{% if secondary_text != '' %}
66
<small>{{ secondary_text }}</small>
77
{% endif %}
8+
9+
{% if tertiary_text != '' %}
10+
<small style="font-size: small">{{ tertiary_text }}</small>
11+
{% endif %}
812
</h1>
913
</div>

src/theme/default/elements/_widget/important_news.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
{{ data.i8n.important_news.title }}
66
</h3>
77
<div class="card-body">
8-
<div class="d-none d-lg-block">
9-
10-
<span style="color:{{ data.i8n.important_news.text_color }};
11-
font-weight:{{ data.i8n.important_news.text_weight }}">{{ data.important_news.text }}
12-
</span>
13-
</div>
8+
<span style="color:{{ data.i8n.important_news.text_color }};
9+
font-weight:{{ data.i8n.important_news.text_weight }}">{{ data.important_news.text }}
10+
</span>
1411
</div>
1512
</div>

src/theme/default/elements/_widget/tags.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h5 class="card-header text-left">{{ data.i8n.tags.widget_title }}</h5>
55
<div class="card-body">
66
<div class="row">
7-
<div class="d-none d-md-block d-lg-none">
7+
<div class="d-none d-md-block d-lg-none col-12">
88
<ul class="list-unstyled mb-0">
99
{% for tag in data.tags_list %}
1010
<li>

0 commit comments

Comments
 (0)