diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/dirty_submit/dirty_submit_form.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/edit/index.js | 17 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/app/assets/javascripts/dirty_submit/dirty_submit_form.js b/app/assets/javascripts/dirty_submit/dirty_submit_form.js index 00e41dd0301..765969daa32 100644 --- a/app/assets/javascripts/dirty_submit/dirty_submit_form.js +++ b/app/assets/javascripts/dirty_submit/dirty_submit_form.js @@ -1,4 +1,5 @@ import _ from 'underscore'; +import $ from 'jquery'; class DirtySubmitForm { constructor(form) { @@ -26,6 +27,7 @@ class DirtySubmitForm { ); this.form.addEventListener('input', throttledUpdateDirtyInput); this.form.addEventListener('change', throttledUpdateDirtyInput); + $(this.form).on('change.select2', throttledUpdateDirtyInput); this.form.addEventListener('submit', event => this.formSubmit(event)); } diff --git a/app/assets/javascripts/pages/projects/edit/index.js b/app/assets/javascripts/pages/projects/edit/index.js index 278c35d3846..8eec5ea78cd 100644 --- a/app/assets/javascripts/pages/projects/edit/index.js +++ b/app/assets/javascripts/pages/projects/edit/index.js @@ -3,17 +3,24 @@ import initSettingsPanels from '~/settings_panels'; import setupProjectEdit from '~/project_edit'; import initConfirmDangerModal from '~/confirm_danger_modal'; import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; +import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; import initAvatarPicker from '~/avatar_picker'; import initProjectLoadingSpinner from '../shared/save_project_loader'; import initProjectPermissionsSettings from '../shared/permissions'; document.addEventListener('DOMContentLoaded', () => { - initProjectLoadingSpinner(); - setupProjectEdit(); - // Initialize expandable settings panels - initSettingsPanels(); initAvatarPicker(); - initProjectPermissionsSettings(); initConfirmDangerModal(); + initSettingsPanels(); mountBadgeSettings(PROJECT_BADGE); + + initProjectLoadingSpinner(); + initProjectPermissionsSettings(); + setupProjectEdit(); + + dirtySubmitFactory( + document.querySelectorAll( + '.js-general-settings-form, .js-mr-settings-form, .js-add-approver-form', + ), + ); }); diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 1c23c14c2de..be544c0a814 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -157,6 +157,10 @@ label { padding-left: 10px; padding-right: 10px; appearance: none; + /* stylelint-disable property-no-vendor-prefix */ + -webkit-appearance: none; + -moz-appearance: none; + /* stylelint-enable property-no-vendor-prefix */ &::-ms-expand { display: none; diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 7b0538dca20..0a9c56f5625 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -39,7 +39,7 @@ .settings-header { position: relative; - padding: 20px 110px 10px 0; + padding: 20px 110px 0 0; h4 { margin-top: 0; |