Skip to content

Commit f48acc7

Browse files
committed
19.0 alpha 2
[general] - scrap scroll mschf idea - minor corrections
1 parent 8220677 commit f48acc7

10 files changed

Lines changed: 38 additions & 51 deletions

File tree

.eleventy.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const fs = require("fs");
22
const path = require("path");
33
const { EleventyRenderPlugin } = require("@11ty/eleventy");
4+
const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");
45

56
function findFileInDir(dir, filename) {
67
let files = fs.readdirSync(dir);
@@ -21,6 +22,7 @@ function findFileInDir(dir, filename) {
2122

2223
module.exports = function (eleventyConfig) {
2324
eleventyConfig.addPlugin(EleventyRenderPlugin);
25+
eleventyConfig.addPlugin(eleventyNavigationPlugin);
2426

2527
eleventyConfig.addPassthroughCopy("./src/static/js");
2628
eleventyConfig.addPassthroughCopy("./assets");
@@ -136,7 +138,7 @@ module.exports = function (eleventyConfig) {
136138
dir: {
137139
input: "src",
138140
includes: "templates",
139-
data: "data"
141+
data: "content/data"
140142
}
141143
};
142144
};

package-lock.json

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/index.njk

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@ css: index
44
js: index
55
---
66

7-
<video id="background" autoplay loop muted playsinline></video>
8-
<div id="overlay">
9-
<span id="fullscreen-background" class="button light">⛶</span>
10-
<span id="stop-background" class="button light">⨯</span>
11-
</div>
12-
137
<div id="main-container">
148
<div id="title">juan<br>mier</div>
15-
<div id="marquee-main" class="marquee">⠀<noscript>js isn't enabled :')</noscript></div>
9+
<div id="marquee" class="marquee">⠀<noscript>js isn't enabled :')</noscript></div>
1610

1711
<div id="socials">
18-
{% for link in links %}
12+
{% for link in socials %}
1913
<a href="{{ link.url }}" rel="noopener noreferrer">
2014
<span class="dot"></span> {{ link.text }}
2115
</a>
@@ -28,13 +22,6 @@ js: index
2822
</div>
2923
</div>
3024

31-
<div id="marquee-scroll" class="marquee center">
32-
SCROLL DOWN ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ PROJECTS ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ SCROLL DOWN
33-
↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ PROJECTS ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ SCROLL DOWN ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
34-
PROJECTS ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ PROJECTS ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ PROJECTS
35-
↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
36-
</div>
37-
3825
{% import "src/static/macros.njk" as macros %}
3926

4027
<section id="project-section" class="section">
@@ -74,3 +61,9 @@ js: index
7461
</div>
7562
</div>
7663
</section>
64+
65+
<video id="background" autoplay loop muted playsinline></video>
66+
<div id="overlay">
67+
<span id="fullscreen-background" class="button light">⛶</span>
68+
<span id="stop-background" class="button light">⨯</span>
69+
</div>

src/static/css/_animations.sass

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
100%
55
transform: translateX(-100%)
66

7-
@keyframes scroll-center
8-
0%
9-
transform: translateX(0)
10-
100%
11-
transform: translateX(-100%)
12-
137
@keyframes MULTICOLOR
148
0%
159
background-color:#9f0

src/static/css/global.sass

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,6 @@ code
6060
padding: 0 5px
6161
border-radius: 5px
6262

63-
#browser-info
64-
color: rgba(255, 255, 255, 0.075)
65-
font-size: 24px
66-
line-height: 40px
67-
position: fixed
68-
top: 200px
69-
left: 20px
70-
z-index: -1
71-
text-align: left
72-
user-select: none
73-
74-
span
75-
user-select: none
76-
7763
#version-tag
7864
position: fixed
7965
bottom: 15px
@@ -83,7 +69,7 @@ code
8369
user-select: none
8470
text-decoration: none
8571
cursor: alias
86-
z-index: 9
72+
z-index: 2
8773

8874
::selection
8975
background-color: colors.$white

src/static/css/index.sass

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ $dot: colors.$white
2323
font-family: 'Daft Font', cursive
2424
font-size: 3em
2525
user-select: none
26+
font-weight: normal
2627

2728
div
2829
margin-bottom: 1em
@@ -78,18 +79,13 @@ ul
7879
a:hover &
7980
background-color: colors.$primary
8081

81-
.marquee
82+
#marquee
8283
text-align: center
8384
white-space: nowrap
84-
85-
&#marquee-scroll
86-
animation: scroll-center 60s linear infinite
87-
88-
&#marquee-main
89-
animation: scroll-right 30s linear infinite
90-
filter: drop-shadow(0 0 3px colors.$white)
91-
font-style: italic
92-
font: 500 1.5em 'Ndot-55', sans-serif
85+
animation: scroll-right 30s linear infinite
86+
filter: drop-shadow(0 0 3px colors.$white)
87+
font-style: italic !important
88+
font: 500 1.5em 'Ndot-55', sans-serif
9389

9490
.experience-logo
9591
width: 1.5em
@@ -153,7 +149,7 @@ video#background
153149
object-fit: cover
154150

155151
&.fullscreen
156-
z-index: 2
152+
z-index: 3
157153
opacity: 1
158154

159155
#overlay

src/static/js/index/marquee.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import randomize from './randomize.js';
22

33
fetch('/content/data/marquee.json').then(response => response.json()).then(data => {
44
let string = randomize(data);
5-
let marquee = document.getElementById('marquee-main');
5+
let marquee = document.getElementById('marquee');
66
marquee.innerHTML = string.text;
77
if (string.url && string.url !== '') {
88
marquee.addEventListener('click', () => window.open(string.url, '_blank'));

src/static/js/index/overlay.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
let fullscreen = document.getElementById('fullscreen-background');
22
let overlay = document.getElementById('overlay');
3+
34
fullscreen.addEventListener('click', () => {
45
let videoElement = document.getElementById('background');
56

0 commit comments

Comments
 (0)