diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-11 22:08:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-11 22:08:22 +0000 |
| commit | 36bbd5affbc880d82e0b42aec57d1f233e4ab5f3 (patch) | |
| tree | 945999560faf972871afd5f784f37ddb6a4f17a4 | |
| parent | d1ad5b5378a1becb7bbd63b3263b30c205302983 (diff) | |
| parent | 27e521720a77bcf70ad04a428aee650a8d240401 (diff) | |
| download | gitlab-ce-36bbd5affbc880d82e0b42aec57d1f233e4ab5f3.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/highlight.scss | 1 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6a90320b8bc..286091afacf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -75,6 +75,7 @@ v 7.8.0 (unreleased) - Added support for firing system hooks on group create/destroy and adding/removing users to group (Boyan Tabakov) - Added persistent collapse button for left side nav bar (Jason Blanchard) - Prevent losing unsaved comments by automatically restoring them when comment page is loaded again. + - Don't allow page to be scaled on mobile. v 7.7.2 - Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch 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; diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 17bcf8d3631..a6900f4a04b 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -18,7 +18,7 @@ = javascript_include_tag "application" = csrf_meta_tags = include_gon - %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'} + %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'} %meta{name: 'theme-color', content: '#474D57'} = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') |