diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 01:20:59 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 01:20:59 +0000 |
| commit | d3fb1da12011b1fcaa3e2fc5c38b6cc87f3d38ab (patch) | |
| tree | eb10da9a68eee876d9eaf37c9dec35a9ff89af44 | |
| parent | 9626335cc218107a3be21ee82fb5e5bf9ed288c8 (diff) | |
| parent | f46888fd3ebed8ff646163c6702de84a9b4a4a40 (diff) | |
| download | gitlab-ce-d3fb1da12011b1fcaa3e2fc5c38b6cc87f3d38ab.tar.gz | |
Merge branch 'sub-group-dropdown-width' into 'master'
Fixed width of sub-group in breadcrumb dropdown
Closes #37745
See merge request !14210
| -rw-r--r-- | app/helpers/groups_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 36b79da1bde..e8efe8fab27 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -21,7 +21,7 @@ module GroupsHelper group.ancestors.reverse.each_with_index do |parent, index| if index > 0 - add_to_breadcrumb_dropdown(group_title_link(parent, hidable: false, show_avatar: true), location: :before) + add_to_breadcrumb_dropdown(group_title_link(parent, hidable: false, show_avatar: true, for_dropdown: true), location: :before) else full_title += breadcrumb_list_item group_title_link(parent, hidable: false) end @@ -85,8 +85,8 @@ module GroupsHelper private - def group_title_link(group, hidable: false, show_avatar: false) - link_to(group_path(group), class: "group-path breadcrumb-item-text js-breadcrumb-item-text #{'hidable' if hidable}") do + def group_title_link(group, hidable: false, show_avatar: false, for_dropdown: false) + link_to(group_path(group), class: "group-path #{'breadcrumb-item-text' unless for_dropdown} js-breadcrumb-item-text #{'hidable' if hidable}") do output = if (group.try(:avatar_url) || show_avatar) && !Rails.env.test? image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15) |