diff --git a/ch3.html b/ch3.html index c334577..e143760 100644 --- a/ch3.html +++ b/ch3.html @@ -105,8 +105,8 @@ So, here's the front of our first flashcard, our question: a new instrument - - world history & geography + + computer programming details of friends' lives @@ -115,7 +115,7 @@ So, here's the front of our first flashcard, our question: anything interesting you find, anywhere! - every pokémon + all the pokémon Now, you write your answer on the back: @@ -169,9 +169,9 @@ So, here's the front of our first flashcard, our question: WHY: to speak to friends, family, lovers in their native tongue - WHAT: world history & geography + WHAT: computer programming
- WHY: to put the news in perspective + WHY: to make money so you can eat
WHAT: anything interesting @@ -223,23 +223,23 @@ So, here's the front of our first flashcard, our question: Leitner Box
- Pros: arts-and-craftsy, easy to start + Pros: arts-and-craftsy, easy to use
- Cons: not as portable than an app + Cons: not as portable as an app
- Anki + Anki (app)
Pros: huge community, open-source, lots of powerful features
- Cons: kinda ugly interface + Cons: kinda ugly
- TinyCards + TinyCards (app)
- Pros: beautiful design, easy to start + Pros: beautiful design, easy to use
- Cons: less powerful than Anki + Cons: max 150 cards per deck, doesn't let you decide if you got a card right
(Want something else? @@ -403,8 +403,9 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter - + + FIRST: to remind you to play the Spaced Repetition game daily! @@ -420,8 +421,9 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter - + + SECOND: @@ -430,8 +432,9 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter - + + And finally, THIRD: a .zip of all the flashcards you've been practicing in this interactive comic! @@ -475,7 +478,7 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter - + @@ -574,8 +577,11 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter WHY: - - DO YOUR CARDS FOR TODAY! + + DO + + + ME! wallpaper @@ -591,13 +597,17 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter (pdf, so you can print it out) - a link to download Anki! - (and here's a video tutorial on how to get started) + a link to + download Anki! + (and here's + a video tutorial + on how to get started) - a link to TinyCards! - (you can try cards without download or signup. - might i recommend geography or blabla?) + a link to + TinyCards! + (i recommend checking out their + geography decks) links to @@ -615,8 +625,8 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter -
- Everything +
+ Anything interesting!
@@ -626,8 +636,8 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter
-
- For curiosity's sake! +
+ For curiosity's sake
@@ -637,7 +647,7 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter
-
+
Leitner Box
@@ -648,7 +658,7 @@ Before sleeping, coz otherwise you'd just stress-binge on twitter
-
+
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(){