slide select

7 years ago · 3c6704cb63
parent 335810b29d
commit 3c6704cb63
6 changed files with 45 additions and 5 deletions
--- a/css/balloon.css
+++ b/css/balloon.css
@ -33,7 +33,8 @@ button[data-balloon] {
  font-size: 18px;
  padding: .5em 1em;
  white-space: nowrap;
-  margin-bottom: 11px;
+  /*margin-bottom: 11px;*/
+  margin-bottom: 26px;
 }
 [data-balloon]:before {
  background: url('data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2236px%22%20height%3D%2212px%22%3E%3Cpath%20fill%3D%22rgba%2817,%2017,%2017,%200.9%29%22%20transform%3D%22rotate%280%29%22%20d%3D%22M2.658,0.000%20C-13.615,0.000%2050.938,0.000%2034.662,0.000%20C28.662,0.000%2023.035,12.002%2018.660,12.002%20C14.285,12.002%208.594,0.000%202.658,0.000%20Z%22/%3E%3C/svg%3E') no-repeat;
@ -41,7 +42,8 @@ button[data-balloon] {
  height: 6px;
  width: 18px;
  content: "";
-  margin-bottom: 5px;
+  /*margin-bottom: 5px;*/
+  margin-bottom: 20px;
 }
 [data-balloon]:hover:before,
 [data-balloon][data-balloon-visible]:before,
--- a/css/slides.css
+++ b/css/slides.css
@ -29,6 +29,8 @@ body{
 	overflow: hidden;
 }
 #footer{
+	position: absolute;
+	z-index: 1000;
 	width: 100%;
 	height: 60px;
 	background: #222;
@ -246,7 +248,7 @@ body{
 	background-size: 200% 2000%;
 	display: none;

-	z-index: 1000;
+	z-index: 200;
 }


--- a/index.html
+++ b/index.html
@ -3,6 +3,7 @@
 <head>
 	<title>The Evolution of Trust</title>
 	<link rel="stylesheet" href="css/slides.css">
+	<link rel="stylesheet" href="css/balloon.css">
 </head>
 <body>
 	<div id="main">
--- a/js/core/SlideSelect.js
+++ b/js/core/SlideSelect.js
@ -33,6 +33,8 @@ function SlideSelectDot(slide){
 	// DOM
 	self.dom = document.createElement("div");
 	self.dom.className = "dot";
+	self.dom.setAttribute("data-balloon", Words.get("chapter_"+slide.id));
+	self.dom.setAttribute("data-balloon-pos", "up");
 	
 	// On Click
 	self.dom.onclick = function(){
--- a/js/slides/2_Slides_Iterated.js
+++ b/js/slides/2_Slides_Iterated.js
@ -6,6 +6,7 @@ SLIDES.push({

 		// Iterated Simulation
 		self.add({id:"iterated", type:"Iterated", x:130, y:133});
+		self.objects.iterated.dehighlightPayoff();
 		
 	},

@ -66,6 +67,4 @@ SLIDES.push({
 		self.clear();
 	}

-},{
-	onstart: function(self){}
 });
--- a/js/slides/3_Slides_Tournament.js
+++ b/js/slides/3_Slides_Tournament.js
@ -0,0 +1,34 @@
+// Show the characters
+SLIDES.push({
+
+	id: "tournament",
+
+	onstart: function(self){
+
+	},
+	onend: function(self){
+		self.clear();
+	}
+
+});
+
+// round-robin tournament, place your bets
+SLIDES.push({
+	onstart: function(self){
+
+	}
+});
+
+// go through it ONE BY ONE
+SLIDES.push({
+	onstart: function(self){
+
+	}
+});
+
+// who the winner is!
+SLIDES.push({
+	onstart: function(self){
+
+	}
+});