Download as
Browse Code »

Commit 8aac4fadba2c50d2a1b855c893fba31038cc15d8

Authored by Dmitriy Zaporozhets
1 parent d9739b80
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Small ui fixes 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @8aac4fa
... ... @@ -27,7 +27,7 @@
27 27 display: none;
28 28 position: absolute;
29 29 top: 10px;
30   - right: 2px;
  30 + right: 15px;
31 31 }
32 32  
33 33 &:hover {
... ...
app/views/projects/merge_requests/_new_submit.html.haml
  Diff comments   View file @8aac4fa
... ... @@ -24,10 +24,9 @@
24 24 .light
25 25 = f.label :description, "Description"
26 26 = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 10
27   - .col-sm-12.hint
  27 + .clearfix.hint
28 28 .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
29 29 .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
30   - .clearfix
31 30 .error-alert
32 31 .form-group
33 32 .issue-assignee
... ... @@ -37,7 +36,7 @@
37 36 %div
38 37 = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id)
39 38 &nbsp;
40   - = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
  39 + = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
41 40 .form-group
42 41 .issue-milestone
43 42 = f.label :milestone_id do
... ...