Merge branch 'mobile-maximum-scale-1' into 'master'

Don't allow page to be scaled on mobile and add horizontal scrolling to code blocks

Closes #1974.

Previously, scaling (both automatically and manually) was enabled on mobile, which caused the top and sidebar to move over content. Scaling is now disabled.

Also previously, code in issues or comments too wide to fit inside the width of the window would "flow out" on the right, causing the whole page to become very wide and causing scrolling to scroll the entire page instead of just the code. Code blocks now scroll themselves.

See merge request !1501

2 files changed, 5 insertions, 0 deletions

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 1a7e96f1d0c..3db821fdf76 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -333,6 +333,10 @@ table {
   margin-bottom: 9px;
 }
 
+.wiki .code {
+  overflow-x: auto;
+}
+
 .footer-links a {
   margin-right: 15px;
 }
diff --git a/app/assets/stylesheets/generic/highlight.scss b/app/assets/stylesheets/generic/highlight.scss
index e1ca86af816..0f8225d6823 100644
--- a/app/assets/stylesheets/generic/highlight.scss
+++ b/app/assets/stylesheets/generic/highlight.scss
@@ -59,6 +59,7 @@
   box-shadow: none;
   background: $box_bg;
   padding: 1em;
+  overflow-x: auto;
 
   code {
     font-family: $monospace_font;