diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-15 22:29:57 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-15 22:29:57 +0300 |
| commit | 557dd8d9f04aa4c6a921356a074c86e0a47e38a3 (patch) | |
| tree | cf563bea0c872a76ec22d905d120827c8b2a37dd /app/views/shared | |
| parent | 6e06171ee6a7d002e279f8783a4958bedb2b3389 (diff) | |
| parent | 2a24d12bb29472b6e584460c8c1cbe01e420603c (diff) | |
Merge branch 'jivl-fix-dropdown-going-out-of-screen' into 'master'
Fix dropdown from the project welcome page moving out of the screen
Closes #47966
See merge request gitlab-org/gitlab-ce!19903
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/notifications/_button.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml index e99d8d0973f..09ddf732ada 100644 --- a/app/views/shared/notifications/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml @@ -6,14 +6,14 @@ .js-notification-toggle-btns %div{ class: ("btn-group" if notification_setting.custom?) } - if notification_setting.custom? - %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting) } } + %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } } = icon("bell", class: "js-notification-loading") = notification_title(notification_setting.level) %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } } = icon('caret-down') .sr-only Toggle dropdown - else - %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } } + %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), display: 'static' } } = icon("bell", class: "js-notification-loading") = notification_title(notification_setting.level) = icon("caret-down") |