From a72619425c7b796a72c9e50ea06f6f8308e8703a Mon Sep 17 00:00:00 2001 From: Eric Bidelman Date: Mon, 9 Apr 2012 13:40:34 -0700 Subject: auto fadein slide animations happen with css (no more js :)) --- theme/css/default.css | 237 ++++++++++++++++++++++++------------------------ theme/sass/default.scss | 33 +++---- 2 files changed, 136 insertions(+), 134 deletions(-) (limited to 'theme') diff --git a/theme/css/default.css b/theme/css/default.css index c2022de..f9a91b0 100644 --- a/theme/css/default.css +++ b/theme/css/default.css @@ -358,7 +358,15 @@ slides > slide.current { -ms-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } -/* line 156, ../sass/default.scss */ +/* line 155, ../sass/default.scss */ +slides > slide.current .auto-fadein { + opacity: 1; +} +/* line 159, ../sass/default.scss */ +slides > slide.current .gdbar { + background-size: 100% 100%; +} +/* line 164, ../sass/default.scss */ slides > slide.next { display: block; -moz-transform: translate(1020px) rotateY(-30deg) rotateX(45deg); @@ -372,7 +380,7 @@ slides > slide.next { -ms-transform: translate3d(1020px, 0, 0) rotateY(-30deg) rotateX(45deg); transform: translate3d(1020px, 0, 0) rotateY(-30deg) rotateX(45deg); } -/* line 162, ../sass/default.scss */ +/* line 170, ../sass/default.scss */ slides > slide.far-next { display: block; -moz-transform: translate(2040px); @@ -386,24 +394,24 @@ slides > slide.far-next { -ms-transform: translate3d(2040px, 0, 0); transform: translate3d(2040px, 0, 0); } -/* line 168, ../sass/default.scss */ +/* line 176, ../sass/default.scss */ slides > slide.dark { background: #515151; } -/* line 172, ../sass/default.scss */ +/* line 180, ../sass/default.scss */ slides > slide hgroup + article { margin-top: 1.5em; } -/* line 176, ../sass/default.scss */ +/* line 184, ../sass/default.scss */ slides > slide > article { margin-top: 2em; } -/* line 179, ../sass/default.scss */ +/* line 187, ../sass/default.scss */ slides > slide > article p { margin-bottom: 1em; } -/* line 190, ../sass/default.scss */ +/* line 198, ../sass/default.scss */ slides.layout-widescreen > slide.far-past, slides.layout-faux-widescreen > slide.far-past { display: block; @@ -418,7 +426,7 @@ slides.layout-faux-widescreen > slide.far-past { -ms-transform: translate3d(-2260px, 0, 0); transform: translate3d(-2260px, 0, 0); } -/* line 196, ../sass/default.scss */ +/* line 204, ../sass/default.scss */ slides.layout-widescreen > slide.past, slides.layout-faux-widescreen > slide.past { display: block; @@ -433,7 +441,7 @@ slides.layout-faux-widescreen > slide.past { -ms-transform: translate3d(-1130px, 0, 0); transform: translate3d(-1130px, 0, 0); } -/* line 202, ../sass/default.scss */ +/* line 210, ../sass/default.scss */ slides.layout-widescreen > slide.current, slides.layout-faux-widescreen > slide.current { display: block; @@ -448,7 +456,7 @@ slides.layout-faux-widescreen > slide.current { -ms-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } -/* line 208, ../sass/default.scss */ +/* line 216, ../sass/default.scss */ slides.layout-widescreen > slide.next, slides.layout-faux-widescreen > slide.next { display: block; @@ -463,7 +471,7 @@ slides.layout-faux-widescreen > slide.next { -ms-transform: translate3d(1130px, 0, 0); transform: translate3d(1130px, 0, 0); } -/* line 214, ../sass/default.scss */ +/* line 222, ../sass/default.scss */ slides.layout-widescreen > slide.far-next, slides.layout-faux-widescreen > slide.far-next { display: block; @@ -479,30 +487,30 @@ slides.layout-faux-widescreen > slide.far-next { transform: translate3d(2260px, 0, 0); } -/* line 221, ../sass/default.scss */ +/* line 229, ../sass/default.scss */ b { font-weight: 600; } -/* line 225, ../sass/default.scss */ +/* line 233, ../sass/default.scss */ a { color: #0066cc; } -/* line 228, ../sass/default.scss */ +/* line 236, ../sass/default.scss */ a:visited { color: rgba(0, 102, 204, 0.75); } -/* line 232, ../sass/default.scss */ +/* line 240, ../sass/default.scss */ a:hover { color: black; } -/* line 237, ../sass/default.scss */ +/* line 245, ../sass/default.scss */ h1, h2, h3 { font-weight: 600; } -/* line 241, ../sass/default.scss */ +/* line 249, ../sass/default.scss */ h2 { font-size: 45px; line-height: 45px; @@ -510,7 +518,7 @@ h2 { color: #515151; } -/* line 248, ../sass/default.scss */ +/* line 256, ../sass/default.scss */ h3 { font-size: 30px; letter-spacing: -1px; @@ -519,38 +527,38 @@ h3 { color: #797979; } -/* line 256, ../sass/default.scss */ +/* line 264, ../sass/default.scss */ ul { margin-left: 1.2em; margin-bottom: 1em; } -/* line 260, ../sass/default.scss */ +/* line 268, ../sass/default.scss */ ul li { margin-bottom: 0.5em; } -/* line 263, ../sass/default.scss */ +/* line 271, ../sass/default.scss */ ul li ul { margin-left: 2em; margin-bottom: 0; } -/* line 267, ../sass/default.scss */ +/* line 275, ../sass/default.scss */ ul li ul li:before { content: '-'; font-weight: 600; } -/* line 274, ../sass/default.scss */ +/* line 282, ../sass/default.scss */ ul > li:before { content: '·'; margin-left: -1em; position: absolute; font-weight: 600; } -/* line 282, ../sass/default.scss */ +/* line 290, ../sass/default.scss */ ul ul { margin-top: .5em; } -/* line 287, ../sass/default.scss */ +/* line 295, ../sass/default.scss */ pre { font-family: 'Inconsolata', 'Courier New', monospace; font-size: 20px; @@ -568,7 +576,7 @@ pre { box-sizing: border-box; /*overflow: hidden;*/ } -/* line 301, ../sass/default.scss */ +/* line 309, ../sass/default.scss */ pre:after { content: attr(data-lang); background-color: #a9a9a9; @@ -581,14 +589,14 @@ pre:after { text-transform: uppercase; } -/* line 314, ../sass/default.scss */ +/* line 322, ../sass/default.scss */ code { font-size: 95%; font-family: 'Inconsolata', 'Courier New', monospace; color: black; } -/* line 320, ../sass/default.scss */ +/* line 328, ../sass/default.scss */ iframe { width: 100%; height: 620px; @@ -597,17 +605,17 @@ iframe { margin: -1px; } -/* line 328, ../sass/default.scss */ +/* line 336, ../sass/default.scss */ dt { font-weight: bold; } -/* line 332, ../sass/default.scss */ +/* line 340, ../sass/default.scss */ h3 + iframe { height: 540px; } -/* line 336, ../sass/default.scss */ +/* line 344, ../sass/default.scss */ button { display: inline-block; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #f9f9f9), color-stop(70%, #e3e3e3)); @@ -636,12 +644,12 @@ button { font-size: 10pt; } -/* line 351, ../sass/default.scss */ +/* line 359, ../sass/default.scss */ button:hover { border-color: black; } -/* line 355, ../sass/default.scss */ +/* line 363, ../sass/default.scss */ button:active { background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #e3e3e3), color-stop(70%, #f9f9f9)); background: -webkit-linear-gradient(#e3e3e3 40%, #f9f9f9 70%); @@ -651,62 +659,62 @@ button:active { background: linear-gradient(#e3e3e3 40%, #f9f9f9 70%); } -/* line 359, ../sass/default.scss */ +/* line 367, ../sass/default.scss */ .blue { color: #0066cc; } -/* line 362, ../sass/default.scss */ +/* line 370, ../sass/default.scss */ .yellow { color: #ffd319; } -/* line 365, ../sass/default.scss */ +/* line 373, ../sass/default.scss */ .green { color: #008a35; } -/* line 368, ../sass/default.scss */ +/* line 376, ../sass/default.scss */ .red { color: red; } -/* line 371, ../sass/default.scss */ +/* line 379, ../sass/default.scss */ .black { color: black; } -/* line 374, ../sass/default.scss */ +/* line 382, ../sass/default.scss */ .white { color: white; } -/* line 377, ../sass/default.scss */ +/* line 385, ../sass/default.scss */ .dark { background-color: rgba(0, 0, 0, 0.2); color: white; } -/* line 382, ../sass/default.scss */ +/* line 390, ../sass/default.scss */ img.centered { margin: 0 auto; display: block; } -/* line 387, ../sass/default.scss */ +/* line 395, ../sass/default.scss */ table { width: 100%; border-collapse: collapse; margin-top: 40px; } -/* line 393, ../sass/default.scss */ +/* line 401, ../sass/default.scss */ th { font-weight: 600; text-align: left; } -/* line 399, ../sass/default.scss */ +/* line 407, ../sass/default.scss */ td, th { border: 1px solid #e0e0e0; @@ -714,7 +722,7 @@ th { vertical-align: top; } -/* line 405, ../sass/default.scss */ +/* line 413, ../sass/default.scss */ q { display: block; font-size: 60px; @@ -722,7 +730,7 @@ q { margin-left: 20px; margin-top: 100px; } -/* line 412, ../sass/default.scss */ +/* line 420, ../sass/default.scss */ q:before { content: '“'; position: absolute; @@ -733,7 +741,7 @@ q:before { font-size: 90px; color: silver; } -/* line 422, ../sass/default.scss */ +/* line 430, ../sass/default.scss */ q:after { content: '”'; position: absolute; @@ -742,19 +750,19 @@ q:after { color: silver; } -/* line 431, ../sass/default.scss */ +/* line 439, ../sass/default.scss */ div.author { text-align: right; font-size: 40px; margin-top: 20px; margin-right: 150px; } -/* line 438, ../sass/default.scss */ +/* line 446, ../sass/default.scss */ div.author:before { content: '—'; } -/* line 443, ../sass/default.scss */ +/* line 451, ../sass/default.scss */ slide.fill { -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -763,7 +771,7 @@ slide.fill { -khtml-border-radius: 5px; border-radius: 5px; } -/* line 446, ../sass/default.scss */ +/* line 454, ../sass/default.scss */ slide.fill h3 { background: rgba(255, 255, 255, 0.75); padding-top: .2em; @@ -774,7 +782,7 @@ slide.fill h3 { margin-right: -60px; padding-right: 60px; } -/* line 457, ../sass/default.scss */ +/* line 465, ../sass/default.scss */ slide.fill h4 { display: inline; position: absolute; @@ -783,91 +791,91 @@ slide.fill h4 { } /* Size variants */ -/* line 468, ../sass/default.scss */ +/* line 476, ../sass/default.scss */ article.smaller p, article.smaller ul { font-size: 20px; line-height: 24px; letter-spacing: 0; } -/* line 473, ../sass/default.scss */ +/* line 481, ../sass/default.scss */ article.smaller table { font-size: 20px; line-height: 24px; letter-spacing: 0; } -/* line 478, ../sass/default.scss */ +/* line 486, ../sass/default.scss */ article.smaller pre { font-size: 15px; line-height: 20px; letter-spacing: 0; } -/* line 483, ../sass/default.scss */ +/* line 491, ../sass/default.scss */ article.smaller q { font-size: 40px; line-height: 48px; } -/* line 487, ../sass/default.scss */ +/* line 495, ../sass/default.scss */ article.smaller q:before, article.smaller q:after { font-size: 60px; } /* Builds */ -/* line 496, ../sass/default.scss */ +/* line 504, ../sass/default.scss */ .build > * { -moz-transition: opacity 0.5s ease-in-out 0.2s; -webkit-transition: opacity 0.5s ease-in-out 0.2s; -o-transition: opacity 0.5s ease-in-out 0.2s; transition: opacity 0.5s ease-in-out 0.2s; } -/* line 500, ../sass/default.scss */ +/* line 508, ../sass/default.scss */ .build .to-build { opacity: 0; } -/* line 504, ../sass/default.scss */ +/* line 512, ../sass/default.scss */ .build .build-fade { - opacity: 0.5; + opacity: 0.3; } -/* line 507, ../sass/default.scss */ +/* line 515, ../sass/default.scss */ .build .build-fade:hover { opacity: 1.0; } /* Pretty print */ -/* line 516, ../sass/default.scss */ +/* line 524, ../sass/default.scss */ .prettyprint .str, .prettyprint .atv { /* a markup attribute value */ color: #009f5d; } -/* line 520, ../sass/default.scss */ +/* line 528, ../sass/default.scss */ .prettyprint .kwd, .prettyprint .tag { /* a markup tag name */ color: #0066cc; } -/* line 523, ../sass/default.scss */ +/* line 531, ../sass/default.scss */ .prettyprint .com { /* a comment */ color: #797979; font-style: italic; } -/* line 527, ../sass/default.scss */ +/* line 535, ../sass/default.scss */ .prettyprint .lit { /* a literal value */ color: #f6c000; } -/* line 532, ../sass/default.scss */ +/* line 540, ../sass/default.scss */ .prettyprint .pun, .prettyprint .opn, .prettyprint .clo { color: #515151; } -/* line 538, ../sass/default.scss */ +/* line 546, ../sass/default.scss */ .prettyprint .typ, .prettyprint .atn, .prettyprint .dec, @@ -876,18 +884,18 @@ article.smaller q:before, article.smaller q:after { color: #d94d3a; } -/* line 541, ../sass/default.scss */ +/* line 549, ../sass/default.scss */ .prettyprint .pln { color: #515151; } -/* line 545, ../sass/default.scss */ +/* line 553, ../sass/default.scss */ .with-notes .note { opacity: 1; pointer-events: auto; } -/* line 550, ../sass/default.scss */ +/* line 558, ../sass/default.scss */ .note { position: absolute; z-index: 100; @@ -926,7 +934,7 @@ article.smaller q:before, article.smaller q:after { -khtml-border-radius: 5px; border-radius: 5px; } -/* line 567, ../sass/default.scss */ +/* line 575, ../sass/default.scss */ .note > section { background: #fff; -moz-border-radius: 5px; @@ -943,17 +951,17 @@ article.smaller q:before, article.smaller q:after { padding: 2em; } -/* line 576, ../sass/default.scss */ +/* line 584, ../sass/default.scss */ input, button { vertical-align: middle; } -/* line 580, ../sass/default.scss */ +/* line 588, ../sass/default.scss */ .centered { text-align: center; } -/* line 584, ../sass/default.scss */ +/* line 592, ../sass/default.scss */ .reflect { -webkit-box-reflect: below 3px -webkit-linear-gradient(rgba(255, 255, 255, 0) 85%, white 150%); -moz-box-reflect: below 3px -moz-linear-gradient(rgba(255, 255, 255, 0) 85%, white 150%); @@ -962,7 +970,7 @@ input, button { box-reflect: below 3px linear-gradient(rgba(255, 255, 255, 0) 85%, #ffffff 150%); } -/* line 592, ../sass/default.scss */ +/* line 600, ../sass/default.scss */ .flexbox { display: -webkit-box !important; display: -moz-box !important; @@ -971,7 +979,7 @@ input, button { display: box !important; } -/* line 596, ../sass/default.scss */ +/* line 604, ../sass/default.scss */ .flexbox.vcenter { -moz-box-orient: vertical; -webkit-box-orient: vertical; @@ -989,7 +997,7 @@ input, button { width: 100%; } -/* line 602, ../sass/default.scss */ +/* line 610, ../sass/default.scss */ .flexbox.vleft { -moz-box-orient: vertical; -webkit-box-orient: vertical; @@ -1007,52 +1015,49 @@ input, button { width: 100%; } +/* line 616, ../sass/default.scss */ +.auto-fadein { + -moz-transition: opacity 0.6s ease-in 1s; + -webkit-transition: opacity 0.6s ease-in 1s; + -o-transition: opacity 0.6s ease-in 1s; + transition: opacity 0.6s ease-in 1s; + opacity: 0; +} + /* ===== SLIDE CONTENT ===== */ -/* line 610, ../sass/default.scss */ +/* line 623, ../sass/default.scss */ .logoslide img { width: 383px; height: 92px; } -/* line 617, ../sass/default.scss */ +/* line 630, ../sass/default.scss */ .segue h2 { color: #e6e6e6; font-size: 60px; } -/* line 621, ../sass/default.scss */ +/* line 634, ../sass/default.scss */ .segue h3 { color: #e6e6e6; line-height: 2.8; } -/* line 625, ../sass/default.scss */ -.segue hgroup { - opacity: 0; - -moz-transition: opacity 0.6s ease-in 1s; - -webkit-transition: opacity 0.6s ease-in 1s; - -o-transition: opacity 0.6s ease-in 1s; - transition: opacity 0.6s ease-in 1s; -} -/* line 629, ../sass/default.scss */ -.segue hgroup.on { - opacity: 1; -} -/* line 635, ../sass/default.scss */ +/* line 640, ../sass/default.scss */ .thank-you-slide { background: #4387fd; color: white; } -/* line 639, ../sass/default.scss */ +/* line 644, ../sass/default.scss */ .thank-you-slide h2 { font-size: 60px; color: inherit; } -/* line 644, ../sass/default.scss */ +/* line 649, ../sass/default.scss */ .thank-you-slide section > p { margin-top: 2em; font-size: 20pt; } -/* line 649, ../sass/default.scss */ +/* line 654, ../sass/default.scss */ .thank-you-slide > p { position: absolute; bottom: 80px; @@ -1060,7 +1065,7 @@ input, button { line-height: 1.3; } -/* line 657, ../sass/default.scss */ +/* line 662, ../sass/default.scss */ aside.gdbar { height: 97px; width: 155px; @@ -1083,18 +1088,14 @@ aside.gdbar { -webkit-background-size: 100% 100%; -o-background-size: 100% 100%; background-size: 100% 100%; - background-size: 100% 100%; + background-size: 0 100%; -moz-transition: all 0.5s ease-out 0.5s; -webkit-transition: all 0.5s ease-out 0.5s; -o-transition: all 0.5s ease-out 0.5s; transition: all 0.5s ease-out 0.5s; /* Better to transition only on background-size, but not sure how to do that with the mixin. */ } -/* line 669, ../sass/default.scss */ -aside.gdbar.to-build { - background-size: 0 100%; -} -/* line 673, ../sass/default.scss */ +/* line 674, ../sass/default.scss */ aside.gdbar.right { right: 0; left: -moz-initial; @@ -1107,7 +1108,7 @@ aside.gdbar.right { -ms-transform: rotateZ(180deg); transform: rotateZ(180deg); } -/* line 680, ../sass/default.scss */ +/* line 681, ../sass/default.scss */ aside.gdbar.right img { -moz-transform: rotateZ(180deg); -webkit-transform: rotateZ(180deg); @@ -1115,7 +1116,7 @@ aside.gdbar.right img { -ms-transform: rotateZ(180deg); transform: rotateZ(180deg); } -/* line 685, ../sass/default.scss */ +/* line 686, ../sass/default.scss */ aside.gdbar img { width: 85px; height: 85px; @@ -1124,37 +1125,37 @@ aside.gdbar img { margin: 8px 12px; } -/* line 696, ../sass/default.scss */ -#title-slide hgroup { +/* line 697, ../sass/default.scss */ +.title-slide hgroup { position: absolute; bottom: 150px; } -/* line 700, ../sass/default.scss */ -#title-slide hgroup h1 { +/* line 701, ../sass/default.scss */ +.title-slide hgroup h1 { font-size: 65px; line-height: 1.4; letter-spacing: -3px; color: #515151; } -/* line 707, ../sass/default.scss */ -#title-slide hgroup h2 { +/* line 708, ../sass/default.scss */ +.title-slide hgroup h2 { font-size: 34px; color: #a9a9a9; font-weight: inherit; } -/* line 713, ../sass/default.scss */ -#title-slide hgroup p { +/* line 714, ../sass/default.scss */ +.title-slide hgroup p { font-size: 20px; color: #797979; line-height: 1.3; margin-top: 2em; } -/* line 722, ../sass/default.scss */ -#title-slide, .thank-you-slide, .segue { +/* line 723, ../sass/default.scss */ +.thank-you-slide, .segue { padding: 60px 120px; } -/* line 725, ../sass/default.scss */ -#title-slide aside, .thank-you-slide aside, .segue aside { +/* line 726, ../sass/default.scss */ +.thank-you-slide aside, .segue aside { width: 215px; } diff --git a/theme/sass/default.scss b/theme/sass/default.scss index 647671e..73f6723 100644 --- a/theme/sass/default.scss +++ b/theme/sass/default.scss @@ -151,6 +151,14 @@ slides > slide { display: block; @include transform(translate(0)); @include transform(translate3d(0, 0, 0)); + + .auto-fadein { + opacity: 1; + } + + .gdbar { + background-size: 100% 100%; + } } &.next { @@ -502,7 +510,7 @@ article.smaller { } .build-fade { - opacity: 0.5; + opacity: 0.3; &:hover { opacity: 1.0; @@ -605,6 +613,11 @@ input, button { width: 100%; } +.auto-fadein { + @include transition(opacity 0.6s ease-in 1s); + opacity: 0; +} + /* ===== SLIDE CONTENT ===== */ .logoslide { img { @@ -622,14 +635,6 @@ input, button { color: $gray-1; line-height: 2.8; } - hgroup { - opacity: 0; - @include transition(opacity 0.6s ease-in 1s); - - &.on { - opacity: 1; - } - } } .thank-you-slide { @@ -663,13 +668,9 @@ aside.gdbar { @include border-radius(0 10px 10px 0); @include background(linear-gradient(left, $gray-1, $gray-1) no-repeat); @include background-size(100% 100%); - background-size: 100% 100%; + background-size: 0 100%; @include transition(all 0.5s ease-out 0.5s); /* Better to transition only on background-size, but not sure how to do that with the mixin. */ - &.to-build { - background-size: 0 100%; - } - &.right { right: 0; left: -moz-initial; @@ -691,7 +692,7 @@ aside.gdbar { } } -#title-slide { +.title-slide { hgroup { position: absolute; @@ -719,7 +720,7 @@ aside.gdbar { } } -#title-slide, .thank-you-slide, .segue { +.thank-you-slide, .segue { padding: $slide-left-right-padding $slide-left-right-padding * 2; aside { -- cgit v1.2.3