diff options
author | Eric Bidelman | 2012-07-11 10:43:37 -0700 |
---|---|---|
committer | Eric Bidelman | 2012-07-11 10:43:37 -0700 |
commit | f208307cbdd403d3fa92a1aae1dc9c094c7ec9d8 (patch) | |
tree | eb8ac9966f182313db6b11e12c2f4fd5bab070b7 /theme | |
parent | d78d1c5069ecdb6723a8933dbb86f4b7a20c59e9 (diff) | |
download | io-slides-remote-f208307cbdd403d3fa92a1aae1dc9c094c7ec9d8.tar.gz |
Bringing in upstream changes
Diffstat (limited to 'theme')
-rw-r--r-- | theme/.base.css.swp | bin | 45056 -> 0 bytes | |||
-rw-r--r-- | theme/.default.css.swp | bin | 45056 -> 0 bytes | |||
-rw-r--r-- | theme/css/default.css | 449 | ||||
-rw-r--r-- | theme/scss/_base.scss | 5 | ||||
-rw-r--r-- | theme/scss/default.scss | 150 |
5 files changed, 438 insertions, 166 deletions
diff --git a/theme/.base.css.swp b/theme/.base.css.swp deleted file mode 100644 index 563b356..0000000 --- a/theme/.base.css.swp +++ /dev/null | |||
Binary files differ | |||
diff --git a/theme/.default.css.swp b/theme/.default.css.swp deleted file mode 100644 index 1ae4a73..0000000 --- a/theme/.default.css.swp +++ /dev/null | |||
Binary files 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 { | |||
94 | } | 94 | } |
95 | /* line 69, ../scss/_base.scss */ | 95 | /* line 69, ../scss/_base.scss */ |
96 | body.loaded { | 96 | body.loaded { |
97 | opacity: 1; | 97 | opacity: 1 !important; |
98 | } | 98 | } |
99 | 99 | ||
100 | /* line 74, ../scss/_base.scss */ | 100 | /* line 74, ../scss/_base.scss */ |
@@ -123,9 +123,14 @@ slides { | |||
123 | perspective: 1000; | 123 | perspective: 1000; |
124 | -webkit-transform-style: preserve-3d; | 124 | -webkit-transform-style: preserve-3d; |
125 | transform-style: preserve-3d; | 125 | transform-style: preserve-3d; |
126 | -webkit-transition: opacity 800ms ease-in 100ms; | ||
127 | -moz-transition: opacity 800ms ease-in 100ms; | ||
128 | -ms-transition: opacity 800ms ease-in 100ms; | ||
129 | -o-transition: opacity 800ms ease-in 100ms; | ||
130 | transition: opacity 800ms ease-in 100ms; | ||
126 | } | 131 | } |
127 | 132 | ||
128 | /* line 93, ../scss/_base.scss */ | 133 | /* line 94, ../scss/_base.scss */ |
129 | slides > slide { | 134 | slides > slide { |
130 | display: block; | 135 | display: block; |
131 | position: absolute; | 136 | position: absolute; |
@@ -171,21 +176,21 @@ slide.fill img { | |||
171 | /** | 176 | /** |
172 | * Theme Styles | 177 | * Theme Styles |
173 | */ | 178 | */ |
174 | /* line 51, ../scss/default.scss */ | 179 | /* line 58, ../scss/default.scss */ |
175 | ::selection { | 180 | ::selection { |
176 | color: white; | 181 | color: white; |
177 | background-color: #ffd14d; | 182 | background-color: #ffd14d; |
178 | text-shadow: none; | 183 | text-shadow: none; |
179 | } | 184 | } |
180 | 185 | ||
181 | /* line 57, ../scss/default.scss */ | 186 | /* line 64, ../scss/default.scss */ |
182 | ::-webkit-scrollbar { | 187 | ::-webkit-scrollbar { |
183 | height: 16px; | 188 | height: 16px; |
184 | overflow: visible; | 189 | overflow: visible; |
185 | width: 16px; | 190 | width: 16px; |
186 | } | 191 | } |
187 | 192 | ||
188 | /* line 62, ../scss/default.scss */ | 193 | /* line 69, ../scss/default.scss */ |
189 | ::-webkit-scrollbar-thumb { | 194 | ::-webkit-scrollbar-thumb { |
190 | background-color: rgba(0, 0, 0, 0.1); | 195 | background-color: rgba(0, 0, 0, 0.1); |
191 | background-clip: padding-box; | 196 | background-clip: padding-box; |
@@ -198,35 +203,35 @@ slide.fill img { | |||
198 | border-width: 1px 1px 1px 6px; | 203 | border-width: 1px 1px 1px 6px; |
199 | } | 204 | } |
200 | 205 | ||
201 | /* line 71, ../scss/default.scss */ | 206 | /* line 78, ../scss/default.scss */ |
202 | ::-webkit-scrollbar-thumb:hover { | 207 | ::-webkit-scrollbar-thumb:hover { |
203 | background-color: rgba(0, 0, 0, 0.5); | 208 | background-color: rgba(0, 0, 0, 0.5); |
204 | } | 209 | } |
205 | 210 | ||
206 | /* line 74, ../scss/default.scss */ | 211 | /* line 81, ../scss/default.scss */ |
207 | ::-webkit-scrollbar-button { | 212 | ::-webkit-scrollbar-button { |
208 | height: 0; | 213 | height: 0; |
209 | width: 0; | 214 | width: 0; |
210 | } | 215 | } |
211 | 216 | ||
212 | /* line 78, ../scss/default.scss */ | 217 | /* line 85, ../scss/default.scss */ |
213 | ::-webkit-scrollbar-track { | 218 | ::-webkit-scrollbar-track { |
214 | background-clip: padding-box; | 219 | background-clip: padding-box; |
215 | border: solid transparent; | 220 | border: solid transparent; |
216 | border-width: 0 0 0 4px; | 221 | border-width: 0 0 0 4px; |
217 | } | 222 | } |
218 | 223 | ||
219 | /* line 83, ../scss/default.scss */ | 224 | /* line 90, ../scss/default.scss */ |
220 | ::-webkit-scrollbar-corner { | 225 | ::-webkit-scrollbar-corner { |
221 | background: transparent; | 226 | background: transparent; |
222 | } | 227 | } |
223 | 228 | ||
224 | /* line 87, ../scss/default.scss */ | 229 | /* line 94, ../scss/default.scss */ |
225 | body { | 230 | body { |
226 | background: black; | 231 | background: black; |
227 | } | 232 | } |
228 | 233 | ||
229 | /* line 91, ../scss/default.scss */ | 234 | /* line 98, ../scss/default.scss */ |
230 | slides > slide { | 235 | slides > slide { |
231 | display: none; | 236 | display: none; |
232 | font-family: 'Open Sans', Arial, sans-serif; | 237 | font-family: 'Open Sans', Arial, sans-serif; |
@@ -248,49 +253,49 @@ slides > slide { | |||
248 | -o-transition: all 0.6s ease-in-out; | 253 | -o-transition: all 0.6s ease-in-out; |
249 | transition: all 0.6s ease-in-out; | 254 | transition: all 0.6s ease-in-out; |
250 | } | 255 | } |
251 | /* line 112, ../scss/default.scss */ | 256 | /* line 119, ../scss/default.scss */ |
252 | slides > slide.far-past { | 257 | slides > slide.far-past { |
253 | display: none; | 258 | display: none; |
254 | } | 259 | } |
255 | /* line 119, ../scss/default.scss */ | 260 | /* line 126, ../scss/default.scss */ |
256 | slides > slide.past { | 261 | slides > slide.past { |
257 | display: block; | 262 | display: block; |
258 | opacity: 0; | 263 | opacity: 0; |
259 | } | 264 | } |
260 | /* line 126, ../scss/default.scss */ | 265 | /* line 133, ../scss/default.scss */ |
261 | slides > slide.current { | 266 | slides > slide.current { |
262 | display: block; | 267 | display: block; |
263 | opacity: 1; | 268 | opacity: 1; |
264 | } | 269 | } |
265 | /* line 132, ../scss/default.scss */ | 270 | /* line 139, ../scss/default.scss */ |
266 | slides > slide.current .auto-fadein { | 271 | slides > slide.current .auto-fadein { |
267 | opacity: 1; | 272 | opacity: 1; |
268 | } | 273 | } |
269 | /* line 136, ../scss/default.scss */ | 274 | /* line 143, ../scss/default.scss */ |
270 | slides > slide.current .gdbar { | 275 | slides > slide.current .gdbar { |
271 | -webkit-background-size: 100% 100%; | 276 | -webkit-background-size: 100% 100%; |
272 | -moz-background-size: 100% 100%; | 277 | -moz-background-size: 100% 100%; |
273 | -o-background-size: 100% 100%; | 278 | -o-background-size: 100% 100%; |
274 | background-size: 100% 100%; | 279 | background-size: 100% 100%; |
275 | } | 280 | } |
276 | /* line 141, ../scss/default.scss */ | 281 | /* line 148, ../scss/default.scss */ |
277 | slides > slide.next { | 282 | slides > slide.next { |
278 | display: block; | 283 | display: block; |
279 | opacity: 0; | 284 | opacity: 0; |
280 | pointer-events: none; | 285 | pointer-events: none; |
281 | } | 286 | } |
282 | /* line 149, ../scss/default.scss */ | 287 | /* line 156, ../scss/default.scss */ |
283 | slides > slide.far-next { | 288 | slides > slide.far-next { |
284 | display: none; | 289 | display: none; |
285 | } | 290 | } |
286 | /* line 156, ../scss/default.scss */ | 291 | /* line 163, ../scss/default.scss */ |
287 | slides > slide.dark { | 292 | slides > slide.dark { |
288 | background: #515151 !important; | 293 | background: #515151 !important; |
289 | } | 294 | } |
290 | /* line 164, ../scss/default.scss */ | 295 | /* line 171, ../scss/default.scss */ |
291 | slides > slide:not(.nobackground):before { | 296 | slides > slide:not(.nobackground):before { |
292 | font-size: 12pt; | 297 | font-size: 12pt; |
293 | content: "#io2012"; | 298 | content: "#io12"; |
294 | position: absolute; | 299 | position: absolute; |
295 | bottom: 20px; | 300 | bottom: 20px; |
296 | left: 60px; | 301 | left: 60px; |
@@ -303,7 +308,7 @@ slides > slide:not(.nobackground):before { | |||
303 | height: 30px; | 308 | height: 30px; |
304 | line-height: 1.9; | 309 | line-height: 1.9; |
305 | } | 310 | } |
306 | /* line 176, ../scss/default.scss */ | 311 | /* line 183, ../scss/default.scss */ |
307 | slides > slide:not(.nobackground):after { | 312 | slides > slide:not(.nobackground):after { |
308 | font-size: 12pt; | 313 | font-size: 12pt; |
309 | content: attr(data-slide-num) "/" attr(data-total-slides); | 314 | content: attr(data-slide-num) "/" attr(data-total-slides); |
@@ -312,7 +317,7 @@ slides > slide:not(.nobackground):after { | |||
312 | right: 60px; | 317 | right: 60px; |
313 | line-height: 1.9; | 318 | line-height: 1.9; |
314 | } | 319 | } |
315 | /* line 187, ../scss/default.scss */ | 320 | /* line 194, ../scss/default.scss */ |
316 | slides > slide.title-slide:after { | 321 | slides > slide.title-slide:after { |
317 | content: ''; | 322 | content: ''; |
318 | background: url(../../images/io2012_logo.png) no-repeat 100% 50%; | 323 | background: url(../../images/io2012_logo.png) no-repeat 100% 50%; |
@@ -326,7 +331,7 @@ slides > slide.title-slide:after { | |||
326 | width: 100%; | 331 | width: 100%; |
327 | height: 60px; | 332 | height: 60px; |
328 | } | 333 | } |
329 | /* line 199, ../scss/default.scss */ | 334 | /* line 206, ../scss/default.scss */ |
330 | slides > slide.backdrop { | 335 | slides > slide.backdrop { |
331 | z-index: -10; | 336 | z-index: -10; |
332 | display: block !important; | 337 | display: block !important; |
@@ -338,43 +343,43 @@ slides > slide.backdrop { | |||
338 | background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); | 343 | background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); |
339 | background-color: white; | 344 | background-color: white; |
340 | } | 345 | } |
341 | /* line 205, ../scss/default.scss */ |