aboutsummaryrefslogtreecommitdiffstats
path: root/demo/src/sass/components/media.scss
diff options
context:
space:
mode:
authorDanielh112 <Daniel@sbgsportssoftware.com>2020-08-18 11:29:25 +0100
committerDanielh112 <Daniel@sbgsportssoftware.com>2020-08-18 11:29:25 +0100
commitf7e9ee56d2ed5447f59e5548f005fabdab2f0a72 (patch)
treea16300fa62e68b3310ae96e36dba65981f0024ef /demo/src/sass/components/media.scss
parent22af7f16ea4a4269321d29242d63ec23718c92da (diff)
parent423b7b276f1572eb666de32094a9aacd32e87d18 (diff)
downloadplyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.lz
plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.xz
plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.zip
Fix merge conflicts
Diffstat (limited to 'demo/src/sass/components/media.scss')
-rw-r--r--demo/src/sass/components/media.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/demo/src/sass/components/media.scss b/demo/src/sass/components/media.scss
index c6744bcc..d6456932 100644
--- a/demo/src/sass/components/media.scss
+++ b/demo/src/sass/components/media.scss
@@ -5,6 +5,6 @@
img,
video,
audio {
- max-width: 100%;
- vertical-align: middle;
+ max-width: 100%;
+ vertical-align: middle;
}