aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bidelman2013-04-29 22:30:29 -0700
committerEric Bidelman2013-04-29 22:30:29 -0700
commit543f4140ed7efa3d493e997ac6b5aa62d557706c (patch)
tree76b6e1227768c79582dceaa3a2778cd437bf15c7
parent5dd5247e157e4928e2cc9133d99e9cc15eb9a9a2 (diff)
downloadio-slides-remote-io2013.tar.gz
Revert "Adding bottom grey footer"io2013
This reverts commit 31ea3d93f19250eef47f3345c3043c890ac31442.
-rw-r--r--template.html13
-rw-r--r--theme/css/io2013.css58
-rw-r--r--theme/scss/io2013.scss39
3 files changed, 14 insertions, 96 deletions
diff --git a/template.html b/template.html
index 8cff66e..1e09a8c 100644
--- a/template.html
+++ b/template.html
@@ -76,20 +76,11 @@ URL: https://code.google.com/p/io-2012-slides
76 <li>Pressing 'o' toggles overview mode</li> 76 <li>Pressing 'o' toggles overview mode</li>
77 <li>Pressing 'ESC' toggles off these goodies</li> 77 <li>Pressing 'ESC' toggles off these goodies</li>
78 </ul> 78 </ul>
79 </article>
80 </slide>
81
82 <slide>
83 <hgroup>
84 <h2>Slide with Bullets that Build</h2>
85 </hgroup>
86 <article>
87 <p>Another list, but items fade as they build:</p> 79 <p>Another list, but items fade as they build:</p>
88 <ul class="build fade"> 80 <ul class="build fade">
89 <li>Hover over me!</li> 81 <li>Hover over me!</li>
90 <li>Hover over me!</li> 82 <li>Hover over me!</li>
91 <li>Hover over me!</li> 83 <li>Hover over me!</li>
92 <li>Hover over me!</li>
93 </ul> 84 </ul>
94 </article> 85 </article>
95 </slide> 86 </slide>
@@ -152,7 +143,11 @@ function helloWorld(world) {
152&lt;/style&gt; 143&lt;/style&gt;
153</pre> 144</pre>
154<pre class="prettyprint" data-lang="html"> 145<pre class="prettyprint" data-lang="html">
146&lt;!DOCTYPE html>
155&lt;html> 147&lt;html>
148&lt;head>
149 &lt;title>My Awesome Page&lt;/title>
150&lt;/head>
156&lt;body> 151&lt;body>
157 &lt;p&gt;Hello world&lt;/p&gt; 152 &lt;p&gt;Hello world&lt;/p&gt;
158&lt;body> 153&lt;body>
diff --git a/theme/css/io2013.css b/theme/css/io2013.css
index 6bdba98..364eccb 100644
--- a/theme/css/io2013.css
+++ b/theme/css/io2013.css
@@ -1,54 +1,28 @@
1/* line 6, ../scss/io2013.scss */ 1/* line 5, ../scss/io2013.scss */
2* { 2* {
3 line-height: 1.3; 3 line-height: 1.3;
4} 4}
5 5
6/* line 10, ../scss/io2013.scss */ 6/* line 9, ../scss/io2013.scss */
7h2 { 7h2 {
8 font-weight: bold; 8 font-weight: bold;
9} 9}
10 10
11/* line 13, ../scss/io2013.scss */ 11/* line 12, ../scss/io2013.scss */
12h2, h3 { 12h2, h3 {
13 color: #515151; 13 color: #515151;
14} 14}
15 15
16/* line 17, ../scss/io2013.scss */ 16/* line 16, ../scss/io2013.scss */
17q, blockquote { 17q, blockquote {
18 font-weight: bold; 18 font-weight: bold;
19} 19}
20 20
21/* line 21, ../scss/io2013.scss */ 21/* line 20, ../scss/io2013.scss */
22slides > slide { 22slides > slide {
23 color: #515151; 23 color: #515151;
24} 24}
25/* line 28, ../scss/io2013.scss */ 25/* line 24, ../scss/io2013.scss */
26slides > slide:not(.nobackground):before {
27 background: none;
28 background-color: #e6e6e6;
29 height: 90px;
30 left: 0;
31 width: 100%;
32 bottom: 0;
33}
34/* line 36, ../scss/io2013.scss */
35slides > slide:not(.nobackground):after {
36 background: url(../../images/google_developers_icon_128.png) no-repeat 0 0;
37 -webkit-background-size: 30px;
38 -moz-background-size: 30px;
39 -o-background-size: 30px;
40 background-size: 30px;
41 background-position: 60px 50%;
42 left: 0;
43 bottom: 90px;
44 width: 100%;
45 -webkit-box-sizing: border-box;
46 -moz-box-sizing: border-box;
47 box-sizing: border-box;
48 text-align: right;
49 padding-right: 60px;
50}
51/* line 50, ../scss/io2013.scss */
52slides > slide.title-slide:after { 26slides > slide.title-slide:after {
53 content: ''; 27 content: '';
54 background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%; 28 background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%;
@@ -62,32 +36,20 @@ slides > slide.title-slide:after {
62 width: 100%; 36 width: 100%;
63 height: 90px; 37 height: 90px;
64} 38}
65/* line 62, ../scss/io2013.scss */ 39/* line 36, ../scss/io2013.scss */
66slides > slide.title-slide hgroup h1 { 40slides > slide.title-slide hgroup h1 {
67 font-weight: bold; 41 font-weight: bold;
68 line-height: 1.1; 42 line-height: 1.1;
69} 43}
70/* line 66, ../scss/io2013.scss */ 44/* line 40, ../scss/io2013.scss */
71slides > slide.title-slide hgroup h2, slides > slide.title-slide hgroup p { 45slides > slide.title-slide hgroup h2, slides > slide.title-slide hgroup p {
72 color: #515151; 46 color: #515151;
73} 47}
74/* line 69, ../scss/io2013.scss */ 48/* line 43, ../scss/io2013.scss */
75slides > slide.title-slide hgroup h2 { 49slides > slide.title-slide hgroup h2 {
76 margin-top: 0.25em; 50 margin-top: 0.25em;
77} 51}
78/* line 72, ../scss/io2013.scss */ 52/* line 46, ../scss/io2013.scss */
79slides > slide.title-slide hgroup p { 53slides > slide.title-slide hgroup p {
80 margin-top: 3em; 54 margin-top: 3em;
81} 55}
82/* line 78, ../scss/io2013.scss */
83slides > slide .source {
84 bottom: 130px;
85}
86/* line 82, ../scss/io2013.scss */
87slides > slide > article:only-child {
88 height: 88%;
89}
90/* line 86, ../scss/io2013.scss */
91slides > slide > article:only-child > iframe {
92 height: 100%;
93}
diff --git a/theme/scss/io2013.scss b/theme/scss/io2013.scss
index 1bab7b0..c728cfb 100644
--- a/theme/scss/io2013.scss
+++ b/theme/scss/io2013.scss
@@ -1,5 +1,4 @@
1@import "compass/css3/background-size"; 1@import "compass/css3/background-size";
2@import "compass/css3/box-sizing";
3 2
4@import "variables"; 3@import "variables";
5 4
@@ -20,31 +19,6 @@ q, blockquote {
20 19
21slides > slide { 20slides > slide {
22 color: $gray-4; 21 color: $gray-4;
23
24 $grayBarHeight: 90px;
25
26 // Grey bottom bar.
27 &:not(.nobackground) {
28 &:before {
29 background: none;
30 background-color: $gray-1;
31 height: $grayBarHeight;
32 left: 0;
33 width: 100%;
34 bottom: 0;
35 }
36 &:after {
37 background: url(../../images/google_developers_icon_128.png) no-repeat 0 0;
38 @include background-size($brand-small-icon-size);
39 background-position: $slide-left-right-padding 50%;
40 left: 0;
41 bottom: $grayBarHeight;
42 width: 100%;
43 @include box-sizing(border-box);
44 text-align: right;
45 padding-right: $slide-left-right-padding;
46 }
47 }
48 22
49 &.title-slide { 23 &.title-slide {
50 &:after { 24 &:after {
@@ -74,17 +48,4 @@ slides > slide {
74 } 48 }
75 } 49 }
76 } 50 }
77
78 .source {
79 bottom: $grayBarHeight + 40;
80 }
81
82 > article:only-child {
83 height: 88%
84 }
85
86 > article:only-child > iframe {
87 height: 100%;
88 }
89
90} \ No newline at end of file 51} \ No newline at end of file