Skip to content
This repository was archived by the owner on Sep 23, 2021. It is now read-only.

Commit ce0bc91

Browse files
authored
Merge pull request #20 from msoedov/updatae_deps
Update deps
2 parents f0c292f + ce7c662 commit ce0bc91

File tree

23 files changed

+645
-204
lines changed

23 files changed

+645
-204
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ bin/
2424
src/
2525
slides/
2626
main
27+
node_modules

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
GIT_SUMMARY := $(shell git describe --tags --dirty --always)
12
REPO=msoedov/hacker-slides
23

34
default: repo
45

56
repo:
6-
@echo $(REPO)
7+
@echo $(REPO):$(GIT_SUMMARY)
78

89
build:
910
@GOOS=linux CGO_ENABLE=0 go build main.go
10-
@docker build -t $(REPO) .
11+
@docker build -t $(REPO):$(GIT_SUMMARY) .
1112

1213
push:
13-
@docker push $(REPO)
14+
@docker push $(REPO):$(GIT_SUMMARY)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": {
3-
"reveal.js": "^3.4.1"
3+
"reveal.js": "^3.5.0"
44
}
55
}

static/reveal.js/Gruntfile.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = function(grunt) {
1515
' * http://lab.hakim.se/reveal-js\n' +
1616
' * MIT licensed\n' +
1717
' *\n' +
18-
' * Copyright (C) 2016 Hakim El Hattab, http://hakim.se\n' +
18+
' * Copyright (C) 2017 Hakim El Hattab, http://hakim.se\n' +
1919
' */'
2020
},
2121

@@ -44,7 +44,7 @@ module.exports = function(grunt) {
4444
{
4545
expand: true,
4646
cwd: 'css/theme/source',
47-
src: ['*.scss'],
47+
src: ['*.sass', '*.scss'],
4848
dest: 'css/theme',
4949
ext: '.css'
5050
}
@@ -122,7 +122,12 @@ module.exports = function(grunt) {
122122
tasks: 'js'
123123
},
124124
theme: {
125-
files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
125+
files: [
126+
'css/theme/source/*.sass',
127+
'css/theme/source/*.scss',
128+
'css/theme/template/*.sass',
129+
'css/theme/template/*.scss'
130+
],
126131
tasks: 'css-themes'
127132
},
128133
css: {

static/reveal.js/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2016 Hakim El Hattab, http://hakim.se, and reveal.js contributors
1+
Copyright (C) 2017 Hakim El Hattab, http://hakim.se, and reveal.js contributors
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

static/reveal.js/README.md

Lines changed: 91 additions & 34 deletions
Large diffs are not rendered by default.

static/reveal.js/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reveal.js",
3-
"version": "3.4.1",
3+
"version": "3.5.0",
44
"main": [
55
"js/reveal.js",
66
"css/reveal.css"

static/reveal.js/css/print/pdf.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ ul, ol, div, p {
8787
position: relative;
8888
overflow: hidden;
8989
z-index: 1;
90+
91+
page-break-after: always;
9092
}
9193

9294
.reveal .slides section {
93-
page-break-after: always !important;
94-
9595
visibility: visible !important;
9696
display: block !important;
97-
position: relative !important;
97+
position: absolute !important;
9898

9999
margin: 0 !important;
100100
padding: 0 !important;
@@ -115,6 +115,7 @@ ul, ol, div, p {
115115
}
116116

117117
.reveal section.stack {
118+
position: relative !important;
118119
margin: 0 !important;
119120
padding: 0 !important;
120121
page-break-after: avoid !important;

static/reveal.js/css/reveal.css

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://lab.hakim.se/reveal-js
44
* MIT licensed
55
*
6-
* Copyright (C) 2016 Hakim El Hattab, http://hakim.se
6+
* Copyright (C) 2017 Hakim El Hattab, http://hakim.se
77
*/
88
/*********************************************
99
* RESET STYLES
@@ -323,6 +323,7 @@ body {
323323
bottom: 0;
324324
left: 0;
325325
margin: auto;
326+
pointer-events: none;
326327
overflow: visible;
327328
z-index: 1;
328329
text-align: center;
@@ -340,6 +341,7 @@ body {
340341
position: absolute;
341342
width: 100%;
342343
padding: 20px 0px;
344+
pointer-events: auto;
343345
z-index: 10;
344346
-webkit-transform-style: flat;
345347
transform-style: flat;
@@ -374,6 +376,12 @@ body {
374376
z-index: 11;
375377
opacity: 1; }
376378

379+
.reveal .slides > section:empty,
380+
.reveal .slides > section > section:empty,
381+
.reveal .slides > section[data-background-interactive],
382+
.reveal .slides > section > section[data-background-interactive] {
383+
pointer-events: none; }
384+
377385
.reveal.center,
378386
.reveal.center .slides,
379387
.reveal.center .slides section {
@@ -589,6 +597,10 @@ body {
589597

590598
/*********************************************
591599
* CUBE TRANSITION
600+
*
601+
* WARNING:
602+
* this is deprecated and will be removed in a
603+
* future version.
592604
*********************************************/
593605
.reveal.cube .slides {
594606
-webkit-perspective: 1300px;
@@ -664,6 +676,10 @@ body {
664676

665677
/*********************************************
666678
* PAGE TRANSITION
679+
*
680+
* WARNING:
681+
* this is deprecated and will be removed in a
682+
* future version.
667683
*********************************************/
668684
.reveal.page .slides {
669685
-webkit-perspective-origin: 0% 50%;
@@ -839,6 +855,7 @@ body {
839855
height: 100%;
840856
opacity: 0;
841857
visibility: hidden;
858+
overflow: hidden;
842859
background-color: transparent;
843860
background-position: 50% 50%;
844861
background-repeat: no-repeat;
@@ -851,7 +868,8 @@ body {
851868

852869
.reveal .slide-background.present {
853870
opacity: 1;
854-
visibility: visible; }
871+
visibility: visible;
872+
z-index: 2; }
855873

856874
.print-pdf .reveal .slide-background {
857875
opacity: 1 !important;
@@ -865,7 +883,13 @@ body {
865883
max-width: none;
866884
max-height: none;
867885
top: 0;
868-
left: 0; }
886+
left: 0;
887+
-o-object-fit: cover;
888+
object-fit: cover; }
889+
890+
.reveal .slide-background[data-background-size="contain"] video {
891+
-o-object-fit: contain;
892+
object-fit: contain; }
869893

870894
/* Immediate transition style */
871895
.reveal[data-background-transition=none] > .backgrounds .slide-background,
@@ -1037,6 +1061,8 @@ body {
10371061
visibility: visible;
10381062
outline: 10px solid rgba(150, 150, 150, 0.1);
10391063
outline-offset: 10px; }
1064+
.reveal.overview .backgrounds .slide-background.stack {
1065+
overflow: visible; }
10401066

10411067
.reveal.overview .slides section,
10421068
.reveal.overview-deactivating .slides section {
@@ -1048,10 +1074,6 @@ body {
10481074
-webkit-transition: none;
10491075
transition: none; }
10501076

1051-
.reveal.overview-animated .slides {
1052-
-webkit-transition: -webkit-transform 0.4s ease;
1053-
transition: transform 0.4s ease; }
1054-
10551077
/*********************************************
10561078
* RTL SUPPORT
10571079
*********************************************/

static/reveal.js/css/reveal.scss

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://lab.hakim.se/reveal-js
44
* MIT licensed
55
*
6-
* Copyright (C) 2016 Hakim El Hattab, http://hakim.se
6+
* Copyright (C) 2017 Hakim El Hattab, http://hakim.se
77
*/
88

99

@@ -388,6 +388,7 @@ body {
388388
bottom: 0;
389389
left: 0;
390390
margin: auto;
391+
pointer-events: none;
391392

392393
overflow: visible;
393394
z-index: 1;
@@ -406,6 +407,7 @@ body {
406407
position: absolute;
407408
width: 100%;
408409
padding: 20px 0px;
410+
pointer-events: auto;
409411

410412
z-index: 10;
411413
transform-style: flat;
@@ -443,6 +445,13 @@ body {
443445
opacity: 1;
444446
}
445447

448+
.reveal .slides>section:empty,
449+
.reveal .slides>section>section:empty,
450+
.reveal .slides>section[data-background-interactive],
451+
.reveal .slides>section>section[data-background-interactive] {
452+
pointer-events: none;
453+
}
454+
446455
.reveal.center,
447456
.reveal.center .slides,
448457
.reveal.center .slides section {
@@ -610,6 +619,10 @@ body {
610619

611620
/*********************************************
612621
* CUBE TRANSITION
622+
*
623+
* WARNING:
624+
* this is deprecated and will be removed in a
625+
* future version.
613626
*********************************************/
614627

615628
.reveal.cube .slides {
@@ -682,6 +695,10 @@ body {
682695

683696
/*********************************************
684697
* PAGE TRANSITION
698+
*
699+
* WARNING:
700+
* this is deprecated and will be removed in a
701+
* future version.
685702
*********************************************/
686703

687704
.reveal.page .slides {
@@ -866,6 +883,7 @@ body {
866883
height: 100%;
867884
opacity: 0;
868885
visibility: hidden;
886+
overflow: hidden;
869887

870888
background-color: rgba( 0, 0, 0, 0 );
871889
background-position: 50% 50%;
@@ -882,6 +900,7 @@ body {
882900
.reveal .slide-background.present {
883901
opacity: 1;
884902
visibility: visible;
903+
z-index: 2;
885904
}
886905

887906
.print-pdf .reveal .slide-background {
@@ -898,7 +917,11 @@ body {
898917
max-height: none;
899918
top: 0;
900919
left: 0;
920+
object-fit: cover;
901921
}
922+
.reveal .slide-background[data-background-size="contain"] video {
923+
object-fit: contain;
924+
}
902925

903926
/* Immediate transition style */
904927
.reveal[data-background-transition=none]>.backgrounds .slide-background,
@@ -1080,6 +1103,10 @@ body {
10801103
outline: 10px solid rgba(150,150,150,0.1);
10811104
outline-offset: 10px;
10821105
}
1106+
1107+
.backgrounds .slide-background.stack {
1108+
overflow: visible;
1109+
}
10831110
}
10841111

10851112
// Disable transitions transitions while we're activating
@@ -1094,10 +1121,6 @@ body {
10941121
transition: none;
10951122
}
10961123

1097-
.reveal.overview-animated .slides {
1098-
transition: transform 0.4s ease;
1099-
}
1100-
11011124

11021125
/*********************************************
11031126
* RTL SUPPORT

0 commit comments

Comments
 (0)