added css changes, modified jquery.greedy-navigation and built the main.min.js again
This commit is contained in:
parent
b7144931c7
commit
e0b0448f05
3 changed files with 75 additions and 16 deletions
|
@ -184,6 +184,8 @@
|
||||||
margin: 0 1rem;
|
margin: 0 1rem;
|
||||||
color: $masthead-link-color;
|
color: $masthead-link-color;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
-webkit-transition: none;
|
||||||
|
transition: none;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: $masthead-link-color-hover;
|
color: $masthead-link-color-hover;
|
||||||
|
@ -198,6 +200,11 @@
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
img{
|
||||||
|
-webkit-transition: none;
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
|
||||||
&__toggle {
|
&__toggle {
|
||||||
-ms-flex-item-align: center;
|
-ms-flex-item-align: center;
|
||||||
|
|
2
assets/js/main.min.js
vendored
2
assets/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
82
assets/js/plugins/jquery.greedy-navigation.js
vendored
82
assets/js/plugins/jquery.greedy-navigation.js
vendored
|
@ -9,26 +9,69 @@ $(function() {
|
||||||
var $btn = $("nav.greedy-nav .greedy-nav__toggle");
|
var $btn = $("nav.greedy-nav .greedy-nav__toggle");
|
||||||
var $vlinks = $("nav.greedy-nav .visible-links");
|
var $vlinks = $("nav.greedy-nav .visible-links");
|
||||||
var $hlinks = $("nav.greedy-nav .hidden-links");
|
var $hlinks = $("nav.greedy-nav .hidden-links");
|
||||||
|
var $nav = $("nav.greedy-nav");
|
||||||
|
var $logo = $('nav.greedy-nav .site-logo');
|
||||||
|
var $logoImg = $('nav.greedy-nav .site-logo img');
|
||||||
|
var $title = $("nav.greedy-nav .site-title");
|
||||||
|
var $search = $('nav.greedy-nav button.search__toggle');
|
||||||
|
|
||||||
|
var numOfItems, totalSpace, closingTime, breakWidths;
|
||||||
|
|
||||||
var numOfItems = 0;
|
// This function measures both hidden and visible links and sets the navbar breakpoints
|
||||||
var totalSpace = 0;
|
// This is called the first time the script runs and everytime the "check()" function detects a change of window width that reached a different CSS width breakpoint, which affects the size of navbar Items
|
||||||
var closingTime = 1000;
|
// Please note that "CSS width breakpoints" (which are only 4) !== "navbar breakpoints" (which are as many as the number of items on the navbar)
|
||||||
var breakWidths = [];
|
function measureLinks(){
|
||||||
|
numOfItems = 0;
|
||||||
|
totalSpace = 0;
|
||||||
|
closingTime = 1000;
|
||||||
|
breakWidths = [];
|
||||||
|
|
||||||
|
// Adds the width of a navItem in order to create breakpoints for the navbar
|
||||||
|
function addWidth(i, w) {
|
||||||
|
totalSpace += w;
|
||||||
|
numOfItems += 1;
|
||||||
|
breakWidths.push(totalSpace);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Measures the width of hidden links by making a temporary clone of them and positioning under visible links
|
||||||
|
function hiddenWidth(obj){
|
||||||
|
var clone = obj.clone();
|
||||||
|
clone.css("visibility","hidden");
|
||||||
|
$vlinks.append(clone);
|
||||||
|
addWidth(0, clone.outerWidth());
|
||||||
|
clone.remove();
|
||||||
|
}
|
||||||
|
// Measure both visible and hidden links widths
|
||||||
|
$vlinks.children().outerWidth(addWidth);
|
||||||
|
$hlinks.children().each(function(){hiddenWidth($(this))});
|
||||||
|
}
|
||||||
// Get initial state
|
// Get initial state
|
||||||
$vlinks.children().outerWidth(function(i, w) {
|
measureLinks();
|
||||||
totalSpace += w;
|
|
||||||
numOfItems += 1;
|
var winWidth = $( window ).width();
|
||||||
breakWidths.push(totalSpace);
|
// Set the last measured CSS width breakpoint: 0: <768px, 1: <1024px, 2: < 1280px, 3: >= 1280px.
|
||||||
});
|
var lastBreakpoint = winWidth < 768 ? 0 : winWidth < 1024 ? 1 : winWidth < 1280 ? 2 : 3;
|
||||||
|
|
||||||
var availableSpace, numOfVisibleItems, requiredSpace, timer;
|
var availableSpace, numOfVisibleItems, requiredSpace, timer;
|
||||||
|
|
||||||
function check() {
|
function check() {
|
||||||
|
|
||||||
|
winWidth = $( window ).width();
|
||||||
|
// Set the current CSS width breakpoint: 0: <768px, 1: <1024px, 2: < 1280px, 3: >= 1280px.
|
||||||
|
var curBreakpoint = winWidth < 768 ? 0 : winWidth < 1024 ? 1 : winWidth < 1280 ? 2 : 3;
|
||||||
|
// If current breakpoint is different from last measured breakpoint, measureLinks again
|
||||||
|
if(curBreakpoint !== lastBreakpoint) measureLinks();
|
||||||
|
// Set the last measured CSS width breakpoint with the current breakpoint
|
||||||
|
lastBreakpoint = curBreakpoint;
|
||||||
|
|
||||||
// Get instant state
|
// Get instant state
|
||||||
availableSpace = $vlinks.width() - 10;
|
|
||||||
numOfVisibleItems = $vlinks.children().length;
|
numOfVisibleItems = $vlinks.children().length;
|
||||||
|
// Decrease the width of visible elements from the nav innerWidth to find out the available space for navItems
|
||||||
|
availableSpace = /* nav */ $nav.innerWidth()
|
||||||
|
- /* logo */ ($logo.length !== 0 ? $logo.outerWidth(true) : 0)
|
||||||
|
- /* title */ $title.outerWidth(true)
|
||||||
|
- /* search */ ($search.length !== 0 ? $search.outerWidth(true) : 0)
|
||||||
|
- /* toggle */ (numOfVisibleItems !== breakWidths.length ? $btn.outerWidth(true) : 0);
|
||||||
requiredSpace = breakWidths[numOfVisibleItems - 1];
|
requiredSpace = breakWidths[numOfVisibleItems - 1];
|
||||||
|
|
||||||
// There is not enought space
|
// There is not enought space
|
||||||
|
@ -36,8 +79,8 @@ $(function() {
|
||||||
$vlinks.children().last().prependTo($hlinks);
|
$vlinks.children().last().prependTo($hlinks);
|
||||||
numOfVisibleItems -= 1;
|
numOfVisibleItems -= 1;
|
||||||
check();
|
check();
|
||||||
// There is more than enough space
|
// There is more than enough space. If only one element is hidden, add the toggle width to the available space
|
||||||
} else if (availableSpace > breakWidths[numOfVisibleItems]) {
|
} else if (availableSpace + (numOfVisibleItems === breakWidths.length - 1?$btn.outerWidth(true):0) > breakWidths[numOfVisibleItems]) {
|
||||||
$hlinks.children().first().appendTo($vlinks);
|
$hlinks.children().first().appendTo($vlinks);
|
||||||
numOfVisibleItems += 1;
|
numOfVisibleItems += 1;
|
||||||
check();
|
check();
|
||||||
|
@ -69,6 +112,15 @@ $(function() {
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
})
|
})
|
||||||
|
|
||||||
check();
|
// check if page has a logo
|
||||||
|
if($logoImg.length !== 0){
|
||||||
});
|
// check if logo is not loaded
|
||||||
|
if(!($logoImg[0].complete || $logoImg[0].naturalWidth !== 0)){
|
||||||
|
// if logo is not loaded wait for logo to load or fail to check
|
||||||
|
$logoImg.one("load error", check);
|
||||||
|
// if logo is already loaded just check
|
||||||
|
} else check();
|
||||||
|
// if page does not have a logo just check
|
||||||
|
} else check();
|
||||||
|
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in a new issue