Skip to content

Commit e31870a

Browse files
authored
Merge pull request #38 from basiljs/feature/logo
feat(logo): added logo by @ffd8
2 parents d4563e1 + 08a377a commit e31870a

File tree

6 files changed

+26
-34
lines changed

6 files changed

+26
-34
lines changed

_includes/aside-left.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<aside>
2-
<div class="logo"></div>
2+
<div class="logo" id="logo"></div>
33
<div class="nav-o-meter"></div>
44
<nav class="main-menu">
55
<ul>

_layouts/default.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<script src="/assets/js/tweets.js" type="text/javascript" async></script>
1818
<script src="/assets/js/highlight.js" type="text/javascript"></script>
1919
<script src="/assets/js/basiljs.js" type="text/javascript"></script>
20+
<script src="/assets/js/p5.min.js" type="text/javascript"></script>
21+
<script src="/assets/js/sketch.js" type="text/javascript"></script>
2022
</head>
2123
<!--
2224
the filtering of the titles for a body class is a little cumbersome.
@@ -37,5 +39,10 @@ <h1>{{page.title}}</h1>
3739
</div>
3840
<div class="guidelines"></div>
3941
{% include footer.html %}
42+
<script type="text/javascript">
43+
window.onblur = function() { noLoop(); }
44+
window.onfocus = function() { loop(); }
45+
</script>
46+
4047
</body>
4148
</html>

assets/basiljslogo/index.html

Lines changed: 0 additions & 14 deletions
This file was deleted.

assets/css/styles.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ body
4040
margin-top: 0px
4141
@include clearfix
4242
.logo
43-
background-color: #ccc
43+
background-color: white
4444
height: 130px
4545
width: 200px
4646
margin-bottom: 30px
File renamed without changes.

assets/basiljslogo/sketch.js renamed to assets/js/sketch.js

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@ var typoOff = 75;
1414
var canvas;
1515

1616
function setup() {
17-
canvas = createCanvas(180, 130);
17+
canvas = createCanvas(180, 130);
18+
canvas.parent('#logo');
1819
background(255);
1920
frameRate(15);
2021
smooth();
21-
22+
2223
for (var n=2; n < numLines; n++) {
2324
myNoise.push(n);
24-
myNoiseLetter.push(n)
25-
25+
myNoiseLetter.push(n);
26+
2627
var mapN = floor(map(n, 0, numLines-numLines/3, 0, pX.length));
2728
mapN = constrain(mapN, 0, pX.length);
2829
myNoiseLetter[n] = mapN;
29-
30-
if(n > numLines-numLines/3){
31-
mapN = floor(map(n, numLines-numLines/3, numLines, pX.length-pX.length/3, pX.length/6));
32-
mapN = constrain(mapN, 0, pX.length);
33-
myNoiseLetter[n] = mapN;
30+
31+
if (n > numLines-numLines/3){
32+
mapN = floor(map(n, numLines-numLines/3, numLines, pX.length-pX.length/3, pX.length/6));
33+
mapN = constrain(mapN, 0, pX.length);
34+
myNoiseLetter[n] = mapN;
3435
}
3536
}
3637
}
@@ -50,8 +51,7 @@ function draw() {
5051

5152
if (myNoiseLetter[n] < letterFill) {
5253
myNoiseLetter[n] = letterFill;
53-
}
54-
else if (myNoiseLetter[n] > pX.length-letterFill) {
54+
} else if (myNoiseLetter[n] > pX.length-letterFill) {
5555
myNoiseLetter[n] = pX.length-letterFill;
5656
}
5757

@@ -60,8 +60,8 @@ function draw() {
6060
//var randDrop = random(100);
6161

6262
//if (randDrop>99)continue;
63-
if(n > 4 && n < myNoise.length-2){
64-
line(pX[myNoiseLetter[n]]-typoOff, pY[myNoiseLetter[n]]-typoOff, myX[myNoise[n]]*leafGrow, myY[myNoise[n]]*leafGrow);
63+
if (n > 4 && n < myNoise.length-2){
64+
line(pX[myNoiseLetter[n]]-typoOff, pY[myNoiseLetter[n]]-typoOff, myX[myNoise[n]]*leafGrow, myY[myNoise[n]]*leafGrow);
6565
}
6666
stroke(0);
6767
fill(255);
@@ -70,11 +70,10 @@ function draw() {
7070
beginShape();
7171
stroke(0);
7272
for (var j= int(-letterFill/2); j < int(letterFill/2)-1; j++) {
73-
73+
7474
if (abs((pX[myNoiseLetter[n]+j-1]-typoOff)-(pX[myNoiseLetter[n]+j]-typoOff)) < 3 && abs((pY[myNoiseLetter[n]+j-1]-typoOff)-(pY[myNoiseLetter[n]+j]-typoOff)) < 3) {
7575
vertex(pX[myNoiseLetter[n]+j-1]-typoOff, pY[myNoiseLetter[n]+j-1]-typoOff);
76-
}
77-
else {
76+
} else {
7877
endShape();
7978
beginShape();
8079
}
@@ -85,6 +84,6 @@ function draw() {
8584
strokeWeight(.75);
8685

8786
//if (randDrop>90)continue;
88-
line(myX[myNoise[n]]*leafGrow, myY[myNoise[n]]*leafGrow, myX[myNoise[n+1]]*leafGrow, myY[myNoise[n+1]]*leafGrow);
89-
}
87+
line(myX[myNoise[n]]*leafGrow, myY[myNoise[n]]*leafGrow, myX[myNoise[n+1]]*leafGrow, myY[myNoise[n+1]]*leafGrow);
88+
}
9089
}

0 commit comments

Comments
 (0)