aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bidelman2012-04-10 16:41:02 -0700
committerEric Bidelman2012-04-10 16:41:02 -0700
commitba011027cea557a78a400959f9f04a8de456947e (patch)
treeacc963a8e013e71ec2f5368f938dc74ef1bd048e
parenta43294ef655c97758b425bd7a0c1d005cdd83483 (diff)
downloadio-slides-remote-ba011027cea557a78a400959f9f04a8de456947e.tar.gz
Clean up up .sass file. Speaker notes and code highlighting toggles off when slide move
-rw-r--r--js/slides.js15
-rw-r--r--template.html8
-rw-r--r--theme/css/default.css623
-rw-r--r--theme/sass/default.scss166
4 files changed, 392 insertions, 420 deletions
diff --git a/js/slides.js b/js/slides.js
index 3f2366b..66aaa51 100644
--- a/js/slides.js
+++ b/js/slides.js
@@ -128,7 +128,10 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
128 break; 128 break;
129 129
130 case 78: // N 130 case 78: // N
131 document.body.classList.toggle('with-notes'); 131 // If this slide contains notes, toggle them.
132 if (this.slides_[this.curSlide_].querySelector('.note')) {
133 document.body.classList.toggle('with-notes');
134 }
132 break; 135 break;
133 136
134 case 27: // ESC 137 case 27: // ESC
@@ -276,6 +279,11 @@ SlideDeck.prototype.buildNextItem_ = function() {
276 */ 279 */
277SlideDeck.prototype.prevSlide = function(opt_dontPush) { 280SlideDeck.prototype.prevSlide = function(opt_dontPush) {
278 if (this.curSlide_ > 0) { 281 if (this.curSlide_ > 0) {
282 // Toggle off speaker notes and/or highlighted code if they're showing.
283 var bodyClassList = document.body.classList;
284 bodyClassList.remove('with-notes');
285 bodyClassList.remove('highlight-code');
286
279 this.prevSlide_ = this.curSlide_; 287 this.prevSlide_ = this.curSlide_;
280 this.curSlide_--; 288 this.curSlide_--;
281 289
@@ -293,6 +301,11 @@ SlideDeck.prototype.nextSlide = function(opt_dontPush) {
293 } 301 }
294 302
295 if (this.curSlide_ < this.slides_.length - 1) { 303 if (this.curSlide_ < this.slides_.length - 1) {
304 // Toggle off speaker notes and/or highlighted code if they're showing.
305 var bodyClassList = document.body.classList;
306 bodyClassList.remove('with-notes');
307 bodyClassList.remove('highlight-code');
308
296 this.prevSlide_ = this.curSlide_; 309 this.prevSlide_ = this.curSlide_;
297 this.curSlide_++; 310 this.curSlide_++;
298 311
diff --git a/template.html b/template.html
index 21af68e..7a83433 100644
--- a/template.html
+++ b/template.html
@@ -151,13 +151,13 @@ function helloWorld(world) {
151 151
152 <slide> 152 <slide>
153 <aside class="note"> 153 <aside class="note">
154 <section>Speaker notes can go here!</section> 154 <section>Speaker notes go here!</section>
155 </aside> 155 </aside>
156 <hgroup> 156 <hgroup>
157 <h2>Slide with Speaker Notes</h2> 157 <h2>Slide with Speaker Notes</h2>
158 </hgroup> 158 </hgroup>
159 <article> 159 <article>
160 Press 'n' to show speaker notes on a slide. 160 Press 'n' to show speaker notes on slides that define them.
161 </article> 161 </article>
162 </slide> 162 </slide>
163 163
@@ -333,9 +333,7 @@ function helloWorld(world) {
333 <p>Important contact information goes here.</p> 333 <p>Important contact information goes here.</p>
334 </article> 334 </article>
335 <p class="auto-fadein" data-config-contact> 335 <p class="auto-fadein" data-config-contact>
336 <!--Insert contact info<br> 336 <!-- populated from config -->
337 Insert contact info<br>
338 Insert contact info-->
339 </p> 337 </p>
340 </slide> 338 </slide>
341 339
diff --git a/theme/css/default.css b/theme/css/default.css
index d82a3c2..262e2a2 100644
--- a/theme/css/default.css
+++ b/theme/css/default.css
@@ -1,4 +1,4 @@
1/* line 17, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 1/* line 17, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
2html, body, div, span, applet, object, iframe, 2html, body, div, span, applet, object, iframe,
3h1, h2, h3, h4, h5, h6, p, blockquote, pre, 3h1, h2, h3, h4, h5, h6, p, blockquote, pre,
4a, abbr, acronym, address, big, cite, code, 4a, abbr, acronym, address, big, cite, code,
@@ -20,45 +20,45 @@ time, mark, audio, video {
20 vertical-align: baseline; 20 vertical-align: baseline;
21} 21}
22 22
23/* line 20, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 23/* line 20, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
24body { 24body {
25 line-height: 1; 25 line-height: 1;
26} 26}
27 27
28/* line 22, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 28/* line 22, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
29ol, ul { 29ol, ul {
30 list-style: none; 30 list-style: none;
31} 31}
32 32
33/* line 24, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 33/* line 24, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
34table { 34table {
35 border-collapse: collapse; 35 border-collapse: collapse;
36 border-spacing: 0; 36 border-spacing: 0;
37} 37}
38 38
39/* line 26, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 39/* line 26, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
40caption, th, td { 40caption, th, td {
41 text-align: left; 41 text-align: left;
42 font-weight: normal; 42 font-weight: normal;
43 vertical-align: middle; 43 vertical-align: middle;
44} 44}
45 45
46/* line 28, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 46/* line 28, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
47q, blockquote { 47q, blockquote {
48 quotes: none; 48 quotes: none;
49} 49}
50/* line 101, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 50/* line 101, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
51q:before, q:after, blockquote:before, blockquote:after { 51q:before, q:after, blockquote:before, blockquote:after {
52 content: ""; 52 content: "";
53 content: none; 53 content: none;
54} 54}
55 55
56/* line 30, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 56/* line 30, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
57a img { 57a img {
58 border: none; 58 border: none;
59} 59}
60 60
61/* line 114, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */ 61/* line 114, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
62article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { 62article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
63 display: block; 63 display: block;
64} 64}
@@ -86,8 +86,9 @@ body {
86 -moz-font-smoothing: antialiased; 86 -moz-font-smoothing: antialiased;
87 -ms-font-smoothing: antialiased; 87 -ms-font-smoothing: antialiased;
88 -o-font-smoothing: antialiased; 88 -o-font-smoothing: antialiased;
89 -moz-transition: opacity 800ms ease-in;
90 -webkit-transition: opacity 800ms ease-in; 89 -webkit-transition: opacity 800ms ease-in;
90 -moz-transition: opacity 800ms ease-in;
91 -ms-transition: opacity 800ms ease-in;
91 -o-transition: opacity 800ms ease-in; 92 -o-transition: opacity 800ms ease-in;
92 transition: opacity 800ms ease-in; 93 transition: opacity 800ms ease-in;
93} 94}
@@ -104,10 +105,10 @@ slides {
104 position: absolute; 105 position: absolute;
105 left: 0; 106 left: 0;
106 top: 0; 107 top: 0;
107 -moz-transform: translate3d(0, 0, 0);
108 -webkit-transform: translate3d(0, 0, 0); 108 -webkit-transform: translate3d(0, 0, 0);
109 -o-transform: translate3d(0, 0, 0); 109 -moz-transform: translate3d(0, 0, 0);
110 -ms-transform: translate3d(0, 0, 0); 110 -ms-transform: translate3d(0, 0, 0);
111 -o-transform: translate3d(0, 0, 0);
111 transform: translate3d(0, 0, 0); 112 transform: translate3d(0, 0, 0);
112 -webkit-perspective: 1000; 113 -webkit-perspective: 1000;
113 perspective: 1000; 114 perspective: 1000;
@@ -122,9 +123,8 @@ slides > slide {
122 overflow: hidden; 123 overflow: hidden;
123 left: 50%; 124 left: 50%;
124 top: 50%; 125 top: 50%;
125 -moz-box-sizing: border-box;
126 -webkit-box-sizing: border-box; 126 -webkit-box-sizing: border-box;
127 -ms-box-sizing: border-box; 127 -moz-box-sizing: border-box;
128 box-sizing: border-box; 128 box-sizing: border-box;
129} 129}
130 130
@@ -174,11 +174,10 @@ article.fill iframe {
174 height: 100%; 174 height: 100%;
175 border: 0; 175 border: 0;
176 margin: 0; 176 margin: 0;
177 -moz-border-radius: 10px;
178 -webkit-border-radius: 10px; 177 -webkit-border-radius: 10px;
179 -o-border-radius: 10px; 178 -moz-border-radius: 10px;
180 -ms-border-radius: 10px; 179 -ms-border-radius: 10px;
181 -khtml-border-radius: 10px; 180 -o-border-radius: 10px;
182 border-radius: 10px; 181 border-radius: 10px;
183 z-index: -1; 182 z-index: -1;
184} 183}
@@ -186,8 +185,8 @@ article.fill iframe {
186/* line 145, ../sass/_base.scss */ 185/* line 145, ../sass/_base.scss */
187slide.fill { 186slide.fill {
188 background-repeat: no-repeat; 187 background-repeat: no-repeat;
189 -moz-background-size: cover;
190 -webkit-background-size: cover; 188 -webkit-background-size: cover;
189 -moz-background-size: cover;
191 -o-background-size: cover; 190 -o-background-size: cover;
192 background-size: cover; 191 background-size: cover;
193} 192}
@@ -226,9 +225,8 @@ slide.fill img {
226 border: solid transparent; 225 border: solid transparent;
227 min-height: 28px;