Make custom notification dropdown hide_label aware

so that the sprite based notifiction button
generates the correct dropdown

app/assets/stylesheets/framework/buttons.scss

@@ -143,12 +143,6 @@
   vertical-align: text-top;
 }
 
-@mixin btn-xs {
-  padding: 2px $gl-btn-padding;
-  font-size: $gl-btn-xs-font-size;
-  line-height: $gl-btn-xs-line-height;
-}
-
 .btn {
   @include btn-default;
   @include btn-white;
@@ -167,7 +161,9 @@
   }
 
   &.btn-xs {
-    @include btn-xs;
+    padding: 2px $gl-btn-padding;
+    font-size: $gl-btn-xs-font-size;
+    line-height: $gl-btn-xs-line-height;
   }
 
   &.btn-success,

app/assets/stylesheets/pages/projects.scss

@@ -237,10 +237,6 @@
 }
 
 .project-repo-buttons {
-  .notifications-btn {
-    @include btn-xs;
-  }
-
   .btn {
     &:last-child {
       margin-left: 0;

app/controllers/notification_settings_controller.rb

@@ -16,12 +16,7 @@ class NotificationSettingsController < ApplicationController
     @notification_setting = current_user.notification_settings.find(params[:id])
     @saved = @notification_setting.update(notification_setting_params_for(@notification_setting.source))
 
-    if params[:hide_label].present?
-      btn_class = params[:project_id].present? ? 'btn-xs' : ''
-      render_response("shared/notifications/_new_button", btn_class)
-    else
-      render_response
-    end
+    render_response
   end
 
   private
@@ -42,7 +37,16 @@ class NotificationSettingsController < ApplicationController
     can?(current_user, ability_name, resource)
   end
 
-  def render_response(response_template = "shared/notifications/_button", btn_class = nil)
+  def render_response
+    btn_class = nil
+
+    if params[:hide_label].present?
+      btn_class = 'btn-xs' if params[:project_id].present?
+      response_template = 'shared/notifications/_new_button'
+    else
+      response_template = 'shared/notifications/_button'
+    end
+
     render json: {
       html: view_to_html_string(response_template, notification_setting: @notification_setting, btn_class: btn_class),
       saved: @saved

app/views/shared/notifications/_custom_notifications.html.haml

+- hide_label = local_assigns.fetch(:hide_label, false)
+
 .modal.fade{ tabindex: "-1", role: "dialog", id: notifications_menu_identifier("modal", notification_setting), "aria-labelledby": "custom-notifications-title" }
   .modal-dialog
     .modal-content
@@ -11,6 +13,7 @@
         .container-fluid
           = form_for notification_setting, html: { class: "custom-notifications-form" } do |f|
             = hidden_setting_source_input(notification_setting)
+            = hidden_field_tag("hide_label", true) if hide_label
             .row
               .col-lg-4
                 %h4.prepend-top-0= _('Notification events')

app/views/shared/notifications/_new_button.html.haml

@@ -31,4 +31,4 @@
           = render "shared/notifications/notification_dropdown", notification_setting: notification_setting
 
           = content_for :scripts_body do
-            = render "shared/notifications/custom_notifications", notification_setting: notification_setting
+            = render "shared/notifications/custom_notifications", notification_setting: notification_setting, hide_label: true