Skip to content

fix: click on github icon in navbar #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions static/css/custom1.css
Original file line number Diff line number Diff line change
Expand Up @@ -137,26 +137,28 @@ h1#javafx-15-highlights {
padding-bottom: 13px;
}

.navbar svg {
.navbar__icon {
width: 24px;
height: 24px;
fill: #ffffff;
opacity: 0.5;

/* to white */
filter: brightness(0) invert(1);
}

.navbar svg:hover {
.navbar__icon:hover {
opacity: 1;
}

@media screen and (max-width: 768px) {
.navbar svg {
.navbar__icon {
width: 24px;
height: 24px;
fill: #000000;
opacity: 0.5;
}

.navbar svg:hover {
.navbar__icon:hover {
fill: #52d3aa;
opacity: 1;
}
Expand Down
1 change: 1 addition & 0 deletions static/images/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions static/js/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
});
};

// todo: why is this duplicate with main.js ???

// Page Nav
var clickMenu = function() {
$('#navbar a:not([class="external"])').click(function(event){
Expand Down
4 changes: 2 additions & 2 deletions themes/hugo-elate-theme/layouts/partials/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
{{ end }}

<li>
<a class="external, icon" href="https://github.com/openjfx/openjfx.github.io">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
<a class="external icon" target="_blank" href="https://github.com/openjfx/openjfx.github.io">
<img class="navbar__icon" src="/images/github.svg" alt="GitHub" title="GitHub" />
</a>
</li>
</ul>
Expand Down
53 changes: 22 additions & 31 deletions themes/hugo-elate-theme/static/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@

'use strict';



// iPad and iPod detection
var isiPad = function(){
return (navigator.platform.indexOf("iPad") != -1);
};

var isiPhone = function(){
return (
(navigator.platform.indexOf("iPhone") != -1) ||
(navigator.platform.indexOf("iPod") != -1)
);
};

// Parallax
var parallax = function() {
$(window).stellar();
Expand Down Expand Up @@ -61,28 +47,33 @@

// Page Nav
var clickMenu = function() {
document.querySelectorAll('#navbar a').forEach(link => {
if (link.classList.contains('external')) {
return;
}

$('#navbar a:not([class="external"])').click(function(event){
var section = $(this).data('nav-section'),
navbar = $('#navbar');

if ( $('[data-section="' + section + '"]').length ) {
$('html, body').animate({
scrollTop: $('[data-section="' + section + '"]').offset().top
}, 500);
}
link.addEventListener('click', (event) => {
event.preventDefault();

if ( navbar.is(':visible')) {
navbar.removeClass('in');
navbar.attr('aria-expanded', 'false');
$('.js-fh5co-nav-toggle').removeClass('active');
}
const section = link.getAttribute('data-nav-section');
const navbar = $('#navbar');

event.preventDefault();
return false;
});
const dataSection = $('[data-section="' + section + '"]');
if (dataSection.length) {
$('html, body').animate({
scrollTop: dataSection.offset().top
}, 500);
}

if (navbar.is(':visible')) {
navbar.removeClass('in');
navbar.attr('aria-expanded', 'false');
$('.js-fh5co-nav-toggle').removeClass('active');
}

return false;
});
});
};

// Reflect scrolling in navigation
Expand Down