diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-11 19:38:18 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-11 20:11:23 +0100 |
| commit | b4ea6ad16a63acfcf581f1e6e2f04f811a5efc90 (patch) | |
| tree | 6182277da911e60a8e56cbc1155111d49980ff64 | |
| parent | 617ba01322b0d2d8fbe6a543b2e2393b8178089e (diff) | |
| download | gitlab-ce-b4ea6ad16a63acfcf581f1e6e2f04f811a5efc90.tar.gz | |
Few UI improvements to new sidebar implementation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/javascripts/issuable_context.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 7 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 12 |
3 files changed, 13 insertions, 8 deletions
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee index 02232698bc2..01bd515cc02 100644 --- a/app/assets/javascripts/issuable_context.js.coffee +++ b/app/assets/javascripts/issuable_context.js.coffee @@ -18,7 +18,7 @@ class @IssuableContext $('.issuable-affix').affix offset: top: -> - @top = ($('.issuable-affix').offset().top - 70) + @top = ($('.issuable-affix').offset().top - 60) bottom: -> @bottom = $('.footer').outerHeight(true) diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 35af92e7df3..1f1d720ae4b 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -18,7 +18,7 @@ &.affix { position: fixed; - top: 70px; + top: 60px; margin-right: 35px; } } @@ -129,6 +129,11 @@ .btn-clipboard { color: $gl-gray; } + + .participants .avatar { + margin-top: 6px; + margin-right: 2px; + } } .issuable-title { diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index cbd01c7d4fd..0019f739b89 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -4,14 +4,14 @@ .title Cross-project reference .cross-project-reference - %span#cross-project-reference.has_tooltip{title: 'Cross-project reference'} + %span#cross-project-reference = cross_project_reference(@project, issuable) = clipboard_button(clipboard_target: 'span#cross-project-reference') .block.assignee .title %label - Assignee: + Assignee - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) .pull-right = link_to 'Edit', '#', class: 'edit-link' @@ -19,7 +19,7 @@ - if issuable.assignee %strong= link_to_member(@project, issuable.assignee, size: 24) - else - None + .light None .selectbox = users_select_tag("#{issuable.class.table_name.singularize}[assignee_id]", placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: issuable.assignee_id, project: @target_project, null_user: true, current_user: true, first_user: true) @@ -27,7 +27,7 @@ .block.milestone .title %label - Milestone: + Milestone - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) .pull-right = link_to 'Edit', '#', class: 'edit-link' @@ -39,7 +39,7 @@ = icon('clock-o') = issuable.milestone.title - else - None + .light None .selectbox = f.select(:milestone_id, milestone_options(issuable), { include_blank: true }, { class: 'select2 select2-compact js-select2 js-milestone', data: { placeholder: 'Select milestone' }}) = hidden_field_tag :issuable_context @@ -57,7 +57,7 @@ - issuable.labels.each do |label| = link_to_label(label) - else - None + .light None .selectbox = f.collection_select :label_ids, issuable.project.labels.all, :id, :name, { selected: issuable.label_ids }, multiple: true, class: 'select2 js-select2', data: { placeholder: "Select labels" } |