Skip to content

Commit f7abfac

Browse files
committed
Fix folder structure, fix bug in promo site scroller.
1 parent 58b789e commit f7abfac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+14
-367
lines changed

Promotional Website/image/logo.jpg

-5.82 KB
Binary file not shown.

Promotional Website/image/logo.png

-3.52 KB
Binary file not shown.

Promotional Website/promo.html

-21
This file was deleted.

Promotional Website/style.css

-34
This file was deleted.

matt-website/index - Copy.html

-306
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

matt-website/js/site.js promo/js/site.js

+14-6
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,20 @@ $.goToHash = function() {
123123
};
124124

125125
$.navScroll = function() {
126-
fromtop = $(document).scrollTop()-300; //should probably figure out a better number than a fixed 300...
127-
for (i = 0; i < $(".goto-link").length; i++) {
128-
if ($(".goto-link:eq("+i+")").offset().top >= fromtop) {
129-
break;
130-
}
131-
}
126+
fromtop = $(document).scrollTop()+300; //should probably figure out a better number than a fixed 300...
127+
length = $(".goto-link").length;
128+
for (i = 0; i < $(".goto-link").length; i++) {
129+
if (fromtop >= $(".goto-link:eq("+i+")").offset().top) {
130+
if (i < (length-1)) {
131+
if (fromtop <= $(".goto-link:eq("+(i+1)+")").offset().top) {
132+
console.log(fromtop,$(".goto-link:eq("+i+")").offset().top);
133+
break;
134+
}
135+
} else {
136+
break;
137+
}
138+
}
139+
}
132140
x = 0;
133141
$(".content-selector li").each(function(){
134142
if (x==i) {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)