Skip to content

Commit

Permalink
Resync with hakimel master (#8)
Browse files Browse the repository at this point in the history
* resolves hakimel#1324 allow display property to be configured

- allow display property apply to current slide to be configured

* add 'npm build' script that launch grunt

* Allow switching off preview links

The data-preview-link=false tag can be used to switch off preview links

* Support sass extension for custom themes

* Shift `dependencies` to `devDependencies`.

The `reveal.js` npm module is typically installed to access the CSS/JS
assets for Reveal.js. For those that want to run the plugins, they would
clone the whole repository. Hence, it doesn’t make sense to include
those as `dependencies`, which will increase download times.

Closes hakimel#1734.

* Allow background images without protocols to have query hashes/parameters.

Closes hakimel#1603.

* hakimel#1770, resume playback for paused media.

* hakimel#1770, fixed function name.

* hakimel#1770, added second argument for setAttribute

* hakimel#1770, set 'data-paused-by-reveal' attribute only for the media elements, which are not already in paused state.

* support complex markdown

support <textarea data-template> `some code` </textarea>

* Remove 'history: true' from index.html

Readme says the default is 'history: false', so it may be surprising
for users - it's easy to miss the contradicting setting in index.html

* wait for in-slide video/audio to load before playing, reuse same autoplay logic for slide backgrounds

* prevent autoplaying backgrounds from playing if slide is hidden

* fix race condition by updating backgrounds after slide visibility

*  works with video, defaults to  (same as for images)

* remove unused argument

* make backgrounds (iframes) interactive when the foreground is empty

* 2017

* merge info links in index

* fix empty pages in pdf exports (closes hakimel#1804)

* additional fix for empty pages in pdf exports hakimel#1804

* adjust pdf margins instead of heights to fix hakimel#1804

* typo

* note about showNotes in PDF exports hakimel#1800

* fix markdown typo, update comment hakimel#1780

* recommend using textarea wrapper for inline markdown hakimel#1780

* make background videos work on ipad hakimel#1778

* improved fragment notes support hakimel#1636

* warning about cube/page being deprecated hakimel#1774

* adjust comment for display config value hakimel#1325

* added toggleHelp function 

this way a key can be given ability to toggleHelp on and off.  Previously Reveal.showHelp could open the help screen, but no way to close it.

* added override parameter to toggleHelp function

* update deserialize regex to work with decimals

* docs for hakimel#1816 and remove showHelp

* phantom export throws error if reveal.js isn't present

* fix overview rendering issues in latest chrome hakimel#1649

* allow configuration of which view slide number appears on - fixes hakimel#1791

* correct config name in README

* note about deploying multiplex server with now hakimel#1830

* tweaks to showSlideNumber config hakimel#1833

* avoid npe on iframe postMessage

* print-pdf using callback iso timer

Use window.callPhantom icw page. onCallback to wait for pdf-ready event.
From: http://stackoverflow.com/a/28925479/129269

* print-pdf layout slide contents to fit stretch elements

layout() and thereby layoutSlideContents() is never invoked
when isPrintingPdf() is true so stretch elements are not
sized correctly.
This is ensured now by invoking the layoutSlideContents
from SetupPDF(). There seems no need to scale down
like in other PR's is suggested.

* Fix video background autoplay on iOS

* add autoPlayMedia config option, overrides individual autoplay settings

* allow fullscreen for background iframes

* new cli and in-browser pdf printing compatible fix for hakimel#1804

* make pdf page height offset configurable

* replace cdn.mathjax.org with cdnjs

cdn.mathjax.org is shutting down: https://www.mathjax.org/cdn-shutting-down/

This changes the default MathJax URL in the math plugin, as well as
references in README.md and test/examples/math.html

* formatting

* formatting

* clarify meaning of getProgress() value

* expose getPastSlideCount() via public API

This can be used by plugins which are concerned with helping the
presenter with their pace.

* clarify getTotalSlides() returns the number of slides

* add new getSlides() API

This can be used by plugins which are concerned with helping the
presenter with their pace.

* Allow popup window access to Reveal API

* extract time display code into new _displayTime() function

This will allow us to reuse the display code for displaying
an additional pacing timer.

* use opacity for muted clock elements

This allows us to use different colours for different timers,
which will be useful when we add a pacing timer.

* don't mute minutes when hours is unmuted

* avoid deleting existing classes when muting time elements

and make muting work for negative values

* don't show negative signs inside minutes/seconds elements

* round decreasing timers to mirror increasing timers

* document clock and timer in speaker notes window

* optionally display pacing advice based on slide timings

Add an option to display advice on whether the current pace of the
presentation is on track for the right timing (shown as green), and if
not, whether the presenter should speed up (shown as red) or has the
luxury of slowing down (blue).

The pacing timer can be enabled by configuring by the `defaultTiming`
parameter in the `Reveal` configuration block, which specifies the
number of seconds per slide.  120 can be a reasonable rule of thumb.
Timings can also be given per slide `<section>` by setting the
`data-timing` attribute.  Both values are in numbers of seconds.

When the option is enabled, clicking on the timers will reset the timer
to the beginning of the current slide, i.e. as if pacing was perfectly
on track, not to zero as if the presentation had just begun.

* minor tweak for hakimel#1564

* 3.5.0

* * updated big picture slide
* added schema image
* added deployment texts

* * update big picture svg
* adjusted big picture styles
* moved authors and company slides to the end
*

* * added styles for codelistings
* tweaked dockerfile
* added kubernetes cheatsheet
* moved tldr slide to end of presentation

* * added version number to html source
* added config file for CircleCI integration
* added deploy.sh

* * updated status badge
* troubleshooting deploy script

* * bugfix as suggested in https://goo.gl/W1XnSk

* * changed circle badges in readme
* finetuning deploy.sh
* moved sha label to span inside presentation

* * optimized Dockerfile to leverage docker caching

* * added key ‘v’ to toggle display of GIT sha in upper right corner

* * added PS_VERSION_NUMBER to big picture slide
* shortened stateflow texts

* * removed unneeded files

* * added link to github project on tldr

* * changed port for k8-service

* wip

* * finetuning deployment

* debug

* * editorial finetuning

* * extended deploy script to update dyndns with public cluster ip address

* * added shell scripts for starting and stopping the kubernetes (k8) cluster on GCP
* moved it all to subfolder k8

* * huge commit. The best. No seriously, it’s way to big and it can easily serve as a bad example.

* * added seniority
* finetuning claims on last slide
* controls are now hidden

* * extended collaboration slide

* * added samples for collaboration

* * replaced slide bgnd by collage

* * modified collage
* swapped slide order
* added notes
* reduced size of leafs bgnd

* * tweakd tldr slide

* * replaced the bgnd image on the collaboration slide - new one has some effects applied

* * ignoring .vscode folder

* * added data-timing values for every slide
* extended readme section of the repo

* * changed the way how the schema image is built into the slide

* * windows millenium. and why you may never have heard of it
  • Loading branch information
chriwu authored and pm-nsimic committed May 1, 2017
1 parent 9436d8e commit 2106142
Show file tree
Hide file tree
Showing 17 changed files with 579 additions and 192 deletions.
11 changes: 8 additions & 3 deletions 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 @@ -45,7 +45,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 @@ -123,7 +123,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 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
29 changes: 27 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@
# Parkside @ Teconomy 2017 [![CircleCI](https://circleci.com/gh/chriwu/ps-tec-2017/tree/chris-detailed-notes.svg?style=svg&circle-token=7d6fc3a39af8cc275b53a697624560b58c85ecf4)](https://circleci.com/gh/chriwu/ps-tec-2017/tree/chris-detailed-notes) [![CircleCI](https://circleci.com/gh/chriwu/ps-tec-2017/tree/chris-detailed-notes.svg?style=shield&circle-token=7d6fc3a39af8cc275b53a697624560b58c85ecf4)](https://circleci.com/gh/chriwu/ps-tec-2017/tree/chris-detailed-notes)

This repo contains a slide-deck based on the reveal.js presentation framework. The corresponding speech is being held at the [Teconomy Graz 2017](https://iaeste.at/en/teconomy_graz).

## Contents

## Introduction

Topic: Merge Hell - and how to avoid it
Alt.: Collaboration on large projects in modern software development
Speakers: chriwu and nsimic


## Abstract

In modern software development, efficient collaboration in medium to large teams is often hard to achieve. The challenge grows, when the teams live in different time zones. To avoid classic pitfalls like merge hell, to safeguard due dates and ensure software quality, several strategies can be adopted.

Defining and adopting good workflows (branching, merging, code reviews) for development teams is crucial. Choosing from a growing number of tools (SCM’s, Containerization, Continuous Integration and Deployment) to support the workflows makes developer’s life easier and allows the company to ship high quality - in time.


## About Parkside

We develop and realize web and mobile applications and software solutions for domestic and international clients with a high standard of design, usability and quality. Besides the DACH-region we focus on the US-American market and value clients based in Los Angeles, San Francisco and Seattle. We operate internationally, but our headquarters are in Graz.

Our constantly growing team of more than 40 developers, designers and consultants focuses on the development of sophisticated outcomes for our clients. The production of quality interactive environments has been the source of our passion for more than 10 years.


## Work with us
- https://stackoverflow.com/jobs/companies/parkside-informationstechnologie-gmbh
- http://www.karriere.at/f/parkside-informationstechnologie


## License

MIT licensed

Copyright (C) 2016 Hakim El Hattab, http://hakim.se
Copyright (C) 2017 Parkside Informationstechnologie GmbH , https://parkside.at
16 changes: 10 additions & 6 deletions css/parkside.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,19 @@ html.sl-collaboration-aspects .slide-background, html.sl-company .slide-backgrou
opacity: 0.2 !important; }

html.sl-big-picture h3 {
position: relative;
top: -110px !important; }
/*position: relative;
top: -110px !important;
*/ }

html.sl-big-picture .slide-background {
opacity: 1.0 !important;
background-position-y: 100px;
background-size: 70%; }

html.sl-big-picture img#schema {
margin: 0px 0;
width: 85%; }

html.sl-magic .slide-background {
opacity: 0.35 !important;
background-position-y: 100px;
Expand Down Expand Up @@ -110,10 +115,9 @@ body {
.reveal section img {
border: none;
background: transparent;
box-shadow: none; }
box-shadow: none;
margin: 0 !important;
padding: 0; }
.reveal section img#tools {
margin: 40px 0;
width: 60%; }
.reveal section img#schema {
margin: 0px 0;
width: 85%; }
17 changes: 11 additions & 6 deletions css/parkside.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,22 @@ html.sl-collaboration-aspects, html.sl-company, html.sl-tldr {
html.sl-big-picture {

h3 {
position: relative;
/*position: relative;
top: -110px !important;

*/
}

.slide-background {
opacity: 1.0 !important;
background-position-y: 100px;
background-size: 70%;
}

img#schema {
margin: 0px 0;
width: 85%;

}
}


Expand Down Expand Up @@ -201,16 +207,15 @@ body {
border: none;
background: transparent;
box-shadow: none;
margin: 0 !important;
padding: 0;

&#tools {
margin: 40px 0;
width: 60%;
}

&#schema {
margin: 0px 0;
width: 85%;
}

}
}
}
7 changes: 4 additions & 3 deletions 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
34 changes: 27 additions & 7 deletions 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 @@ -320,6 +320,7 @@ body {
bottom: 0;
left: 0;
margin: auto;
pointer-events: none;
overflow: visible;
z-index: 1;
text-align: center;
Expand All @@ -337,6 +338,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 @@ -367,6 +369,10 @@ body {
z-index: 11;
opacity: 1; }

.reveal .slides > section:empty,
.reveal .slides > section > section:empty {
pointer-events: none; }

.reveal.center,
.reveal.center .slides,
.reveal.center .slides section {
Expand Down Expand Up @@ -581,6 +587,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 @@ -656,6 +666,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 @@ -826,6 +840,7 @@ body {
height: 100%;
opacity: 0;
visibility: hidden;
overflow: hidden;
background-color: transparent;
background-position: 50% 50%;
background-repeat: no-repeat;
Expand All @@ -837,7 +852,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 @@ -851,7 +867,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 @@ -1018,6 +1040,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 @@ -1027,10 +1051,6 @@ body {
.reveal.overview-deactivating .backgrounds .slide-background {
transition: none; }

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

/*********************************************
* RTL SUPPORT
*********************************************/
Expand Down
Loading

0 comments on commit 2106142

Please sign in to comment.