From 3c76fb8f90b502180d09fee6ed9bbc7f9b34d8df Mon Sep 17 00:00:00 2001 From: Eric Bidelman Date: Mon, 29 Apr 2013 18:11:36 -0700 Subject: box-sizing so hard --- theme/css/io2013.css | 21 ++++++++++++--------- 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 { left: 0; width: 100%; bottom: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } -/* line 36, ../scss/io2013.scss */ +/* line 37, ../scss/io2013.scss */ slides > slide:not(.nobackground):after { background: url(../../images/google_developers_icon_128.png) no-repeat 0 0; -webkit-background-size: 30px; @@ -48,7 +51,7 @@ slides > slide:not(.nobackground):after { text-align: right; padding-right: 60px; } -/* line 50, ../scss/io2013.scss */ +/* line 51, ../scss/io2013.scss */ slides > slide.title-slide:after { content: ''; background: url(../../images/io2013/google-io-lockup-1.png) no-repeat 100% 50%; @@ -62,32 +65,32 @@ slides > slide.title-slide:after { width: 100%; height: 90px; } -/* line 62, ../scss/io2013.scss */ +/* line 63, ../scss/io2013.scss */ slides > slide.title-slide hgroup h1 { font-weight: bold; line-height: 1.1; } -/* line 66, ../scss/io2013.scss */ +/* line 67, ../scss/io2013.scss */ slides > slide.title-slide hgroup h2, slides > slide.title-slide hgroup p { color: #515151; } -/* line 69, ../scss/io2013.scss */ +/* line 70, ../scss/io2013.scss */ slides > slide.title-slide hgroup h2 { margin-top: 0.25em; } -/* line 72, ../scss/io2013.scss */ +/* line 73, ../scss/io2013.scss */ slides > slide.title-slide hgroup p { margin-top: 3em; } -/* line 78, ../scss/io2013.scss */ +/* line 79, ../scss/io2013.scss */ slides > slide .source { bottom: 130px; } -/* line 82, ../scss/io2013.scss */ +/* line 83, ../scss/io2013.scss */ slides > slide > article:only-child { height: 88%; } -/* line 86, ../scss/io2013.scss */ +/* line 87, ../scss/io2013.scss */ slides > slide > article:only-child > iframe { height: 100%; } 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 { left: 0; width: 100%; bottom: 0; + @include box-sizing(border-box); } &:after { background: url(../../images/google_developers_icon_128.png) no-repeat 0 0; -- cgit v1.2.3