diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-10 21:57:05 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-10 21:57:05 +0300 |
| commit | 8aac4fadba2c50d2a1b855c893fba31038cc15d8 (patch) | |
| tree | b0f630901dc1cfc2fbad92f02ac6a143600dbec2 | |
| parent | d9739b8026246b733cf5a36794376cbb946528fe (diff) | |
| download | gitlab-ce-8aac4fadba2c50d2a1b855c893fba31038cc15d8.tar.gz | |
Small ui fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/sections/issues.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index 949c528bdbd..495a7cb3113 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -27,7 +27,7 @@ display: none; position: absolute; top: 10px; - right: 2px; + right: 15px; } &:hover { diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 01bc10421bd..34a30975e07 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -24,10 +24,9 @@ .light = f.label :description, "Description" = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 10 - .col-sm-12.hint + .clearfix.hint .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. - .clearfix .error-alert .form-group .issue-assignee @@ -37,7 +36,7 @@ %div = 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) - = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' + = link_to 'Assign to me', '#', class: 'btn assign-to-me-link' .form-group .issue-milestone = f.label :milestone_id do |