+
In the evening
@@ -666,17 +676,17 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter
- anything interesting!
- a language
- music
- coding
- personal
+ Anything interesting!
+ A language
+ Music
+ Coding
+ Personal
(other)
- Curiosity
- herp
- derp
+ For people I love
+ For my own sake
+ For curiosity's sake
(other)
@@ -760,6 +770,11 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter
↓
+
+ that's all, folks! keep scrolling
+
+ ↓
+
diff --git a/js/comic.js b/js/comic.js
index 7cfc29c..39d4d98 100644
--- a/js/comic.js
+++ b/js/comic.js
@@ -147,6 +147,7 @@ if($("#gift_wallpaper")){
$("#gift_app").innerHTML = $("#gift_app_"+showWhat).innerHTML;
},5000);
+ //},1000);
}
@@ -167,6 +168,8 @@ function detectmob(){
}
}
+var wallpaperBGImage = new Image();
+wallpaperBGImage.src = "pics/wallpaper.png";
function makeWallpaper(){
var canvas = document.createElement("canvas");
@@ -176,7 +179,7 @@ function makeWallpaper(){
var ctx = canvas.getContext("2d");
// bg
- ctx.fillStyle = "#ff4040";
+ ctx.fillStyle = "#8296BF";
ctx.fillRect(0,0,canvas.width,canvas.height);
// in a square
@@ -189,22 +192,32 @@ function makeWallpaper(){
ctx.translate(-SIZE/2, -SIZE/2);
// Square
- ctx.fillStyle = "#fff";
- ctx.fillRect(0, 0, SIZE, SIZE);
+ //ctx.fillStyle = "rgba(255,255,255,0.2)";
+ //ctx.fillRect(0, 0, SIZE, SIZE);
+ ctx.drawImage(wallpaperBGImage, 0, 0, SIZE, SIZE);
// text
+ var what = getLabel("gift_wallpaper_what").trim();
+ what += " " + $("#flashcard_you_what_back").innerText.trim();
+
+ var why = getLabel("gift_wallpaper_why").trim();
+ why += " " + $("#flashcard_you_why_back").innerText.trim();
+
+ var do1 = getLabel("gift_wallpaper_do_1").trim();
+ var do2 = getLabel("gift_wallpaper_do_2").trim();
+
+ // draw text
+ ctx.textAlign = "center";
ctx.fillStyle = "#000";
ctx.font = "40px PatrickHand, Helvetica, Arial";
- var what = getLabel("gift_wallpaper_what").trim();
- var what2 = $("#flashcard_you_what_back").innerText.trim();
- var why = getLabel("gift_wallpaper_why").trim();
- var why2 = $("#flashcard_you_why_back").innerText.trim();
- var doo = getLabel("gift_wallpaper_do").trim();
- ctx.fillText(what, 0, 50);
- ctx.fillText(what2, 0, 100);
- ctx.fillText(why, 0, 150);
- ctx.fillText(why2, 0, 200);
- ctx.fillText(doo, 0, 250);
+ ctx.fillText(what, 250, 400);
+ ctx.fillText(why, 250, 450);
+
+ // draw DO ME
+ ctx.font = "80px PatrickHand, Helvetica, Arial";
+ ctx.fillStyle = "#000";
+ ctx.fillText(do1, 400, 190);
+ ctx.fillText(do2, 400, 270);
// Return canvas;
ctx.restore();
diff --git a/pics/end0.png b/pics/end0.png
index 1d4c70f..3479ba2 100644
Binary files a/pics/end0.png and b/pics/end0.png differ
diff --git a/pics/gift.png b/pics/gift.png
new file mode 100644
index 0000000..7c71ed3
Binary files /dev/null and b/pics/gift.png differ
diff --git a/pics/wallpaper.png b/pics/wallpaper.png
new file mode 100644
index 0000000..d9c1ccd
Binary files /dev/null and b/pics/wallpaper.png differ
diff --git a/sims/multicard/multicard.js b/sims/multicard/multicard.js
index 7141cd8..6da6675 100644
--- a/sims/multicard/multicard.js
+++ b/sims/multicard/multicard.js
@@ -169,7 +169,8 @@ function setUpInfo(){
$("#a_label").innerHTML = _getLabel("multicard_a");
$("#a_no").innerHTML = _getLabel("multicard_no");
$("#a_yes").innerHTML = _getLabel("multicard_yes");
- $("#done").innerHTML = _getLabel("multicard_done");
+ var isFinalMulticard = (_getQueryVariable("final")=="yes");
+ $("#done").innerHTML = _getLabel( isFinalMulticard ? "multicard_done_2" : "multicard_done");
// Clicking "yes" or "no"
$("#a_yes").onclick = function(){