From 3c6704cb63bd09c9c2b65d6fdeda626341f7f0a7 Mon Sep 17 00:00:00 2001 From: Nicky Case Date: Wed, 12 Jul 2017 14:59:22 -0400 Subject: [PATCH] slide select --- css/balloon.css | 6 ++++-- css/slides.css | 4 +++- index.html | 1 + js/core/SlideSelect.js | 2 ++ js/slides/2_Slides_Iterated.js | 3 +-- js/slides/3_Slides_Tournament.js | 34 ++++++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/css/balloon.css b/css/balloon.css index 17d00ed..4b7aff2 100755 --- 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, diff --git a/css/slides.css b/css/slides.css index f4fd311..fc571ce 100644 --- 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; } diff --git a/index.html b/index.html index 0983a8d..83a6563 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ The Evolution of Trust +
diff --git a/js/core/SlideSelect.js b/js/core/SlideSelect.js index bbed13e..e0bd981 100644 --- 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(){ diff --git a/js/slides/2_Slides_Iterated.js b/js/slides/2_Slides_Iterated.js index 1a5690a..6ffdf71 100644 --- 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){} }); \ No newline at end of file diff --git a/js/slides/3_Slides_Tournament.js b/js/slides/3_Slides_Tournament.js index e69de29..26f0f0f 100644 --- 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){ + + } +}); \ No newline at end of file