resolve merge conflicts

1 files changed, 0 insertions, 30 deletions

diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss
deleted file mode 100644
index 93de17d..0000000
--- a/sass/include/_embedded.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-// Embedded content
-.yvi {//youtube and vimeo iframe
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.yv {//youtube and vimeo div
-  position: relative;
-  padding-bottom: 56.25%;
-  height: 0;
-  overflow: hidden;
-}
-img,
-video,
-svg {
-  max-width: 100%;
-  height: auto;
-}
-embed,
-iframe,
-object {
-  max-width: 100%;
-}
-iframe {
-  border-style: none;
-  width: 100%;
-  height: 100%;
-  border: 0;
-  overflow: hidden;
-}