diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-10 20:13:32 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-10 20:13:32 +0000 |
| commit | 2d83f07ba8304cc7da4de76a78fbab48278a915c (patch) | |
| tree | 0310749c45cf38c317f3437fdcb3ea5b81b1cd0e | |
| parent | b886d833d3835bc0204fd3ed8f9a00fdf3c27ed1 (diff) | |
| parent | bfcf6a045c34263a355dc0e678275e92f5a9656d (diff) | |
| download | gitlab-ce-2d83f07ba8304cc7da4de76a78fbab48278a915c.tar.gz | |
Merge branch 'issue_13987' into 'master'
Fixes broken layout of web editor page on mobile
Fixes #13987
<p><img src="https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a58e7b576c25d5929bc1cdcbe163161/Screen_Shot_2016-03-10_at_1.13.19_PM.png" alt="Screen_Shot_2016-03-10_at_1.13.19_PM" width="487"></p>
See merge request !3167
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 07907e6e5a6..b034a4882c1 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -169,6 +169,7 @@ */ &.code { padding: 0; + -webkit-overflow-scrolling: auto; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 } } } diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index e53d6fc6bdc..c0cc30d33a6 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -90,6 +90,7 @@ position: relative; font-family: $monospace_font; $left: 12px; + overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 .max-width-marker { width: 72ch; color: rgba(0, 0, 0, 0.0); |