Merge branch 'feature/video-popup'

Browse source

* feature/video-popup:
  (Feature) Popup: Add video popup for the overview video

# Conflicts:
#	_layouts/default.html
#	src/scss/main.scss

...

This commit is contained in:

0xfff 2016-09-17 02:33:55 +02:00

parent 2b0331ad48 e82d1642c2

commit 87d05d09ce

4 changed files with 612 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

assets/js/popup.js Normal file

View file

File diff suppressed because one or more lines are too long