diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-10 00:21:47 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-12-10 00:21:47 -0600 |
| commit | 097c283ac186bccb647143fd022bfe6a320379b0 (patch) | |
| tree | 4053f24f82bd76d01f0d301e3c51964afb5a0962 /app/views/shared/notifications | |
| parent | 69ffa81424e16a337b4c39d2cb9c0dff8b92f71b (diff) | |
| download | gitlab-ce-097c283ac186bccb647143fd022bfe6a320379b0.tar.gz | |
remove left_align setting from notification setting dropdown in favor of a pure css solution25510-fix-notifications-dropdown-alignment
Diffstat (limited to 'app/views/shared/notifications')
| -rw-r--r-- | app/views/shared/notifications/_button.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/notifications/_notification_dropdown.html.haml | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml index 1f7df0bcd19..fbad0d05de3 100644 --- a/app/views/shared/notifications/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml @@ -1,4 +1,3 @@ -- left_align = local_assigns[:left_align] - if notification_setting .dropdown.notification-dropdown = form_for notification_setting, remote: true, html: { class: "inline notification-form" } do |f| @@ -19,7 +18,7 @@ = notification_title(notification_setting.level) = icon("caret-down") - = render "shared/notifications/notification_dropdown", notification_setting: notification_setting, left_align: left_align + = render "shared/notifications/notification_dropdown", notification_setting: notification_setting = content_for :scripts_body do = render "shared/notifications/custom_notifications", notification_setting: notification_setting diff --git a/app/views/shared/notifications/_notification_dropdown.html.haml b/app/views/shared/notifications/_notification_dropdown.html.haml index d3258ee64cb..85ad74f9a39 100644 --- a/app/views/shared/notifications/_notification_dropdown.html.haml +++ b/app/views/shared/notifications/_notification_dropdown.html.haml @@ -1,5 +1,4 @@ -- 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" unless left_align)] } +%ul.dropdown-menu.dropdown-menu-no-wrap.dropdown-menu-selectable.dropdown-menu-large{ role: "menu", class: [notifications_menu_identifier("dropdown", notification_setting)] } - NotificationSetting.levels.each_key do |level| - next if level == "custom" - next if level == "global" && notification_setting.source.nil? |