Merge branch 'feature/video-popup'

* 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
commit 87d05d09ce
4 changed files with 612 additions and 3 deletions

View file

@ -19,6 +19,7 @@
//stuff most pages need
@import "overlay-menu";
@import "video";
@import "magnific-popup";
//styles for specific pages
@import "home";
@ -26,5 +27,3 @@
@import "post";
@import "junk-drawer";
@import "styleguide";
*{ font-size:0;}