Move buttons in Admin > Settings > General

Move admin and group buttons

app/views/admin/application_settings/_account_and_limit.html.haml

@@ -60,5 +60,5 @@
 
     = render_if_exists 'admin/application_settings/updating_name_disabled_for_users', form: f
     = render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f
-
-  = f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button'
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button'

app/views/admin/application_settings/_diff_limits.html.haml

@@ -12,5 +12,5 @@
         = link_to icon('question-circle'),
           help_page_path('user/admin_area/diff_limits',
           anchor: 'maximum-diff-patch-size')
-
-  = f.submit _('Save changes'), class: 'btn btn-success'
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: 'btn btn-success'

app/views/admin/application_settings/_external_authorization_service_form.html.haml

@@ -47,5 +47,5 @@
         .form-group
           = f.label :external_authorization_service_default_label, _('Default classification label'), class: 'label-bold'
           = f.text_field :external_authorization_service_default_label, class: 'form-control'
-
-      = f.submit 'Save changes', class: "btn btn-success"
+      .gl-display-flex.gl-justify-content-end
+        = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_signin.html.haml

@@ -57,5 +57,5 @@
       = f.label :sign_in_text, class: 'label-bold'
       = f.text_area :sign_in_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled
-
-  = f.submit 'Save changes', class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_signup.html.haml

@@ -67,5 +67,5 @@
       = f.label :after_sign_up_text, class: 'label-bold'
       = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled
-
-  = f.submit 'Save changes', class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_terminal.html.haml

@@ -8,5 +8,5 @@
       .form-text.text-muted
         Maximum time for web terminal websocket connection (in seconds).
         0 for unlimited.
-
-  = f.submit 'Save changes', class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit 'Save changes', class: "btn btn-success"

app/views/admin/application_settings/_terms.html.haml

@@ -15,5 +15,5 @@
       = f.text_area :terms, class: 'form-control', rows: 8
       .form-text.text-muted
         = _("Markdown enabled")
-
-  = f.submit _("Save changes"), class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _("Save changes"), class: "btn btn-success"

app/views/admin/application_settings/_visibility_and_access.html.haml

@@ -66,5 +66,5 @@
       .form-group
         = f.label field_name, "#{type.upcase} SSH keys", class: 'label-bold'
         = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
-
-  = f.submit _('Save changes'), class: "btn btn-success"
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: "btn btn-success"

app/views/admin/application_settings/general.html.haml

@@ -101,8 +101,8 @@
               = s_('IDE|Live Preview')
             %span.form-text.text-muted
               = s_('IDE|Allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview.')
-
-      = f.submit _('Save changes'), class: "btn btn-success"
+      .gl-display-flex.gl-justify-content-end
+        = f.submit _('Save changes'), class: "btn btn-success"
 
 - if Feature.enabled?(:maintenance_mode)
   %section.settings.no-animate#js-maintenance-mode-toggle{ class: ('expanded' if expanded_by_default?) }

app/views/groups/settings/_advanced.html.haml

@@ -22,8 +22,8 @@
           pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS,
           title: s_('GroupSettings|Please choose a group URL with no special characters.'),
           "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}"
-
-    = f.submit s_('GroupSettings|Change group URL'), class: 'btn btn-warning'
+    .gl-display-flex.gl-justify-content-end
+      = f.submit s_('GroupSettings|Change group URL'), class: 'btn btn-warning'
 
 .sub-section
   %h4.warning-title= s_('GroupSettings|Transfer group')
@@ -39,7 +39,8 @@
       %li= s_('GroupSettings|You can only transfer the group to a group you manage.')
       %li= s_('GroupSettings|You will need to update your local repositories to point to the new location.')
       %li= s_("GroupSettings|If the parent group's visibility is lower than the group current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.")
-    = f.submit s_('GroupSettings|Transfer group'), class: 'btn btn-warning'
+    .gl-display-flex.gl-justify-content-end
+      = f.submit s_('GroupSettings|Transfer group'), class: 'btn btn-warning'
 
 = render 'groups/settings/remove', group: @group
 = render_if_exists 'groups/settings/restore', group: @group

app/views/groups/settings/_export.html.haml

@@ -24,5 +24,6 @@
     = link_to _('Download export'), download_export_group_path(group),
         rel: 'nofollow', method: :get, class: 'btn btn-default', data: { qa_selector: 'download_export_link' }
   - else
-    = link_to _('Export group'), export_group_path(group),
-        method: :post, class: 'btn btn-default', data: { qa_selector: 'export_group_link' }
+    .gl-display-flex.gl-justify-content-end
+      = link_to _('Export group'), export_group_path(group),
+          method: :post, class: 'btn btn-default', data: { qa_selector: 'export_group_link' }

app/views/groups/settings/_general.html.haml

@@ -29,5 +29,5 @@
       = link_to _('Remove avatar'), group_avatar_path(@group.to_param), data: { confirm: _('Avatar will be removed. Are you sure?')}, method: :delete, class: 'btn btn-link'
 
   = render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
-
-  = f.submit _('Save changes'), class: 'btn btn-success mt-4 js-dirty-submit', data: { qa_selector: 'save_name_visibility_settings_button' }
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: 'btn btn-success mt-4 js-dirty-submit', data: { qa_selector: 'save_name_visibility_settings_button' }

app/views/groups/settings/_permanent_deletion.html.haml

@@ -5,5 +5,5 @@
       = _('Removing this group also removes all child projects, including archived projects, and their resources.')
       %br
       %strong= _('Removed group can not be restored!')
-
-    = button_to _('Remove group'), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }
+    .gl-display-flex.gl-justify-content-end
+      = button_to _('Remove group'), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }

app/views/groups/settings/_permissions.html.haml

@@ -41,5 +41,5 @@
     = render 'groups/settings/two_factor_auth', f: f
     = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group
     = render_if_exists 'groups/member_lock_setting', f: f, group: @group
-
-  = f.submit _('Save changes'), class: 'btn btn-success gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }
+  .gl-display-flex.gl-justify-content-end
+    = f.submit _('Save changes'), class: 'btn btn-success gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }