diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-28 00:06:36 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-28 00:06:36 -0500 |
| commit | 0b030e00a15f849a5cbb2778a6b88c57a2e43d4b (patch) | |
| tree | 0abbf6b773af275f44c527a58fdc736b87b6d3ef | |
| parent | f64e35069eb26959a201c25d548c68d00987d30d (diff) | |
| download | gitlab-ce-0b030e00a15f849a5cbb2778a6b88c57a2e43d4b.tar.gz | |
Add icon when collapsed.
Hide and show icons in collapse and expanded mode.
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 22 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 6 |
2 files changed, 26 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 02ac1b2da0c..6be1163a8a6 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -174,4 +174,26 @@ background: $gray-normal; border: 1px solid $gray-darkest; } + + &.right-sidebar-collapsed { + .issuable-count, + .issuable-nav, + .assignee .title, + .assignee .selectbox, + .assignee .value .author, + .milestone, + .labels, + .participants, + .light, + .project-reference { + display: none; + } + + } + + &.right-sidebar-expanded { + .sidebar-collapsed-icon { + display: none; + } + } }
\ No newline at end of file diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e50c4879848..486c1c922d5 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -33,6 +33,8 @@ = 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) .block.milestone + .sidebar-collapsed-icon + = icon('balance-scale') .title %label Milestone @@ -54,7 +56,7 @@ = f.submit class: 'btn hide' - if issuable.project.labels.any? - .block + .block.labels .title %label Labels - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project) @@ -87,7 +89,7 @@ You're receiving notifications because you're subscribed to this thread. - project_ref = cross_project_reference(@project, issuable) - .block + .block.project-reference .title .cross-project-reference %span |