diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 04:20:59 +0300 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-14 16:04:55 +0300 |
commit | 0b18c47200e673a76fbadca1b1ff983200ab7832 (patch) | |
tree | 3f5f37fc4917cc426a6a013e7829ce546ef5ec58 | |
parent | 8bb8edc1f476f9dbae525e1ff3f8000655ce4902 (diff) |
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) |