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

Update deps #20

Merged
merged 3 commits into from
Nov 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ bin/
src/
slides/
main
node_modules
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
GIT_SUMMARY := $(shell git describe --tags --dirty --always)
REPO=msoedov/hacker-slides

default: repo

repo:
@echo $(REPO)
@echo $(REPO):$(GIT_SUMMARY)

build:
@GOOS=linux CGO_ENABLE=0 go build main.go
@docker build -t $(REPO) .
@docker build -t $(REPO):$(GIT_SUMMARY) .

push:
@docker push $(REPO)
@docker push $(REPO):$(GIT_SUMMARY)
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"reveal.js": "^3.4.1"
"reveal.js": "^3.5.0"
}
}
11 changes: 8 additions & 3 deletions static/reveal.js/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(grunt) {
' * http://lab.hakim.se/reveal-js\n' +
' * MIT licensed\n' +
' *\n' +
' * Copyright (C) 2016 Hakim El Hattab, http://hakim.se\n' +
' * Copyright (C) 2017 Hakim El Hattab, http://hakim.se\n' +
' */'
},

Expand Down Expand Up @@ -44,7 +44,7 @@ module.exports = function(grunt) {
{
expand: true,
cwd: 'css/theme/source',
src: ['*.scss'],
src: ['*.sass', '*.scss'],
dest: 'css/theme',
ext: '.css'
}
Expand Down Expand Up @@ -122,7 +122,12 @@ module.exports = function(grunt) {
tasks: 'js'
},
theme: {
files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
files: [
'css/theme/source/*.sass',
'css/theme/source/*.scss',
'css/theme/template/*.sass',
'css/theme/template/*.scss'
],
tasks: 'css-themes'
},
css: {
Expand Down
2 changes: 1 addition & 1 deletion static/reveal.js/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2016 Hakim El Hattab, http://hakim.se, and reveal.js contributors
Copyright (C) 2017 Hakim El Hattab, http://hakim.se, and reveal.js contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
125 changes: 91 additions & 34 deletions static/reveal.js/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/reveal.js/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reveal.js",
"version": "3.4.1",
"version": "3.5.0",
"main": [
"js/reveal.js",
"css/reveal.css"
Expand Down
7 changes: 4 additions & 3 deletions static/reveal.js/css/print/pdf.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ ul, ol, div, p {
position: relative;
overflow: hidden;
z-index: 1;

page-break-after: always;
}

.reveal .slides section {
page-break-after: always !important;

visibility: visible !important;
display: block !important;
position: relative !important;
position: absolute !important;

margin: 0 !important;
padding: 0 !important;
Expand All @@ -115,6 +115,7 @@ ul, ol, div, p {
}

.reveal section.stack {
position: relative !important;
margin: 0 !important;
padding: 0 !important;
page-break-after: avoid !important;
Expand Down
36 changes: 29 additions & 7 deletions static/reveal.js/css/reveal.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* http://lab.hakim.se/reveal-js
* MIT licensed
*
* Copyright (C) 2016 Hakim El Hattab, http://hakim.se
* Copyright (C) 2017 Hakim El Hattab, http://hakim.se
*/
/*********************************************
* RESET STYLES
Expand Down Expand Up @@ -323,6 +323,7 @@ body {
bottom: 0;
left: 0;
margin: auto;
pointer-events: none;
overflow: visible;
z-index: 1;
text-align: center;
Expand All @@ -340,6 +341,7 @@ body {
position: absolute;
width: 100%;
padding: 20px 0px;
pointer-events: auto;
z-index: 10;
-webkit-transform-style: flat;
transform-style: flat;
Expand Down Expand Up @@ -374,6 +376,12 @@ body {
z-index: 11;
opacity: 1; }

.reveal .slides > section:empty,
.reveal .slides > section > section:empty,
.reveal .slides > section[data-background-interactive],
.reveal .slides > section > section[data-background-interactive] {
pointer-events: none; }

.reveal.center,
.reveal.center .slides,
.reveal.center .slides section {
Expand Down Expand Up @@ -589,6 +597,10 @@ body {

/*********************************************
* CUBE TRANSITION
*
* WARNING:
* this is deprecated and will be removed in a
* future version.
*********************************************/
.reveal.cube .slides {
-webkit-perspective: 1300px;
Expand Down Expand Up @@ -664,6 +676,10 @@ body {

/*********************************************
* PAGE TRANSITION
*
* WARNING:
* this is deprecated and will be removed in a
* future version.
*********************************************/
.reveal.page .slides {
-webkit-perspective-origin: 0% 50%;
Expand Down Expand Up @@ -839,6 +855,7 @@ body {
height: 100%;
opacity: 0;
visibility: hidden;
overflow: hidden;
background-color: transparent;
background-position: 50% 50%;
background-repeat: no-repeat;
Expand All @@ -851,7 +868,8 @@ body {

.reveal .slide-background.present {
opacity: 1;
visibility: visible; }
visibility: visible;
z-index: 2; }

.print-pdf .reveal .slide-background {
opacity: 1 !important;
Expand All @@ -865,7 +883,13 @@ body {
max-width: none;
max-height: none;
top: 0;
left: 0; }
left: 0;
-o-object-fit: cover;
object-fit: cover; }

.reveal .slide-background[data-background-size="contain"] video {
-o-object-fit: contain;
object-fit: contain; }

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

.reveal.overview .slides section,
.reveal.overview-deactivating .slides section {
Expand All @@ -1048,10 +1074,6 @@ body {
-webkit-transition: none;
transition: none; }

.reveal.overview-animated .slides {
-webkit-transition: -webkit-transform 0.4s ease;
transition: transform 0.4s ease; }

/*********************************************
* RTL SUPPORT
*********************************************/
Expand Down
33 changes: 28 additions & 5 deletions static/reveal.js/css/reveal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* http://lab.hakim.se/reveal-js
* MIT licensed
*
* Copyright (C) 2016 Hakim El Hattab, http://hakim.se
* Copyright (C) 2017 Hakim El Hattab, http://hakim.se
*/


Expand Down Expand Up @@ -388,6 +388,7 @@ body {
bottom: 0;
left: 0;
margin: auto;
pointer-events: none;

overflow: visible;
z-index: 1;
Expand All @@ -406,6 +407,7 @@ body {
position: absolute;
width: 100%;
padding: 20px 0px;
pointer-events: auto;

z-index: 10;
transform-style: flat;
Expand Down Expand Up @@ -443,6 +445,13 @@ body {
opacity: 1;
}

.reveal .slides>section:empty,
.reveal .slides>section>section:empty,
.reveal .slides>section[data-background-interactive],
.reveal .slides>section>section[data-background-interactive] {
pointer-events: none;
}

.reveal.center,
.reveal.center .slides,
.reveal.center .slides section {
Expand Down Expand Up @@ -610,6 +619,10 @@ body {

/*********************************************
* CUBE TRANSITION
*
* WARNING:
* this is deprecated and will be removed in a
* future version.
*********************************************/

.reveal.cube .slides {
Expand Down Expand Up @@ -682,6 +695,10 @@ body {

/*********************************************
* PAGE TRANSITION
*
* WARNING:
* this is deprecated and will be removed in a
* future version.
*********************************************/

.reveal.page .slides {
Expand Down Expand Up @@ -866,6 +883,7 @@ body {
height: 100%;
opacity: 0;
visibility: hidden;
overflow: hidden;

background-color: rgba( 0, 0, 0, 0 );
background-position: 50% 50%;
Expand All @@ -882,6 +900,7 @@ body {
.reveal .slide-background.present {
opacity: 1;
visibility: visible;
z-index: 2;
}

.print-pdf .reveal .slide-background {
Expand All @@ -898,7 +917,11 @@ body {
max-height: none;
top: 0;
left: 0;
object-fit: cover;
}
.reveal .slide-background[data-background-size="contain"] video {
object-fit: contain;
}

/* Immediate transition style */
.reveal[data-background-transition=none]>.backgrounds .slide-background,
Expand Down Expand Up @@ -1080,6 +1103,10 @@ body {
outline: 10px solid rgba(150,150,150,0.1);
outline-offset: 10px;
}

.backgrounds .slide-background.stack {
overflow: visible;
}
}

// Disable transitions transitions while we're activating
Expand All @@ -1094,10 +1121,6 @@ body {
transition: none;
}

.reveal.overview-animated .slides {
transition: transform 0.4s ease;
}


/*********************************************
* RTL SUPPORT
Expand Down
7 changes: 3 additions & 4 deletions static/reveal.js/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@
<script src="js/reveal.js"></script>

<script>
// More info https://github.com/hakimel/reveal.js#configuration
// More info about config & dependencies:
// - https://github.com/hakimel/reveal.js#configuration
// - https://github.com/hakimel/reveal.js#dependencies
Reveal.initialize({
history: true,

// More info https://github.com/hakimel/reveal.js#dependencies
dependencies: [
{ src: 'plugin/markdown/marked.js' },
{ src: 'plugin/markdown/markdown.js' },
Expand Down
Loading