aboutsummaryrefslogtreecommitdiff
path: root/theme/scss
diff options
context:
space:
mode:
authorEric Bidelman2012-07-11 10:43:37 -0700
committerEric Bidelman2012-07-11 10:43:37 -0700
commitf208307cbdd403d3fa92a1aae1dc9c094c7ec9d8 (patch)
treeeb8ac9966f182313db6b11e12c2f4fd5bab070b7 /theme/scss
parentd78d1c5069ecdb6723a8933dbb86f4b7a20c59e9 (diff)
downloadio-slides-remote-f208307cbdd403d3fa92a1aae1dc9c094c7ec9d8.tar.gz
Bringing in upstream changes
Diffstat (limited to 'theme/scss')
-rw-r--r--theme/scss/_base.scss5
-rw-r--r--theme/scss/default.scss150
2 files changed, 145 insertions, 10 deletions
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 {
67 @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank. 67 @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank.
68 68
69 &.loaded { 69 &.loaded {
70 opacity: 1; 70 opacity: 1 !important;
71 } 71 }
72} 72}
73 73
@@ -88,6 +88,7 @@ slides {
88 @include transform(translate3d(0, 0, 0)); 88 @include transform(translate3d(0, 0, 0));
89 @include perspective(1000); 89 @include perspective(1000);
90 @include transform-style(preserve-3d); 90 @include transform-style(preserve-3d);
91 @include transition(opacity 800ms ease-in 100ms); // Add small delay to prevent jank.
91} 92}
92 93
93slides > slide { 94slides > slide {
@@ -131,4 +132,4 @@ slide.fill img {
131 132
132 z-index: -1; 133 z-index: -1;
133} 134}
134*/ \ No newline at end of file 135*/
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 @@
2@import "compass/css3/columns"; 2@import "compass/css3/columns";
3@import "compass/css3/user-interface"; 3@import "compass/css3/user-interface";
4 4
5$social-tags: '#io2012'; 5$social-tags: '#io12';
6$brand-small-icon-size: 30px; 6$brand-small-icon-size: 30px;
7 7
8$gray-1: #e6e6e6; 8$gray-1: #e6e6e6;
@@ -45,6 +45,13 @@ $article-content-top-padding: 45px;
45 tap-highlight-color: $color; 45 tap-highlight-color: $color;
46} 46}
47 47
48@mixin backdrop {
49 @include background(linear-gradient(white, white 85%, $gray-1));
50 background-color: white;
51}
52
53
54
48/** 55/**
49 * Theme Styles 56 * Theme Styles
50 */ 57 */
@@ -199,11 +206,10 @@ slides > slide {
199 &.backdrop { 206 &.backdrop {
200 z-index: -10; 207 z-index: -10;
201 display: block !important; 208 display: block !important;
202 @include background(linear-gradient(white, white 85%, $gray-1)); 209 @include backdrop;
203 background-color: white;
204 210
205 &:after, &:before { 211 &:after, &:before {
206 display: none; 212 display: none; // Prevent double set of slide nums and footer icons.
207 } 213 }
208 } 214 }
209 215
@@ -225,7 +231,7 @@ slides > slide {
225 height: 100%; 231 height: 100%;
226 232
227 > iframe { 233 > iframe {
228 height: 100%; 234 height: 98%;
229 } 235 }
230 } 236 }
231} 237}
@@ -378,7 +384,7 @@ pre {
378 @include box-sizing(border-box); 384 @include box-sizing(border-box);
379 /*overflow: hidden;*/ 385 /*overflow: hidden;*/
380 386
381 &:after { 387 &[data-lang]:after {
382 content: attr(data-lang); 388 content: attr(data-lang);
383 background-color: $gray-2; 389 background-color: $gray-2;
384 right: 0; 390 right: 0;
@@ -391,6 +397,10 @@ pre {
391 } 397 }
392} 398}
393 399
400pre[data-lang="go"] {
401 color: #333;
402}
403
394code { 404code {
395 font-size: 95%; 405 font-size: 95%;
396 font-family: 'Inconsolata', 'Courier New', monospace; 406 font-family: 'Inconsolata', 'Courier New', monospace;
@@ -603,6 +613,16 @@ article.smaller {
603 } 613 }
604} 614}
605 615
616.popup .next .build {
617 .to-build {
618 opacity: 1;
619 }
620
621 .build-fade {
622 opacity: 1;
623 }
624}
625
606/* Pretty print */ 626/* Pretty print */
607 627
608.prettyprint .str, /* string content */ 628.prettyprint .str, /* string content */
@@ -865,7 +885,7 @@ aside.gdbar {
865 height: 97px; 885 height: 97px;
866 width: 215px; 886 width: 215px;
867 position: absolute; 887 position: absolute;
868 left: 0; 888 left: -1px;
869 top: 125px; 889 top: 125px;
870 @include border-radius(0 10px 10px 0); 890 @include border-radius(0 10px 10px 0);
871 @include background(linear-gradient(left, $gray-1, $gray-1) no-repeat); 891 @include background(linear-gradient(left, $gray-1, $gray-1) no-repeat);
@@ -946,4 +966,118 @@ aside.gdbar {
946 width: 115px; 966 width: 115px;
947 display: inline-block; 967 display: inline-block;
948 } 968 }
949} \ No newline at end of file 969}
970
971.overview {
972
973 &.popup {
974 .note {
975 display: none !important;
976 }
977 }
978
979 slides {
980 slide {
981 &.backdrop {
982 display: none !important;
983 }
984
985 display: block;
986 cursor: pointer;
987 opacity: 0.5;
988 pointer-events: auto !important;
989
990 @include backdrop();
991
992 &.far-past,
993 &.past,
994 &.next,
995 &.far-next,
996 &.far-past {
997 opacity: 0.5;
998 display: block;
999 }
1000
1001 &.current {
1002 opacity: 1;
1003 }
1004 }
1005 }
1006
1007 .slide-area {
1008 display: none;
1009 }
1010}
1011
1012@media print {
1013 slides {
1014 slide {
1015 display: block !important;
1016 position: relative;
1017 @include backdrop();
1018 @include transform(none !important);
1019 width: 100%;
1020 height: 100%;
1021 page-break-after:always;
1022 top: auto !important;
1023 left: auto !important;
1024 margin-top: 0 !important;
1025 margin-left: 0 !important;
1026 opacity: 1 !important;
1027 color: #555;
1028
1029 &.far-past,
1030 &.past,
1031 &.next,
1032 &.far-next,
1033 &.far-past,
1034 &.current {
1035 opacity: 1 !important;
1036 display: block !important;
1037 }
1038
1039 .build {
1040 > * {
1041 @include transition(none);
1042 }
1043
1044 .to-build,
1045 .build-fade {
1046 opacity: 1;
1047 }
1048 }
1049
1050 .auto-fadein {
1051 opacity: 1 !important;
1052 }
1053
1054 &.backdrop {
1055 display: none !important;
1056 }
1057
1058 table.rows {
1059 border-right: 0;
1060 }
1061 }
1062
1063 slide[hidden] {
1064 display: none !important;
1065 }