Skip to content

Commit

Permalink
allllmost ready
Browse files Browse the repository at this point in the history
  • Loading branch information
ncase committed Jul 24, 2017
1 parent 029852d commit dd2ed39
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 8 deletions.
Binary file added favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,39 @@
<!doctype>
<html>
<head>

<!-- TRANSLATE: 'title' -->
<title>The Evolution of Trust</title>
<meta content="text/html;charset=utf-8" http-equiv="Content-Type">
<meta content="utf-8" http-equiv="encoding">
<meta charset="utf-8">
<meta name="viewport" content="width=640">
<link rel="icon" type="image/png" href="favicon.png">

<!-- TRANSLATE: 'name' and 'description' -->
<meta itemprop="name" content="The Evolution of Trust">
<meta itemprop="description" content="an interactive guide to the game theory of cooperation">
<meta itemprop="image" content="http://ncase.me/trust/social/thumbnail.png">

<!-- TRANSLATE: 'twitter:title' and 'twitter:description' -->
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="@ncasenmare">
<meta name="twitter:title" content="The Evolution of Trust">
<meta name="twitter:description" content="an interactive guide to the game theory of cooperation">
<meta name="twitter:creator" content="@ncasenmare">
<meta name="twitter:image" content="http://ncase.me/trust/social/thumbnail.png">

<!-- TRANSLATE: 'og:title' and 'og:description' -->
<meta property="og:title" content="The Evolution of Trust">
<meta property="og:type" content="website">
<meta property="og:url" content="http://ncase.me/trust/">
<meta property="og:image" content="http://ncase.me/trust/social/thumbnail.png">
<meta property="og:description" content="an interactive guide to the game theory of cooperation">

<!-- Styles -->
<link rel="stylesheet" href="css/slides.css">
<link rel="stylesheet" href="css/balloon.css">

</head>
<body>
<div id="preloader">loading...</div>
Expand Down
10 changes: 6 additions & 4 deletions js/slides/5_Slides_Distrust.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ SLIDES.push({
unlisten(_.misc);
self.remove("roundsLabel");
self.remove("roundsSlider");
self.remove("continueLabel");
self.remove("continueButton");
var o = self.objects;
if(o.continueLabel) self.remove("continueLabel");
if(o.continueButton) self.remove("continueButton");
}
});

Expand Down Expand Up @@ -264,8 +265,9 @@ SLIDES.push({
self.remove("payoffs");
self.remove("text2");
self.remove("note2");
self.remove("continueLabel");
self.remove("continueButton");
var o = self.objects;
if(o.continueLabel) self.remove("continueLabel");
if(o.continueButton) self.remove("continueButton");
}
});

Expand Down
5 changes: 3 additions & 2 deletions js/slides/6_Slides_Noise.js
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,9 @@ SLIDES.push({
unlisten(_.misc);
self.remove("noiseLabel");
self.remove("noiseSlider");
self.remove("continueLabel");
self.remove("continueButton");
var o = self.objects;
if(o.continueLabel) self.remove("continueLabel");
if(o.continueButton) self.remove("continueButton");
self.remove("text");
}
});
Expand Down
4 changes: 2 additions & 2 deletions lang/en.html
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@
a <i>little</i> bit of it leads to forgiveness,
but <i>too much</i> and it leads to widespread distrust!
I think our modern media technology,
as much as it's helped us <i>increase</i> communication...
as much as it's helped us increase communication...
has increased our <i>miscommunication</i> much more.
<br><br>
At last, let's experiment with <i>all</i> the numbers, the knobs and sliders.
Expand Down Expand Up @@ -878,7 +878,7 @@
<b>In the short run, the game defines the players. But in the long run,
it's us players who define the game.</b>
<br><br>
So, do what <i>you</i> can to create the conditions necessary to evolve trust.
So, do what <i>you</i> can do, to create the conditions necessary to evolve trust.
Build relationships. Find win-wins. Communicate clearly.
Maybe then, we can stop firing at each other, get out of our own trenches,
cross No Man's Land to come together...
Expand Down
Binary file added social/thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dd2ed39

Please sign in to comment.