Merge branch 'mle/sticky-settings-footer' into 'master'

Move "Save" in separate row for Profile and Preference settings pages

See merge request gitlab-org/gitlab!67306

app/assets/javascripts/profile/preferences/components/profile_preferences.vue

@@ -127,20 +127,18 @@ export default {
         :config="$options.integrationViewConfigs[view.name]"
       />
     </div>
-    <div class="col-lg-4 profile-settings-sidebar"></div>
-    <div class="col-lg-8">
-      <div class="form-group">
-        <gl-button
-          category="primary"
-          variant="confirm"
-          name="commit"
-          type="submit"
-          :disabled="!isSubmitEnabled"
-          :value="$options.i18n.saveChanges"
-        >
-          {{ $options.i18n.saveChanges }}
-        </gl-button>
-      </div>
+    <div class="col-sm-12">
+      <hr />
+      <gl-button
+        category="primary"
+        variant="confirm"
+        name="commit"
+        type="submit"
+        :disabled="!isSubmitEnabled"
+        :value="$options.i18n.saveChanges"
+      >
+        {{ $options.i18n.saveChanges }}
+      </gl-button>
     </div>
   </div>
 </template>

app/views/profiles/show.html.haml

@@ -122,10 +122,9 @@
       = f.check_box :include_private_contributions, label: s_('Profiles|Include private contributions on my profile'), wrapper_class: 'mb-2', inline: true
       .help-block
         = s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information")
-  .row.gl-justify-content-end.gl-mt-5
-    .col-lg-8.gl-display-flex
-      = f.submit s_("Profiles|Update profile settings"), class: 'gl-button btn btn-confirm gl-mr-3'
-      = link_to _("Cancel"), user_path(current_user), class: 'gl-button btn btn-default btn-cancel'
+  %hr
+  = f.submit s_("Profiles|Update profile settings"), class: 'gl-button btn btn-confirm gl-mr-3'
+  = link_to _("Cancel"), user_path(current_user), class: 'gl-button btn btn-default btn-cancel'
 
 .modal.modal-profile-crop{ data: { cropper_css_path: ActionController::Base.helpers.stylesheet_path('lazy_bundles/cropper.css') } }
   .modal-dialog