From f208307cbdd403d3fa92a1aae1dc9c094c7ec9d8 Mon Sep 17 00:00:00 2001 From: Eric Bidelman Date: Wed, 11 Jul 2012 10:43:37 -0700 Subject: Bringing in upstream changes --- theme/.base.css.swp | Bin 45056 -> 0 bytes theme/.default.css.swp | Bin 45056 -> 0 bytes theme/css/default.css | 449 +++++++++++++++++++++++++++++++----------------- theme/scss/_base.scss | 5 +- theme/scss/default.scss | 150 +++++++++++++++- 5 files changed, 438 insertions(+), 166 deletions(-) delete mode 100644 theme/.base.css.swp delete mode 100644 theme/.default.css.swp (limited to 'theme') diff --git a/theme/.base.css.swp b/theme/.base.css.swp deleted file mode 100644 index 563b356..0000000 Binary files a/theme/.base.css.swp and /dev/null differ diff --git a/theme/.default.css.swp b/theme/.default.css.swp deleted file mode 100644 index 1ae4a73..0000000 Binary files a/theme/.default.css.swp and /dev/null differ diff --git a/theme/css/default.css b/theme/css/default.css index 7cfbdb1..1d7ed72 100644 --- a/theme/css/default.css +++ b/theme/css/default.css @@ -94,7 +94,7 @@ body { } /* line 69, ../scss/_base.scss */ body.loaded { - opacity: 1; + opacity: 1 !important; } /* line 74, ../scss/_base.scss */ @@ -123,9 +123,14 @@ slides { perspective: 1000; -webkit-transform-style: preserve-3d; transform-style: preserve-3d; + -webkit-transition: opacity 800ms ease-in 100ms; + -moz-transition: opacity 800ms ease-in 100ms; + -ms-transition: opacity 800ms ease-in 100ms; + -o-transition: opacity 800ms ease-in 100ms; + transition: opacity 800ms ease-in 100ms; } -/* line 93, ../scss/_base.scss */ +/* line 94, ../scss/_base.scss */ slides > slide { display: block; position: absolute; @@ -171,21 +176,21 @@ slide.fill img { /** * Theme Styles */ -/* line 51, ../scss/default.scss */ +/* line 58, ../scss/default.scss */ ::selection { color: white; background-color: #ffd14d; text-shadow: none; } -/* line 57, ../scss/default.scss */ +/* line 64, ../scss/default.scss */ ::-webkit-scrollbar { height: 16px; overflow: visible; width: 16px; } -/* line 62, ../scss/default.scss */ +/* line 69, ../scss/default.scss */ ::-webkit-scrollbar-thumb { background-color: rgba(0, 0, 0, 0.1); background-clip: padding-box; @@ -198,35 +203,35 @@ slide.fill img { border-width: 1px 1px 1px 6px; } -/* line 71, ../scss/default.scss */ +/* line 78, ../scss/default.scss */ ::-webkit-scrollbar-thumb:hover { background-color: rgba(0, 0, 0, 0.5); } -/* line 74, ../scss/default.scss */ +/* line 81, ../scss/default.scss */ ::-webkit-scrollbar-button { height: 0; width: 0; } -/* line 78, ../scss/default.scss */ +/* line 85, ../scss/default.scss */ ::-webkit-scrollbar-track { background-clip: padding-box; border: solid transparent; border-width: 0 0 0 4px; } -/* line 83, ../scss/default.scss */ +/* line 90, ../scss/default.scss */ ::-webkit-scrollbar-corner { background: transparent; } -/* line 87, ../scss/default.scss */ +/* line 94, ../scss/default.scss */ body { background: black; } -/* line 91, ../scss/default.scss */ +/* line 98, ../scss/default.scss */ slides > slide { display: none; font-family: 'Open Sans', Arial, sans-serif; @@ -248,49 +253,49 @@ slides > slide { -o-transition: all 0.6s ease-in-out; transition: all 0.6s ease-in-out; } -/* line 112, ../scss/default.scss */ +/* line 119, ../scss/default.scss */ slides > slide.far-past { display: none; } -/* line 119, ../scss/default.scss */ +/* line 126, ../scss/default.scss */ slides > slide.past { display: block; opacity: 0; } -/* line 126, ../scss/default.scss */ +/* line 133, ../scss/default.scss */ slides > slide.current { display: block; opacity: 1; } -/* line 132, ../scss/default.scss */ +/* line 139, ../scss/default.scss */ slides > slide.current .auto-fadein { opacity: 1; } -/* line 136, ../scss/default.scss */ +/* line 143, ../scss/default.scss */ slides > slide.current .gdbar { -webkit-background-size: 100% 100%; -moz-background-size: 100% 100%; -o-background-size: 100% 100%; background-size: 100% 100%; } -/* line 141, ../scss/default.scss */ +/* line 148, ../scss/default.scss */ slides > slide.next { display: block; opacity: 0; pointer-events: none; } -/* line 149, ../scss/default.scss */ +/* line 156, ../scss/default.scss */ slides > slide.far-next { display: none; } -/* line 156, ../scss/default.scss */ +/* line 163, ../scss/default.scss */ slides > slide.dark { background: #515151 !important; } -/* line 164, ../scss/default.scss */ +/* line 171, ../scss/default.scss */ slides > slide:not(.nobackground):before { font-size: 12pt; - content: "#io2012"; + content: "#io12"; position: absolute; bottom: 20px; left: 60px; @@ -303,7 +308,7 @@ slides > slide:not(.nobackground):before { height: 30px; line-height: 1.9; } -/* line 176, ../scss/default.scss */ +/* line 183, ../scss/default.scss */ slides > slide:not(.nobackground):after { font-size: 12pt; content: attr(data-slide-num) "/" attr(data-total-slides); @@ -312,7 +317,7 @@ slides > slide:not(.nobackground):after { right: 60px; line-height: 1.9; } -/* line 187, ../scss/default.scss */ +/* line 194, ../scss/default.scss */ slides > slide.title-slide:after { content: ''; background: url(../../images/io2012_logo.png) no-repeat 100% 50%; @@ -326,7 +331,7 @@ slides > slide.title-slide:after { width: 100%; height: 60px; } -/* line 199, ../scss/default.scss */ +/* line 206, ../scss/default.scss */ slides > slide.backdrop { z-index: -10; display: block !important; @@ -338,43 +343,43 @@ slides > slide.backdrop { background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); background-color: white; } -/* line 205, ../scss/default.scss */ +/* line 211, ../scss/default.scss */ slides > slide.backdrop:after, slides > slide.backdrop:before { display: none; } -/* line 210, ../scss/default.scss */ +/* line 216, ../scss/default.scss */ slides > slide > hgroup + article { margin-top: 45px; } -/* line 214, ../scss/default.scss */ +/* line 220, ../scss/default.scss */ slides > slide > hgroup + article.flexbox.vcenter, slides > slide > hgroup + article.flexbox.vleft, slides > slide > hgroup + article.flexbox.vright { height: 80%; } -/* line 219, ../scss/default.scss */ +/* line 225, ../scss/default.scss */ slides > slide > hgroup + article p { margin-bottom: 1em; } -/* line 224, ../scss/default.scss */ +/* line 230, ../scss/default.scss */ slides > slide > article:only-child { height: 100%; } -/* line 227, ../scss/default.scss */ +/* line 233, ../scss/default.scss */ slides > slide > article:only-child > iframe { - height: 100%; + height: 98%; } -/* line 233, ../scss/default.scss */ +/* line 239, ../scss/default.scss */ slides.layout-faux-widescreen > slide { padding: 40px 160px; } -/* line 242, ../scss/default.scss */ +/* line 248, ../scss/default.scss */ slides.layout-widescreen > slide, slides.layout-faux-widescreen > slide { margin-left: -550px; width: 1100px; } -/* line 247, ../scss/default.scss */ +/* line 253, ../scss/default.scss */ slides.layout-widescreen > slide.far-past, slides.layout-faux-widescreen > slide.far-past { display: block; @@ -390,26 +395,26 @@ slides.layout-faux-widescreen > slide.far-past { -o-transform: translate3d(-2260px, 0, 0); transform: translate3d(-2260px, 0, 0); } -/* line 254, ../scss/default.scss */ +/* line 260, ../scss/default.scss */ slides.layout-widescreen > slide.past, slides.layout-faux-widescreen > slide.past { display: block; opacity: 0; } -/* line 261, ../scss/default.scss */ +/* line 267, ../scss/default.scss */ slides.layout-widescreen > slide.current, slides.layout-faux-widescreen > slide.current { display: block; opacity: 1; } -/* line 268, ../scss/default.scss */ +/* line 274, ../scss/default.scss */ slides.layout-widescreen > slide.next, slides.layout-faux-widescreen > slide.next { display: block; opacity: 0; pointer-events: none; } -/* line 276, ../scss/default.scss */ +/* line 282, ../scss/default.scss */ slides.layout-widescreen > slide.far-next, slides.layout-faux-widescreen > slide.far-next { display: block; @@ -425,39 +430,39 @@ slides.layout-faux-widescreen > slide.far-next { -o-transform: translate3d(2260px, 0, 0); transform: translate3d(2260px, 0, 0); } -/* line 283, ../scss/default.scss */ +/* line 289, ../scss/default.scss */ slides.layout-widescreen #prev-slide-area, slides.layout-faux-widescreen #prev-slide-area { margin-left: -650px; } -/* line 287, ../scss/default.scss */ +/* line 293, ../scss/default.scss */ slides.layout-widescreen #next-slide-area, slides.layout-faux-widescreen #next-slide-area { margin-left: 550px; } -/* line 292, ../scss/default.scss */ +/* line 298, ../scss/default.scss */ b { font-weight: 600; } -/* line 296, ../scss/default.scss */ +/* line 302, ../scss/default.scss */ a { color: #2a7cdf; text-decoration: none; border-bottom: 1px solid rgba(42, 124, 223, 0.5); } -/* line 301, ../scss/default.scss */ +/* line 307, ../scss/default.scss */ a:hover { color: black !important; } -/* line 306, ../scss/default.scss */ +/* line 312, ../scss/default.scss */ h1, h2, h3 { font-weight: 600; } -/* line 310, ../scss/default.scss */ +/* line 316, ../scss/default.scss */ h2 { font-size: 45px; line-height: 45px; @@ -465,7 +470,7 @@ h2 { color: #515151; } -/* line 317, ../scss/default.scss */ +/* line 323, ../scss/default.scss */ h3 { font-size: 30px; letter-spacing: -1px; @@ -474,39 +479,39 @@ h3 { color: #797979; } -/* line 325, ../scss/default.scss */ +/* line 331, ../scss/default.scss */ ul { margin-left: 1.2em; margin-bottom: 1em; position: relative; } -/* line 330, ../scss/default.scss */ +/* line 336, ../scss/default.scss */ ul li { margin-bottom: 0.5em; } -/* line 333, ../scss/default.scss */ +/* line 339, ../scss/default.scss */ ul li ul { margin-left: 2em; margin-bottom: 0; } -/* line 337, ../scss/default.scss */ +/* line 343, ../scss/default.scss */ ul li ul li:before { content: '-'; font-weight: 600; } -/* line 344, ../scss/default.scss */ +/* line 350, ../scss/default.scss */ ul > li:before { content: '·'; margin-left: -1em; position: absolute; font-weight: 600; } -/* line 351, ../scss/default.scss */ +/* line 357, ../scss/default.scss */ ul ul { margin-top: .5em; } -/* line 358, ../scss/default.scss */ +/* line 364, ../scss/default.scss */ .highlight-code slide.current pre > * { opacity: 0.25; -webkit-transition: opacity 0.5s ease-in; @@ -515,12 +520,12 @@ ul ul { -o-transition: opacity 0.5s ease-in; transition: opacity 0.5s ease-in; } -/* line 362, ../scss/default.scss */ +/* line 368, ../scss/default.scss */ .highlight-code slide.current b { opacity: 1; } -/* line 367, ../scss/default.scss */ +/* line 373, ../scss/default.scss */ pre { font-family: 'Inconsolata', 'Courier New', monospace; font-size: 20px; @@ -537,8 +542,8 @@ pre { box-sizing: border-box; /*overflow: hidden;*/ } -/* line 381, ../scss/default.scss */ -pre:after { +/* line 387, ../scss/default.scss */ +pre[data-lang]:after { content: attr(data-lang); background-color: #a9a9a9; right: 0; @@ -550,14 +555,19 @@ pre:after { text-transform: uppercase; } -/* line 394, ../scss/default.scss */ +/* line 400, ../scss/default.scss */ +pre[data-lang="go"] { + color: #333; +} + +/* line 404, ../scss/default.scss */ code { font-size: 95%; font-family: 'Inconsolata', 'Courier New', monospace; color: black; } -/* line 400, ../scss/default.scss */ +/* line 410, ../scss/default.scss */ iframe { width: 100%; height: 530px; @@ -568,12 +578,12 @@ iframe { box-sizing: border-box; } -/* line 408, ../scss/default.scss */ +/* line 418, ../scss/default.scss */ dt { font-weight: bold; } -/* line 412, ../scss/default.scss */ +/* line 422, ../scss/default.scss */ button { display: inline-block; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #f9f9f9), color-stop(70%, #e3e3e3)); @@ -599,12 +609,12 @@ button { font-size: 10pt; } -/* line 426, ../scss/default.scss */ +/* line 436, ../scss/default.scss */ button:not(:disabled):hover { border-color: #515151; } -/* line 430, ../scss/default.scss */ +/* line 440, ../scss/default.scss */ button:not(:disabled):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%); @@ -614,102 +624,102 @@ button:not(:disabled):active { background: linear-gradient(#e3e3e3 40%, #f9f9f9 70%); } -/* line 434, ../scss/default.scss */ +/* line 444, ../scss/default.scss */ :disabled { color: #a9a9a9; } -/* line 438, ../scss/default.scss */ +/* line 448, ../scss/default.scss */ .blue { color: #4387fd; } -/* line 441, ../scss/default.scss */ +/* line 451, ../scss/default.scss */ .blue2 { color: #3c8ef3; } -/* line 444, ../scss/default.scss */ +/* line 454, ../scss/default.scss */ .blue3 { color: #2a7cdf; } -/* line 447, ../scss/default.scss */ +/* line 457, ../scss/default.scss */ .yellow { color: #ffd14d; } -/* line 450, ../scss/default.scss */ +/* line 460, ../scss/default.scss */ .yellow2 { color: #f9cc46; } -/* line 453, ../scss/default.scss */ +/* line 463, ../scss/default.scss */ .yellow3 { color: #f6c000; } -/* line 456, ../scss/default.scss */ +/* line 466, ../scss/default.scss */ .green { color: #0da861; } -/* line 459, ../scss/default.scss */ +/* line 469, ../scss/default.scss */ .green2 { color: #00a86d; } -/* line 462, ../scss/default.scss */ +/* line 472, ../scss/default.scss */ .green3 { color: #009f5d; } -/* line 465, ../scss/default.scss */ +/* line 475, ../scss/default.scss */ .red { color: #f44a3f; } -/* line 468, ../scss/default.scss */ +/* line 478, ../scss/default.scss */ .red2 { color: #e0543e; } -/* line 471, ../scss/default.scss */ +/* line 481, ../scss/default.scss */ .red3 { color: #d94d3a; } -/* line 474, ../scss/default.scss */ +/* line 484, ../scss/default.scss */ .gray { color: #e6e6e6; } -/* line 477, ../scss/default.scss */ +/* line 487, ../scss/default.scss */ .gray2 { color: #a9a9a9; } -/* line 480, ../scss/default.scss */ +/* line 490, ../scss/default.scss */ .gray3 { color: #797979; } -/* line 483, ../scss/default.scss */ +/* line 493, ../scss/default.scss */ .gray4 { color: #515151; } -/* line 487, ../scss/default.scss */ +/* line 497, ../scss/default.scss */ .white { color: white !important; } -/* line 490, ../scss/default.scss */ +/* line 500, ../scss/default.scss */ .black { color: black !important; } -/* line 494, ../scss/default.scss */ +/* line 504, ../scss/default.scss */ .columns-2 { -webkit-column-count: 2; -moz-column-count: 2; @@ -717,7 +727,7 @@ button:not(:disabled):active { column-count: 2; } -/* line 498, ../scss/default.scss */ +/* line 508, ../scss/default.scss */ table { width: 100%; border-collapse: -moz-initial; @@ -725,16 +735,16 @@ table { border-spacing: 2px; border-bottom: 1px solid #797979; } -/* line 505, ../scss/default.scss */ +/* line 515, ../scss/default.scss */ table tr > td:first-child, table th { font-weight: 600; color: #515151; } -/* line 510, ../scss/default.scss */ +/* line 520, ../scss/default.scss */ table tr:nth-child(odd) { background-color: #e6e6e6; } -/* line 514, ../scss/default.scss */ +/* line 524, ../scss/default.scss */ table th { color: white; font-size: 18px; @@ -745,12 +755,12 @@ table th { background: -ms-linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat; background: linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat; } -/* line 520, ../scss/default.scss */ +/* line 530, ../scss/default.scss */ table td, table th { font-size: 18px; padding: 1em 0.5em; } -/* line 525, ../scss/default.scss */ +/* line 535, ../scss/default.scss */ table td.highlight { color: #515151; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #ffd14d), color-stop(80%, #f6c000)) no-repeat; @@ -760,31 +770,31 @@ table td.highlight { background: -ms-linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat; background: linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat; } -/* line 530, ../scss/default.scss */ +/* line 540, ../scss/default.scss */ table.rows { border-bottom: none; border-right: 1px solid #797979; } -/* line 536, ../scss/default.scss */ +/* line 546, ../scss/default.scss */ q { font-size: 45px; line-height: 72px; } -/* line 540, ../scss/default.scss */ +/* line 550, ../scss/default.scss */ q:before { content: '“'; position: absolute; margin-left: -0.5em; } -/* line 545, ../scss/default.scss */ +/* line 555, ../scss/default.scss */ q:after { content: '”'; position: absolute; margin-left: 0.1em; } -/* line 552, ../scss/default.scss */ +/* line 562, ../scss/default.scss */ slide.fill { background-repeat: no-repeat; -webkit-border-radius: 5px; @@ -799,34 +809,34 @@ slide.fill { } /* Size variants */ -/* line 561, ../scss/default.scss */ +/* line 571, ../scss/default.scss */ article.smaller p, article.smaller ul { font-size: 20px; line-height: 24px; letter-spacing: 0; } -/* line 567, ../scss/default.scss */ +/* line 577, ../scss/default.scss */ article.smaller table td, article.smaller table th { font-size: 14px; } -/* line 571, ../scss/default.scss */ +/* line 581, ../scss/default.scss */ article.smaller pre { font-size: 15px; line-height: 20px; letter-spacing: 0; } -/* line 576, ../scss/default.scss */ +/* line 586, ../scss/default.scss */ article.smaller q { font-size: 40px; line-height: 48px; } -/* line 580, ../scss/default.scss */ +/* line 590, ../scss/default.scss */ article.smaller q:before, article.smaller q:after { font-size: 60px; } /* Builds */ -/* line 589, ../scss/default.scss */ +/* line 599, ../scss/default.scss */ .build > * { -webkit-transition: opacity 0.5s ease-in-out 0.2s; -moz-transition: opacity 0.5s ease-in-out 0.2s; @@ -834,55 +844,64 @@ article.smaller q:before, article.smaller q:after { -o-transition: opacity 0.5s ease-in-out 0.2s; transition: opacity 0.5s ease-in-out 0.2s; } -/* line 593, ../scss/default.scss */ +/* line 603, ../scss/default.scss */ .build .to-build { opacity: 0; } -/* line 597, ../scss/default.scss */ +/* line 607, ../scss/default.scss */ .build .build-fade { opacity: 0.3; } -/* line 600, ../scss/default.scss */ +/* line 610, ../scss/default.scss */ .build .build-fade:hover { opacity: 1.0; } +/* line 617, ../scss/default.scss */ +.popup .next .build .to-build { + opacity: 1; +} +/* line 621, ../scss/default.scss */ +.popup .next .build .build-fade { + opacity: 1; +} + /* Pretty print */ -/* line 609, ../scss/default.scss */ +/* line 629, ../scss/default.scss */ .prettyprint .str, .prettyprint .atv { /* a markup attribute value */ color: #009f5d; } -/* line 613, ../scss/default.scss */ +/* line 633, ../scss/default.scss */ .prettyprint .kwd, .prettyprint .tag { /* a markup tag name */ color: #0066cc; } -/* line 616, ../scss/default.scss */ +/* line 636, ../scss/default.scss */ .prettyprint .com { /* a comment */ color: #797979; font-style: italic; } -/* line 620, ../scss/default.scss */ +/* line 640, ../scss/default.scss */ .prettyprint .lit { /* a literal value */ color: #7f0000; } -/* line 625, ../scss/default.scss */ +/* line 645, ../scss/default.scss */ .prettyprint .pun, .prettyprint .opn, .prettyprint .clo { color: #515151; } -/* line 631, ../scss/default.scss */ +/* line 651, ../scss/default.scss */ .prettyprint .typ, .prettyprint .atn, .prettyprint .dec, @@ -891,12 +910,12 @@ article.smaller q:before, article.smaller q:after { color: #d94d3a; } -/* line 634, ../scss/default.scss */ +/* line 654, ../scss/default.scss */ .prettyprint .pln { color: #515151; } -/* line 638, ../scss/default.scss */ +/* line 658, ../scss/default.scss */ .note { position: absolute; z-index: 100; @@ -944,7 +963,7 @@ article.smaller q:before, article.smaller q:after { -o-transition: all 0.4s ease-in-out; transition: all 0.4s ease-in-out; } -/* line 656, ../scss/default.scss */ +/* line 676, ../scss/default.scss */ .note > section { background: #fff; -webkit-border-radius: 5px; @@ -959,7 +978,7 @@ article.smaller q:before, article.smaller q:after { padding: 2em; } -/* line 673, ../scss/default.scss */ +/* line 693, ../scss/default.scss */ .with-notes.popup slides.layout-widescreen slide.next, .with-notes.popup slides.layout-faux-widescreen slide.next { -webkit-transform: translate3d(690px, 80px, 0) scale(0.35); @@ -968,7 +987,7 @@ article.smaller q:before, article.smaller q:after { -o-transform: translate3d(690px, 80px, 0) scale(0.35); transform: translate3d(690px, 80px, 0) scale(0.35); } -/* line 676, ../scss/default.scss */ +/* line 696, ../scss/default.scss */ .with-notes.popup slides.layout-widescreen slide .note, .with-notes.popup slides.layout-faux-widescreen slide .note { -webkit-transform: translate3d(300px, 800px, 0) scale(1.5); @@ -977,7 +996,7 @@ article.smaller q:before, article.smaller q:after { -o-transform: translate3d(300px, 800px, 0) scale(1.5); transform: translate3d(300px, 800px, 0) scale(1.5); } -/* line 682, ../scss/default.scss */ +/* line 702, ../scss/default.scss */ .with-notes.popup slide { overflow: visible; background: white; @@ -993,7 +1012,7 @@ article.smaller q:before, article.smaller q:after { -o-transform-origin: 0 0; transform-origin: 0 0; } -/* line 689, ../scss/default.scss */ +/* line 709, ../scss/default.scss */ .with-notes.popup slide:not(.backdrop) { -webkit-transform: scale(0.6) translate3d(0.5em, 0.5em, 0); -moz-transform: scale(0.6) translate3d(0.5em, 0.5em, 0); @@ -1004,7 +1023,7 @@ article.smaller q:before, article.smaller q:after { -moz-box-shadow: 0 0 10px #797979; box-shadow: 0 0 10px #797979; } -/* line 694, ../scss/default.scss */ +/* line 714, ../scss/default.scss */ .with-notes.popup slide.backdrop { background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 600, color-stop(0%, #b1dfff), color-stop(100%, #4387fd)); background-image: -webkit-radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px); @@ -1013,7 +1032,7 @@ article.smaller q:before, article.smaller q:after { background-image: -ms-radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px); background-image: radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px); } -/* line 700, ../scss/default.scss */ +/* line 720, ../scss/default.scss */ .with-notes.popup slide.next { -webkit-transform: translate3d(570px, 80px, 0) scale(0.35); -moz-transform: translate3d(570px, 80px, 0) scale(0.35); @@ -1022,11 +1041,11 @@ article.smaller q:before, article.smaller q:after { transform: translate3d(570px, 80px, 0) scale(0.35); opacity: 1 !important; } -/* line 704, ../scss/default.scss */ +/* line 724, ../scss/default.scss */ .with-notes.popup slide.next .note { display: none !important; } -/* line 710, ../scss/default.scss */ +/* line 730, ../scss/default.scss */ .with-notes.popup .note { width: 109%; height: 260px; @@ -1046,7 +1065,7 @@ article.smaller q:before, article.smaller q:after { -o-transition: opacity 400ms ease-in-out; transition: opacity 400ms ease-in-out; } -/* line 721, ../scss/default.scss */ +/* line 741, ../scss/default.scss */ .with-notes.popup .note > section { background: #fff; -webkit-border-radius: 5px; @@ -1065,7 +1084,7 @@ article.smaller q:before, article.smaller q:after { overflow: auto; padding: 1em; } -/* line 734, ../scss/default.scss */ +/* line 754, ../scss/default.scss */ .with-notes .note { opacity: 1; -webkit-transform: translateY(0); @@ -1076,7 +1095,7 @@ article.smaller q:before, article.smaller q:after { pointer-events: auto; } -/* line 741, ../scss/default.scss */ +/* line 761, ../scss/default.scss */ .source { font-size: 14px; color: #a9a9a9; @@ -1085,12 +1104,12 @@ article.smaller q:before, article.smaller q:after { left: 60px; } -/* line 749, ../scss/default.scss */ +/* line 769, ../scss/default.scss */ .centered { text-align: center; } -/* line 753, ../scss/default.scss */ +/* line 773, ../scss/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%); @@ -1099,7 +1118,7 @@ article.smaller q:before, article.smaller q:after { box-reflect: below 3px linear-gradient(rgba(255, 255, 255, 0) 85%, #ffffff 150%); } -/* line 761, ../scss/default.scss */ +/* line 781, ../scss/default.scss */ .flexbox { display: -webkit-box !important; display: -moz-box !important; @@ -1108,7 +1127,7 @@ article.smaller q:before, article.smaller q:after { display: box !important; } -/* line 765, ../scss/default.scss */ +/* line 785, ../scss/default.scss */ .flexbox.vcenter { -webkit-box-orient: vertical; -moz-box-orient: vertical; @@ -1126,7 +1145,7 @@ article.smaller q:before, article.smaller q:after { width: 100%; } -/* line 771, ../scss/default.scss */ +/* line 791, ../scss/default.scss */ .flexbox.vleft { -webkit-box-orient: vertical; -moz-box-orient: vertical; @@ -1144,7 +1163,7 @@ article.smaller q:before, article.smaller q:after { width: 100%; } -/* line 777, ../scss/default.scss */ +/* line 797, ../scss/default.scss */ .flexbox.vright { -webkit-box-orient: vertical; -moz-box-orient: vertical; @@ -1162,7 +1181,7 @@ article.smaller q:before, article.smaller q:after { width: 100%; } -/* line 783, ../scss/default.scss */ +/* line 803, ../scss/default.scss */ .auto-fadein { -webkit-transition: opacity 0.6s ease-in 1s; -moz-transition: opacity 0.6s ease-in 1s; @@ -1173,7 +1192,7 @@ article.smaller q:before, article.smaller q:after { } /* Clickable/tappable areas */ -/* line 789, ../scss/default.scss */ +/* line 809, ../scss/default.scss */ .slide-area { z-index: 1000; position: absolute; @@ -1187,59 +1206,59 @@ article.smaller q:before, article.smaller q:after { margin-top: -350px; } -/* line 806, ../scss/default.scss */ +/* line 826, ../scss/default.scss */ #prev-slide-area { margin-left: -550px; } -/* line 811, ../scss/default.scss */ +/* line 831, ../scss/default.scss */ #next-slide-area { margin-left: 450px; } /* ===== SLIDE CONTENT ===== */ -/* line 819, ../scss/default.scss */ +/* line 839, ../scss/default.scss */ .logoslide img { width: 383px; height: 92px; } -/* line 825, ../scss/default.scss */ +/* line 845, ../scss/default.scss */ .segue { padding: 60px 120px; } -/* line 828, ../scss/default.scss */ +/* line 848, ../scss/default.scss */ .segue h2 { color: #e6e6e6; font-size: 60px; } -/* line 832, ../scss/default.scss */ +/* line 852, ../scss/default.scss */ .segue h3 { color: #e6e6e6; line-height: 2.8; } -/* line 836, ../scss/default.scss */ +/* line 856, ../scss/default.scss */ .segue hgroup { position: absolute; bottom: 225px; } -/* line 842, ../scss/default.scss */ +/* line 862, ../scss/default.scss */ .thank-you-slide { background: #4387fd !important; color: white; } -/* line 846, ../scss/default.scss */ +/* line 866, ../scss/default.scss */ .thank-you-slide h2 { font-size: 60px; color: inherit; } -/* line 851, ../scss/default.scss */ +/* line 871, ../scss/default.scss */ .thank-you-slide article > p { margin-top: 2em; font-size: 20pt; } -/* line 856, ../scss/default.scss */ +/* line 876, ../scss/default.scss */ .thank-you-slide > p { position: absolute; bottom: 80px; @@ -1247,12 +1266,12 @@ article.smaller q:before, article.smaller q:after { line-height: 1.3; } -/* line 864, ../scss/default.scss */ +/* line 884, ../scss/default.scss */ aside.gdbar { height: 97px; width: 215px; position: absolute; - left: 0; + left: -1px; top: 125px; -webkit-border-radius: 0 10px 10px 0; -moz-border-radius: 0 10px 10px 0; @@ -1276,7 +1295,7 @@ aside.gdbar { 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 875, ../scss/default.scss */ +/* line 895, ../scss/default.scss */ aside.gdbar.right { right: 0; left: -moz-initial; @@ -1289,7 +1308,7 @@ aside.gdbar.right { -o-transform: rotateZ(180deg); transform: rotateZ(180deg); } -/* line 882, ../scss/default.scss */ +/* line 902, ../scss/default.scss */ aside.gdbar.right img { -webkit-transform: rotateZ(180deg); -moz-transform: rotateZ(180deg); @@ -1297,13 +1316,13 @@ aside.gdbar.right img { -o-transform: rotateZ(180deg); transform: rotateZ(180deg); } -/* line 887, ../scss/default.scss */ +/* line 907, ../scss/default.scss */ aside.gdbar.bottom { top: -moz-initial; top: initial; bottom: 60px; } -/* line 893, ../scss/default.scss */ +/* line 913, ../scss/default.scss */ aside.gdbar img { width: 85px; height: 85px; @@ -1312,24 +1331,24 @@ aside.gdbar img { margin: 8px 15px; } -/* line 904, ../scss/default.scss */ +/* line 924, ../scss/default.scss */ .title-slide hgroup { bottom: 100px; } -/* line 907, ../scss/default.scss */ +/* line 927, ../scss/default.scss */ .title-slide hgroup h1 { font-size: 65px; line-height: 1.4; letter-spacing: -3px; color: #515151; } -/* line 914, ../scss/default.scss */ +/* line 934, ../scss/default.scss */ .title-slide hgroup h2 { font-size: 34px; color: #a9a9a9; font-weight: inherit; } -/* line 920, ../scss/default.scss */ +/* line 940, ../scss/default.scss */ .title-slide hgroup p { font-size: 20px; color: #797979; @@ -1337,11 +1356,11 @@ aside.gdbar img { margin-top: 2em; } -/* line 929, ../scss/default.scss */ +/* line 949, ../scss/default.scss */ .quote { color: #e6e6e6; } -/* line 932, ../scss/default.scss */ +/* line 952, ../scss/default.scss */ .quote .author { font-size: 24px; position: absolute; @@ -1349,13 +1368,131 @@ aside.gdbar img { line-height: 1.4; } -/* line 941, ../scss/default.scss */ +/* line 961, ../scss/default.scss */ [data-config-contact] a { color: white; border-bottom: none; } -/* line 945, ../scss/default.scss */ +/* line 965, ../scss/default.scss */ [data-config-contact] span { width: 115px; display: inline-block; } + +/* line 974, ../scss/default.scss */ +.overview.popup .note { + display: none !important; +} +/* line 980, ../scss/default.scss */ +.overview slides slide { + display: block; + cursor: pointer; + opacity: 0.5; + pointer-events: auto !important; + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(85%, #ffffff), color-stop(100%, #e6e6e6)); + background: -webkit-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: -moz-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: -o-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: -ms-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background-color: white; +} +/* line 981, ../scss/default.scss */ +.overview slides slide.backdrop { + display: none !important; +} +/* line 996, ../scss/default.scss */ +.overview slides slide.far-past, .overview slides slide.past, .overview slides slide.next, .overview slides slide.far-next, .overview slides slide.far-past { + opacity: 0.5; + display: block; +} +/* line 1001, ../scss/default.scss */ +.overview slides slide.current { + opacity: 1; +} +/* line 1007, ../scss/default.scss */ +.overview .slide-area { + display: none; +} + +@media print { + /* line 1014, ../scss/default.scss */ + slides slide { + display: block !important; + position: relative; + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(85%, #ffffff), color-stop(100%, #e6e6e6)); + background: -webkit-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: -moz-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: -o-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: -ms-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); + background-color: white; + -webkit-transform: none !important; + -moz-transform: none !important; + -ms-transform: none !important; + -o-transform: none !important; + transform: none !important; + width: 100%; + height: 100%; + page-break-after: always; + top: auto !important; + left: auto !important; + margin-top: 0 !important; + margin-left: 0 !important; + opacity: 1 !important; + color: #555; + } + /* line 1034, ../scss/default.scss */ + slides slide.far-past, slides slide.past, slides slide.next, slides slide.far-next, slides slide.far-past, slides slide.current { + opacity: 1 !important; + display: block !important; + } + /* line 1040, ../scss/default.scss */ + slides slide .build > * { + -webkit-transition: none; + -moz-transition: none; + -ms-transition: none; + -o-transition: none; + transition: none; + } + /* line 1045, ../scss/default.scss */ + slides slide .build .to-build, + slides slide .build .build-fade { + opacity: 1; + } + /* line 1050, ../scss/default.scss */ + slides slide .auto-fadein { + opacity: 1 !important; + } + /* line 1054, ../scss/default.scss */ + slides slide.backdrop { + display: none !important; + } + /* line 1058, ../scss/default.scss */ + slides slide table.rows { + border-right: 0; + } + /* line 1063, ../scss/default.scss */ + slides slide[hidden] { + display: none !important; + } + + /* line 1068, ../scss/default.scss */ + .slide-area { + display: none; + } + + /* line 1072, ../scss/default.scss */ + .reflect { + -webkit-box-reflect: none; + -moz-box-reflect: none; + -o-box-reflect: none; + -ms-box-reflect: none; + box-reflect: none; + } + + /* line 1080, ../scss/default.scss */ + pre, code { + font-family: monospace !important; + } +} diff --git a/theme/scss/_base.scss b/theme/scss/_base.scss index ce9ee06..ec99dd4 100644 --- a/theme/scss/_base.scss +++ b/theme/scss/_base.scss @@ -67,7 +67,7 @@ body { @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank. &.loaded { - opacity: 1; + opacity: 1 !important; } } @@ -88,6 +88,7 @@ slides { @include transform(translate3d(0, 0, 0)); @include perspective(1000); @include transform-style(preserve-3d); + @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank. } slides > slide { @@ -131,4 +132,4 @@ slide.fill img { z-index: -1; } -*/ \ No newline at end of file +*/ diff --git a/theme/scss/default.scss b/theme/scss/default.scss index df96778..de42a11 100644 --- a/theme/scss/default.scss +++ b/theme/scss/default.scss @@ -2,7 +2,7 @@ @import "compass/css3/columns"; @import "compass/css3/user-interface"; -$social-tags: '#io2012'; +$social-tags: '#io12'; $brand-small-icon-size: 30px; $gray-1: #e6e6e6; @@ -45,6 +45,13 @@ $article-content-top-padding: 45px; tap-highlight-color: $color; } +@mixin backdrop { + @include background(linear-gradient(white, white 85%, $gray-1)); + background-color: white; +} + + + /** * Theme Styles */ @@ -199,11 +206,10 @@ slides > slide { &.backdrop { z-index: -10; display: block !important; - @include background(linear-gradient(white, white 85%, $gray-1)); - background-color: white; + @include backdrop; &:after, &:before { - display: none; + display: none; // Prevent double set of slide nums and footer icons. } } @@ -225,7 +231,7 @@ slides > slide { height: 100%; > iframe { - height: 100%; + height: 98%; } } } @@ -378,7 +384,7 @@ pre { @include box-sizing(border-box); /*overflow: hidden;*/ - &:after { + &[data-lang]:after { content: attr(data-lang); background-color: $gray-2; right: 0; @@ -391,6 +397,10 @@ pre { } } +pre[data-lang="go"] { + color: #333; +} + code { font-size: 95%; font-family: 'Inconsolata', 'Courier New', monospace; @@ -603,6 +613,16 @@ article.smaller { } } +.popup .next .build { + .to-build { + opacity: 1; + } + + .build-fade { + opacity: 1; + } +} + /* Pretty print */ .prettyprint .str, /* string content */ @@ -865,7 +885,7 @@ aside.gdbar { height: 97px; width: 215px; position: absolute; - left: 0; + left: -1px; top: 125px; @include border-radius(0 10px 10px 0); @include background(linear-gradient(left, $gray-1, $gray-1) no-repeat); @@ -946,4 +966,118 @@ aside.gdbar { width: 115px; display: inline-block; } -} \ No newline at end of file +} + +.overview { + + &.popup { + .note { + display: none !important; + } + } + + slides { + slide { + &.backdrop { + display: none !important; + } + + display: block; + cursor: pointer; + opacity: 0.5; + pointer-events: auto !important; + + @include backdrop(); + + &.far-past, + &.past, + &.next, + &.far-next, + &.far-past { + opacity: 0.5; + display: block; + } + + &.current { + opacity: 1; + } + } + } + + .slide-area { + display: none; + } +} + +@media print { + slides { + slide { + display: block !important; + position: relative; + @include backdrop(); + @include transform(none !important); + width: 100%; + height: 100%; + page-break-after:always; + top: auto !important; + left: auto !important; + margin-top: 0 !important; + margin-left: 0 !important; + opacity: 1 !important; + color: #555; + + &.far-past, + &.past, + &.next, + &.far-next, + &.far-past, + &.current { + opacity: 1 !important; + display: block !important; + } + + .build { + > * { + @include transition(none); + } + + .to-build, + .build-fade { + opacity: 1; + } + } + + .auto-fadein { + opacity: 1 !important; + } + + &.backdrop { + display: none !important; + } + + table.rows { + border-right: 0; + } + } + + slide[hidden] { + display: none !important; + } + } + + .slide-area { + display: none; + } + + .reflect { + -webkit-box-reflect: none; + -moz-box-reflect: none; + -o-box-reflect: none; + -ms-box-reflect: none; + box-reflect: none; + } + + pre, code { + font-family: monospace !important; + } +} -- cgit v1.2.3