diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-07 18:06:37 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-07 18:06:37 +0000 |
| commit | babf20c8ab2c2186590758b193de953c5efdefb4 (patch) | |
| tree | 7cd94f55bb8f189f0ab2c5047e0d8715c0cfa15b /app/views/projects | |
| parent | 40b17bdebd429c3d9693644404be8f56ff3ac441 (diff) | |
| parent | f62df363b5daa83b5ba81d75c63816976648446d (diff) | |
| download | gitlab-ce-babf20c8ab2c2186590758b193de953c5efdefb4.tar.gz | |
Merge branch 'notification-dropdown-labels' into 'master'
Notifications dropdown on project page now has descriptions
## What does this MR do?
Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense.
## What are the relevant issue numbers?
Part of #12758
## Screenshots (if relevant)
See merge request !4374
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/buttons/_notifications.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml index 1d05da50581..3b97dc9328f 100644 --- a/app/views/projects/buttons/_notifications.html.haml +++ b/app/views/projects/buttons/_notifications.html.haml @@ -2,10 +2,10 @@ = 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 .dropdown - %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "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('caret-down') - %ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown + %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) |