diff options
author | Dennis Tang <dtang@gitlab.com> | 2019-01-21 23:52:53 +0300 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2019-01-25 13:26:35 +0300 |
commit | 056f6dd08f9b11e9ad70b5aed43fb3b9f7770005 (patch) | |
tree | 17e6798ab72d30fde1309c1a338f96cee1ce73b2 /app/views/projects/buttons | |
parent | ce171674b60f5888aa3802e9f6b843762faabd3a (diff) |
Refresh group overview to match project overview
- Avatar, group name, and group description now left-aligned
- Notification setting and "New project" CTA right-aligned
with group avatar and name
- Leave group / request access now a link next to the 'Group'
label below the group name
- Notification setting label removed in favor of icons
- Tooltip added to indicate notification setting
- Search option moved inside table header next to "Sort by"
Diffstat (limited to 'app/views/projects/buttons')
-rw-r--r-- | app/views/projects/buttons/_notifications.html.haml | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml deleted file mode 100644 index 745983ace7e..00000000000 --- a/app/views/projects/buttons/_notifications.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -- btn_class = local_assigns.fetch(:btn_class, "btn-xs") - -- if notification_setting - .js-notification-dropdown.notification-dropdown.project-action-button.dropdown.inline - = form_for notification_setting, remote: true, html: { class: "inline notification-form no-label" } do |f| - = hidden_setting_source_input(notification_setting) - = hidden_field_tag "hide_label", true - = f.hidden_field :level, class: "notification_setting_level" - .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 - %{notification_title}") % { notification_title: notification_title(notification_setting.level) }, class: "#{btn_class}", "aria-label" => _("Notification setting - %{notification_title}") % { notification_title: notification_title(notification_setting.level) }, data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } } - = sprite_icon("notifications", css_class: "icon notifications-icon js-notifications-icon") - %span.js-notification-loading.fa.hidden - %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } } - = sprite_icon("arrow-down", css_class: "icon") - .sr-only Toggle dropdown - - else - %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting - #{notification_title(notification_setting.level)}", class: "#{btn_class}", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } } - = sprite_icon("notifications", css_class: "icon notifications-icon js-notifications-icon") - %span.js-notification-loading.fa.hidden - = sprite_icon("arrow-down", css_class: "icon") - - = render "shared/notifications/notification_dropdown", notification_setting: notification_setting - - = content_for :scripts_body do - = render "shared/notifications/custom_notifications", notification_setting: notification_setting |