diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 12:43:25 +0200 |
| commit | ad68bc63b5e7e8080e82d9febec05397c802d33d (patch) | |
| tree | d9508d5bd96c8087d13b88051637bb442e877659 /app/views/projects/buttons/_notifications.html.haml | |
| parent | 41c06c311b9c5642f6056d0b34030980ebf507b3 (diff) | |
| parent | cc322603945816ed957da7c0efa56e2ef1016569 (diff) | |
| download | gitlab-ce-ad68bc63b5e7e8080e82d9febec05397c802d33d.tar.gz | |
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
# app/models/project.rb
# db/schema.rb
# lib/gitlab/import_export/import_export_reader.rb
Diffstat (limited to 'app/views/projects/buttons/_notifications.html.haml')
| -rw-r--r-- | app/views/projects/buttons/_notifications.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml index c1e3e5b73a2..3b97dc9328f 100644 --- a/app/views/projects/buttons/_notifications.html.haml +++ b/app/views/projects/buttons/_notifications.html.haml @@ -1,11 +1,11 @@ - if @notification_setting = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), method: :patch, remote: true, html: { class: 'inline', id: 'notification-form' } do |f| = f.hidden_field :level - %span.dropdown - %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"} + .dropdown + %button.btn.btn-default.notifications-btn#notifications-button{ data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } } = icon('bell') = notification_title(@notification_setting.level) - = icon('angle-down') - %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown + = icon('caret-down') + %ul.dropdown-menu.dropdown-menu-no-wrap.dropdown-menu-align-right.dropdown-menu-selectable.dropdown-menu-large{ role: "menu" } - NotificationSetting.levels.each do |level| = notification_list_item(level.first, @notification_setting) |