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