diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-30 10:04:21 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-04 10:48:49 +0100 |
| commit | 38e32780a85463e862e5847a436be6819e28c81c (patch) | |
| tree | 4ea7d42af524fe85306e858829bc31536a11aa9d | |
| parent | 3c2b0e7572c11d24b96f2762a03c8cc47f11f510 (diff) | |
| download | gitlab-ce-38e32780a85463e862e5847a436be6819e28c81c.tar.gz | |
Hides current user icon on mobile
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 072de68c8e2..0f45c1fe33d 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -20,6 +20,12 @@ ul.notes { .timeline-content { margin-left: 55px; + + &.timeline-content-form { + @media (max-width: $screen-sm-max) { + margin-left: 0; + } + } } .note-created-ago, .note-updated-at { diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index 8a5a3199959..51e33dd774b 100644 --- a/app/views/projects/notes/_notes_with_form.html.haml +++ b/app/views/projects/notes/_notes_with_form.html.haml @@ -1,11 +1,11 @@ %ul#notes-list.notes.main-notes-list.timeline = render "projects/notes/notes" %li.timeline-entry - .timeline-icon + .timeline-icon.hidden-xs.hidden-sm - if can? current_user, :create_note, @project %a.author_link{ href: user_path(current_user) } = image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40' - .timeline-content + .timeline-content.timeline-content-form .js-main-target-form - if can? current_user, :create_note, @project = render "projects/notes/form", view: diff_view |