diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-17 14:28:40 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-17 14:28:40 +0100 |
| commit | 531d27e740158bb7b8993e1f4e6e58655f610f27 (patch) | |
| tree | bded6f4f74a875277d9af6b77ffa08ee8ea0f3d0 /app/views/shared/notifications | |
| parent | 33c61bd461d21dbb79db18e0c2424f53120e83c0 (diff) | |
| download | gitlab-ce-531d27e740158bb7b8993e1f4e6e58655f610f27.tar.gz | |
Fixed alignment of notification dropdown menu
Diffstat (limited to 'app/views/shared/notifications')
| -rw-r--r-- | app/views/shared/notifications/_notification_dropdown.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/notifications/_notification_dropdown.html.haml b/app/views/shared/notifications/_notification_dropdown.html.haml index e6e04b98c82..5b2945275ff 100644 --- a/app/views/shared/notifications/_notification_dropdown.html.haml +++ b/app/views/shared/notifications/_notification_dropdown.html.haml @@ -1,4 +1,5 @@ -%ul.dropdown-menu.dropdown-menu-no-wrap.dropdown-menu-align-right.dropdown-menu-selectable.dropdown-menu-large{ role: "menu", class: notifications_menu_identifier("dropdown", notification_setting) } +- left_align = local_assigns[:left_align] +%ul.dropdown-menu.dropdown-menu-no-wrap.dropdown-menu-selectable.dropdown-menu-large{ role: "menu", class: [notifications_menu_identifier("dropdown", notification_setting), ("dropdown-menu-align-right" if left_align.nil?)] } - NotificationSetting.levels.each_key do |level| - next if level == "custom" - next if level == "global" && notification_setting.source.nil? |