diff options
author | Eric Bidelman | 2013-04-29 22:30:21 -0700 |
---|---|---|
committer | Eric Bidelman | 2013-04-29 22:30:21 -0700 |
commit | 5dd5247e157e4928e2cc9133d99e9cc15eb9a9a2 (patch) | |
tree | 2bdfdfa0f0b9cebba2d9464b151d7d893e1e2945 | |
parent | 3c76fb8f90b502180d09fee6ed9bbc7f9b34d8df (diff) | |
download | io-slides-remote-5dd5247e157e4928e2cc9133d99e9cc15eb9a9a2.tar.gz |
Revert "box-sizing so hard"
This reverts commit 3c76fb8f90b502180d09fee6ed9bbc7f9b34d8df.
-rw-r--r-- | theme/css/io2013.css | 21 | ||||
-rw-r--r-- | theme/scss/io2013.scss | 1 |
2 files changed, 9 insertions, 13 deletions
diff --git a/theme/css/io2013.css b/theme/css/io2013.css index 5b137d6..6bdba98 100644 --- a/theme/css/io2013.css +++ b/theme/css/io2013.css | |||
@@ -30,11 +30,8 @@ slides > slide:not(.nobackground):before { | |||
30 | left: 0; | 30 | left: 0; |
31 | width: 100%; | 31 | width: 100%; |
32 | bottom: 0; | 32 | bottom: 0; |
33 | -webkit-box-sizing: border-box; | ||
34 | -moz-box-sizing: border-box; | ||
35 | box-sizing: border-box; | ||
36 | } | 33 | } |
37 | /* line 37, ../scss/io2013.scss */ | 34 | /* line 36, ../scss/io2013.scss */ |
38 | slides > slide:not(.nobackground):after { | 35 | slides > slide:not(.nobackground):after { |
39 | background: url(../../images/google_developers_icon_128.png) no-repeat 0 0; | 36 | background: url(../../images/google_developers_icon_128.png) no-repeat 0 0; |
40 | -webkit-background-size: 30px; | 37 | -webkit-background-size: 30px; |
@@ -51,7 +48,7 @@ slides > slide:not(.nobackground):after { | |||
51 | text-align: right; | 48 | text-align: right; |
52 | padding-right: 60px; | 49 | padding-right: 60px; |
53 | } | 50 | } |
54 | /* line 51, ../scss/io2013.scss */ | 51 | /* line 50, ../scss/io2013.scss */ |
55 | slides > slide.title-slide:after { | 52 | slides > slide.title-slide:after { |
56 | content: ''; | 53 | content: ''; |
57 | background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%; | 54 | background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%; |
@@ -65,32 +62,32 @@ slides > slide.title-slide:after { | |||
65 | width: 100%; | 62 | width: 100%; |
66 | height: 90px; | 63 | height: 90px; |
67 | } | 64 | } |
68 | /* line 63, ../scss/io2013.scss */ | 65 | /* line 62, ../scss/io2013.scss */ |
69 | slides > slide.title-slide hgroup h1 { | 66 | slides > slide.title-slide hgroup h1 { |
70 | font-weight: bold; | 67 | font-weight: bold; |
71 | line-height: 1.1; | 68 | line-height: 1.1; |
72 | } | 69 | } |
73 | /* line 67, ../scss/io2013.scss */ | 70 | /* line 66, ../scss/io2013.scss */ |
74 | slides > slide.title-slide hgroup h2, slides > slide.title-slide hgroup p { | 71 | slides > slide.title-slide hgroup h2, slides > slide.title-slide hgroup p { |
75 | color: #515151; | 72 | color: #515151; |
76 | } | 73 | } |
77 | /* line 70, ../scss/io2013.scss */ | 74 | /* line 69, ../scss/io2013.scss */ |
78 | slides > slide.title-slide hgroup h2 { | 75 | slides > slide.title-slide hgroup h2 { |
79 | margin-top: 0.25em; | 76 | margin-top: 0.25em; |
80 | } | 77 | } |
81 | /* line 73, ../scss/io2013.scss */ | 78 | /* line 72, ../scss/io2013.scss */ |
82 | slides > slide.title-slide hgroup p { | 79 | slides > slide.title-slide hgroup p { |
83 | margin-top: 3em; | 80 | margin-top: 3em; |
84 | } | 81 | } |
85 | /* line 79, ../scss/io2013.scss */ | 82 | /* line 78, ../scss/io2013.scss */ |
86 | slides > slide .source { | 83 | slides > slide .source { |
87 | bottom: 130px; | 84 | bottom: 130px; |
88 | } | 85 | } |
89 | /* line 83, ../scss/io2013.scss */ | 86 | /* line 82, ../scss/io2013.scss */ |
90 | slides > slide > article:only-child { | 87 | slides > slide > article:only-child { |
91 | height: 88%; | 88 | height: 88%; |
92 | } | 89 | } |
93 | /* line 87, ../scss/io2013.scss */ | 90 | /* line 86, ../scss/io2013.scss */ |
94 | slides > slide > article:only-child > iframe { | 91 | slides > slide > article:only-child > iframe { |
95 | height: 100%; | 92 | height: 100%; |
96 | } | 93 | } |
diff --git a/theme/scss/io2013.scss b/theme/scss/io2013.scss index 564caea..1bab7b0 100644 --- a/theme/scss/io2013.scss +++ b/theme/scss/io2013.scss | |||
@@ -32,7 +32,6 @@ slides > slide { | |||
32 | left: 0; | 32 | left: 0; |
33 | width: 100%; | 33 | width: 100%; |
34 | bottom: 0; | 34 | bottom: 0; |
35 | @include box-sizing(border-box); | ||
36 | } | 35 | } |
37 | &:after { | 36 | &:after { |
38 | background: url(../../images/google_developers_icon_128.png) no-repeat 0 0; | 37 | background: url(../../images/google_developers_icon_128.png) no-repeat 0 0; |