diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 18:22:21 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 18:22:21 +0000 |
| commit | ae6b44cf31df08667048706635745f5f4e17a60d (patch) | |
| tree | 9498032180879f0271b59dc028c7f03ec63206fd | |
| parent | 832cdd3d516698d0e6a7257b3d94292819a0436a (diff) | |
| parent | c659c836f068b4cb1a7b48df0dad9d2fe5749ee4 (diff) | |
| download | gitlab-ce-ae6b44cf31df08667048706635745f5f4e17a60d.tar.gz | |
Merge branch '15104-mobile-comment-bug' into 'master'
Discussion note icon shows up when you click on diff on touch screen
Fixes #15104
* Fix bug that stopped discussion note button from showing up on iOS
* Shifted button a few `px` to fix slight cutoff
<div>
<img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px">
<img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px">
</div>
See merge request !3755
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 183f22a1b24..9dd87ba2066 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -34,6 +34,7 @@ background: #fff; color: #333; border-radius: 0 0 3px 3px; + -webkit-overflow-scrolling: auto; .unfold { cursor: pointer; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ffcd89a3c9f..aacb12532c3 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -308,7 +308,7 @@ ul.notes { padding: 4px; font-size: 16px; color: $gl-link-color; - margin-left: -60px; + margin-left: -56px; position: absolute; z-index: 10; width: 32px; |