diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js index 0520ef062b..cc2cff1ba9 100644 --- a/frontend_tests/node_tests/settings_org.js +++ b/frontend_tests/node_tests/settings_org.js @@ -986,25 +986,25 @@ run_test('misc', () => { page_params.server_avatar_changes_disabled = false; settings_account.update_avatar_change_display(); assert.equal($("#user_avatar_upload_button .button").attr('disabled'), false); - assert.equal($("#user_avatar_delete_button .button").attr('disabled'), false); + assert.equal($("#user-avatar-upload-widget .settings-page-delete-button .button").attr('disabled'), false); page_params.realm_avatar_changes_disabled = true; page_params.server_avatar_changes_disabled = false; settings_account.update_avatar_change_display(); assert.equal($("#user_avatar_upload_button .button").attr('disabled'), 'disabled'); - assert.equal($("#user_avatar_delete_button .button").attr('disabled'), 'disabled'); + assert.equal($("#user-avatar-upload-widget .settings-page-delete-button .button").attr('disabled'), 'disabled'); page_params.realm_avatar_changes_disabled = false; page_params.server_avatar_changes_disabled = true; settings_account.update_avatar_change_display(); assert.equal($("#user_avatar_upload_button .button").attr('disabled'), 'disabled'); - assert.equal($("#user_avatar_delete_button .button").attr('disabled'), 'disabled'); + assert.equal($("#user-avatar-upload-widget .settings-page-delete-button .button").attr('disabled'), 'disabled'); page_params.realm_avatar_changes_disabled = true; page_params.server_avatar_changes_disabled = true; settings_account.update_avatar_change_display(); assert.equal($("#user_avatar_upload_button .button").attr('disabled'), 'disabled'); - assert.equal($("#user_avatar_delete_button .button").attr('disabled'), 'disabled'); + assert.equal($("#user-avatar-upload-widget .settings-page-delete-button .button").attr('disabled'), 'disabled'); // If organization admin, these UI elements are never disabled. page_params.is_admin = true; diff --git a/static/js/avatar.js b/static/js/avatar.js index f3b69dff85..13fd346abc 100644 --- a/static/js/avatar.js +++ b/static/js/avatar.js @@ -46,13 +46,13 @@ exports.build_user_avatar_widget = function (upload_function) { }; if (page_params.avatar_source === 'G') { - $("#user_avatar_delete_button").hide(); + $("#user-avatar-upload-widget .settings-page-delete-button").hide(); $("#user-avatar-source").show(); } else { $("#user-avatar-source").hide(); } - $("#user_avatar_delete_button").on('click keydown', function (e) { + $("#user-avatar-upload-widget .settings-page-delete-button").on('click keydown', function (e) { e.preventDefault(); e.stopPropagation(); channel.del({ diff --git a/static/js/settings_account.js b/static/js/settings_account.js index 2ceaecd738..d62d6f61d4 100644 --- a/static/js/settings_account.js +++ b/static/js/settings_account.js @@ -68,17 +68,17 @@ exports.update_email_change_display = function () { exports.update_avatar_change_display = function () { if (!exports.user_can_change_avatar()) { $('#user_avatar_upload_button .button').attr('disabled', 'disabled'); - $('#user_avatar_delete_button .button').attr('disabled', 'disabled'); + $("#user-avatar-upload-widget .settings-page-delete-button .button").attr('disabled', 'disabled'); } else { $('#user_avatar_upload_button .button').attr('disabled', false); - $('#user_avatar_delete_button .button').attr('disabled', false); + $('#user-avatar-upload-widget .settings-page-delete-button .button').attr('disabled', false); } }; function display_avatar_upload_complete() { $('#avatar-spinner-background').css({visibility: 'hidden'}); $('#user_avatar_upload_button').show(); - $('#user_avatar_delete_button').show(); + $('#user-avatar-upload-widget .settings-page-delete-button').show(); } @@ -86,7 +86,7 @@ function display_avatar_upload_started() { $("#user-avatar-source").hide(); $('#avatar-spinner-background').css({visibility: 'visible'}); $('#user_avatar_upload_button').hide(); - $('#user_avatar_delete_button').hide(); + $('#user-avatar-upload-widget .settings-page-delete-button').hide(); } diff --git a/static/styles/settings.scss b/static/styles/settings.scss index 5de2dbbef6..a986a25609 100644 --- a/static/styles/settings.scss +++ b/static/styles/settings.scss @@ -1193,6 +1193,10 @@ input[type=checkbox] { z-index: 99; } + .settings-page-delete-button { + font-size: 3rem; + } + } .avatar-icon-logo-settings { diff --git a/static/templates/settings/image_upload_widget.hbs b/static/templates/settings/image_upload_widget.hbs index 4eff34f5c4..c6019a2958 100644 --- a/static/templates/settings/image_upload_widget.hbs +++ b/static/templates/settings/image_upload_widget.hbs @@ -2,7 +2,7 @@ {{#if is_editable_by_current_user}}