Skip to content

Commit 6308649

Browse files
author
robertmyslivecek
committed
Design changes
1 parent b0b77b8 commit 6308649

File tree

12 files changed

+316
-257
lines changed

12 files changed

+316
-257
lines changed

‎_includes/functions/get_banner.html‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,29 @@
44
{% assign banner = return %}
55

66
{%- if banner.first -%}
7-
{%- include functions.html func='log' level='debug' msg='Get banner_image value' -%}
8-
{% assign name = 'banner.image' %}
9-
{%- include functions.html func='get_value' -%}
10-
{% assign banner_image = return | relative_url %}
7+
{%- include functions.html func='log' level='debug' msg='Get banner_image value' -%}
8+
{% assign name = 'banner.image' %}
9+
{%- include functions.html func='get_value' -%}
10+
{% assign banner_image = return | relative_url %}
1111
{%- else -%}
12-
{% assign banner_image = banner | relative_url %}
12+
{% assign banner_image = banner | relative_url %}
1313
{%- endif -%}
1414

1515
{%- include functions.html func='log' level='debug' msg='Get banner_background value' -%}
1616
{% assign name = 'banner.background' %}
1717
{%- include functions.html func='get_value' -%}
1818
{% assign banner_background = return %}
1919

20+
{%- include functions.html func='log' level='debug' msg='Get banner_metadata value' -%}
21+
{% assign name = 'banner.metadata' %}
22+
{%- include functions.html func='get_value' -%}
23+
{% assign banner_metadata = return %}
24+
25+
{%- include functions.html func='log' level='debug' msg='Get banner_heading_style value' -%}
26+
{% assign name = 'banner.heading_style' %}
27+
{%- include functions.html func='get_value' -%}
28+
{% assign banner_heading_style = return %}
29+
2030
{%- include functions.html func='log' level='debug' msg='Get banner_opacity value' -%}
2131
{% assign name = 'banner.opacity' %}
2232
{%- include functions.html func='get_value' -%}
@@ -63,6 +73,6 @@
6373
{% assign banner_start_at = return %}
6474

6575
{% if banner_image or banner_video or banner_background %}
66-
{% assign has_banner = true %}
76+
{% assign has_banner = true %}
6777
{% endif %}
6878

‎_includes/sidebar/article-menu.html‎

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,122 @@
11
<style type="text/css" media="screen">
2-
.post-menu ul {
3-
list-style: none;
4-
padding: 0;
5-
margin: 0;
6-
}
2+
.post-menu ul {
3+
list-style: none;
4+
padding: 0;
5+
margin: 0;
6+
}
77
</style>
88

99
<div class="post-menu">
10-
<div class="post-menu-title">Table of content</div>
11-
<div class="post-menu-content"></div>
10+
<div class="post-menu-title">Table of content</div>
11+
<div class="post-menu-content"></div>
1212
</div>
1313

1414
<script>
15-
function generateContent() {
16-
var menu = document.querySelector(".post-menu");
17-
var menuContent = menu.querySelector(".post-menu-content");
18-
var headings = document.querySelector(".post-content").querySelectorAll("h2, h3");
15+
function generateContent() {
16+
var menu = document.querySelector(".post-menu");
17+
var menuContent = menu.querySelector(".post-menu-content");
18+
var headings = document.querySelector(".post-content").querySelectorAll("h2, h3");
1919

20-
// Hide menu when no headings
21-
if (headings.length === 0) {
22-
return menu.style.display = "none";
23-
}
20+
// Hide menu when no headings
21+
if (headings.length === 0) {
22+
return menu.style.visibility = "hidden";
23+
}
2424

25-
// Generate post menu
26-
var menuHTML = '';
27-
for (var i = 0; i < headings.length; i++) {
28-
var h = headings[i];
29-
menuHTML += (
30-
'<li class="h-5">'
31-
+ '<a href="#h-' + h.getAttribute('id') + '">' + h.textContent + '</a></li>');
32-
}
25+
// Generate post menu
26+
var menuHTML = '';
27+
for (var i = 0; i < headings.length; i++) {
28+
var h = headings[i];
29+
menuHTML += (
30+
'<li class="h-5">'
31+
+ '<a href="#h-' + h.getAttribute('id') + '">' + h.textContent + '</a></li>');
32+
}
3333

34-
menuContent.innerHTML = '<ul>' + menuHTML + '</ul>';
34+
menuContent.innerHTML = '<ul>' + menuHTML + '</ul>';
3535

36-
// The header element
37-
var header = document.querySelector('header.site-header');
36+
// The header element
37+
var header = document.querySelector('header.site-header');
3838

39-
function doMenuCollapse(index, over_items) {
40-
var items = menuContent.firstChild.children;
39+
function doMenuCollapse(index, over_items) {
40+
var items = menuContent.firstChild.children;
4141

42-
if (over_items == undefined) {
43-
over_items = 20;
44-
}
42+
if (over_items == undefined) {
43+
over_items = 20;
44+
}
4545

46-
if (items.length < over_items) {
47-
return;
48-
}
46+
if (items.length < over_items) {
47+
return;
48+
}
4949

50-
var activeItem = items[index];
51-
var beginItem = activeItem
52-
var endItem = activeItem
53-
var beginIndex = index;
54-
var endIndex = index + 1;
55-
while (beginIndex >= 0
56-
&& !items[beginIndex].classList.contains('h-h2')) {
57-
beginIndex -= 1;
58-
}
59-
while (endIndex < items.length
60-
&& !items[endIndex].classList.contains('h-h2')) {
61-
endIndex += 1;
62-
}
63-
for (var i = 0; i < beginIndex; i++) {
64-
item = items[i]
65-
if (!item.classList.contains('h-h2')) {
66-
item.style.display = 'none';
50+
var activeItem = items[index];
51+
var beginItem = activeItem
52+
var endItem = activeItem
53+
var beginIndex = index;
54+
var endIndex = index + 1;
55+
while (beginIndex >= 0
56+
&& !items[beginIndex].classList.contains('h-h2')) {
57+
beginIndex -= 1;
58+
}
59+
while (endIndex < items.length
60+
&& !items[endIndex].classList.contains('h-h2')) {
61+
endIndex += 1;
62+
}
63+
for (var i = 0; i < beginIndex; i++) {
64+
item = items[i]
65+
if (!item.classList.contains('h-h2')) {
66+
item.style.display = 'none';
67+
}
68+
}
69+
for (var i = beginIndex + 1; i < endIndex; i++) {
70+
item = items[i]
71+
// if (!item.classList.contains('h-h2')) {
72+
item.style.display = '';
73+
// }
74+
}
75+
for (var i = endIndex; i < items.length; i++) {
76+
item = items[i]
77+
if (!item.classList.contains('h-h2')) {
78+
item.style.display = 'none';
79+
}
80+
}
6781
}
68-
}
69-
for (var i = beginIndex + 1; i < endIndex; i++) {
70-
item = items[i]
71-
// if (!item.classList.contains('h-h2')) {
72-
item.style.display = '';
73-
// }
74-
}
75-
for (var i = endIndex; i < items.length; i++) {
76-
item = items[i]
77-
if (!item.classList.contains('h-h2')) {
78-
item.style.display = 'none';
79-
}
80-
}
81-
}
8282

83-
// Init menu collapsed
84-
doMenuCollapse(-1);
83+
// Init menu collapsed
84+
doMenuCollapse(-1);
8585

86-
// Active the menu item
87-
window.addEventListener('scroll', function (event) {
88-
var lastActive = menuContent.querySelector('.active');
89-
var changed = true;
90-
var activeIndex = -1;
91-
for (var i = headings.length - 1; i >= 0; i--) {
92-
var h = headings[i];
93-
var headingRect = h.getBoundingClientRect();
94-
var headerRect = header.getBoundingClientRect();
95-
var headerTop = Math.floor(headerRect.top);
96-
var headerHeight = Math.floor(headerRect.height);
97-
var headerHeight = headerTop + headerHeight + 20;
98-
if (headingRect.top <= headerHeight) {
99-
var id = 'h-' + h.getAttribute('id');
100-
var a = menuContent.querySelector('a[href="#' + id + '"]');
101-
var curActive = a.parentNode;
102-
if (curActive) {
103-
curActive.classList.add('active');
104-
activeIndex = i;
105-
}
106-
if (lastActive == curActive) {
107-
changed = false;
108-
}
109-
break;
110-
}
111-
}
112-
if (changed) {
113-
if (lastActive) {
114-
lastActive.classList.remove('active');
115-
}
116-
doMenuCollapse(activeIndex);
117-
}
118-
event.preventDefault();
119-
});
120-
}
121-
generateContent();
86+
// Active the menu item
87+
window.addEventListener('scroll', function (event) {
88+
var lastActive = menuContent.querySelector('.active');
89+
var changed = true;
90+
var activeIndex = -1;
91+
for (var i = headings.length - 1; i >= 0; i--) {
92+
var h = headings[i];
93+
var headingRect = h.getBoundingClientRect();
94+
var headerRect = header.getBoundingClientRect();
95+
var headerTop = Math.floor(headerRect.top);
96+
var headerHeight = Math.floor(headerRect.height);
97+
var headerHeight = headerTop + headerHeight + 20;
98+
if (headingRect.top <= headerHeight) {
99+
var id = 'h-' + h.getAttribute('id');
100+
var a = menuContent.querySelector('a[href="#' + id + '"]');
101+
var curActive = a.parentNode;
102+
if (curActive) {
103+
curActive.classList.add('active');
104+
activeIndex = i;
105+
}
106+
if (lastActive == curActive) {
107+
changed = false;
108+
}
109+
break;
110+
}
111+
}
112+
if (changed) {
113+
if (lastActive) {
114+
lastActive.classList.remove('active');
115+
}
116+
doMenuCollapse(activeIndex);
117+
}
118+
event.preventDefault();
119+
});
120+
}
121+
generateContent();
122122
</script>

0 commit comments

Comments
 (0)