diff --git a/static/styles/settings.scss b/static/styles/settings.scss index 8e8d518e5c..7a606b4c43 100644 --- a/static/styles/settings.scss +++ b/static/styles/settings.scss @@ -663,7 +663,7 @@ input[type=checkbox] { height: 200px; } -.realm-icon-section .avatar-icon-settings { +.realm-icon-section .avatar-icon-logo-settings { width: 100px; height: 100px; } @@ -1185,7 +1185,7 @@ input[type=checkbox] { font-size: 1.2em; } -.avatar-icon-settings { +.avatar-icon-logo-settings { position: relative; border-radius: 5px; box-shadow: 0px 0px 10px hsla(0, 0%, 0%, 0.1); @@ -1257,6 +1257,11 @@ input[type=checkbox] { right: 18px; } + .realm_logo_delete { + top: 17px; + right: 80px; + } + .settings-page-upload-text { cursor: pointer; font-size: 0.85rem; diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs index c53cccedcd..e84ea5da6c 100644 --- a/static/templates/settings/account_settings.hbs +++ b/static/templates/settings/account_settings.hbs @@ -156,7 +156,7 @@

{{t "Profile picture" }}

-
+
diff --git a/static/templates/settings/organization_profile_admin.hbs b/static/templates/settings/organization_profile_admin.hbs index a15da530bd..792991fce2 100644 --- a/static/templates/settings/organization_profile_admin.hbs +++ b/static/templates/settings/organization_profile_admin.hbs @@ -28,7 +28,7 @@
{{t "Organization profile picture" }}
-
+
{{#if is_admin}}
diff --git a/static/templates/settings/realm-logo-widget.hbs b/static/templates/settings/realm-logo-widget.hbs index 9deebc4c1f..a579d81829 100644 --- a/static/templates/settings/realm-logo-widget.hbs +++ b/static/templates/settings/realm-logo-widget.hbs @@ -1,5 +1,14 @@
-
+
+ {{#if (and is_admin zulip_plan_is_not_limited)}} +
+ + × + + + {{t 'Delete logo' }} + + {{/if}} @@ -12,9 +21,6 @@ {{t 'Upload new logo' }} - {{/if}}
{{/if}}