Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-06-15 11:05:07 +02:00
parent a237eec41e 20874c76f1
commit f3f1cf9e6d
2 changed files with 4 additions and 0 deletions
--- a/www/slide/slide.css
+++ b/www/slide/slide.css
@@ -300,6 +300,8 @@ body .CodeMirror-focused .cm-matchhighlight {
  width: 90%;
  margin: auto;
  padding-left: .25vw;
+  overflow-x: auto;
+  overflow-y: hidden;
 }
 .cp div#modal #content .slide-frame ul,
 .cp #print .slide-frame ul,
--- a/www/slide/slide.less
+++ b/www/slide/slide.less
@@ -266,6 +266,8 @@ div#modal #content, #print {
            width: 90%;
            margin: auto;
            padding-left: .25vw;
+            overflow-x: auto;
+            overflow-y: hidden;
        }

        ul, ol {