paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

org settings: Improve labels and styling for realm logo/avatar.

Browse Source
This commit is contained in:
Rishi Gupta
2018-12-18 12:34:02 -08:00
committed by Tim Abbott
parent 4bfea4cebe
commit cfc1138abc
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
static/styles/settings.scss
View File

@@ -80,6 +80,21 @@ label {
width: 214px; width: 214px;
} }
.subsection-header > h3 a {
color: inherit;
}
.subsection-header > h3 .fa-question-circle-o {
opacity: 0.4;
position: relative;
top: 1px;
left: 5px;
}
.subsection-header > h3 .fa-question-circle-o:hover {
opacity: 1;
}
.user-avatar-section, .user-avatar-section,
.realm-logo-section, .realm-logo-section,
.realm-icon-section { .realm-icon-section {
@@ -108,7 +123,7 @@ label {
.user-avatar-section .inline-block, .user-avatar-section .inline-block,
.realm-logo-section .inline-block, .realm-logo-section .inline-block,
.realm-icon-section .inline-block { .realm-icon-section .inline-block {
margin: 0px 20px 0px 0px; margin: 5px 20px 0px 0px;
vertical-align: top; vertical-align: top;
border-radius: 4px; border-radius: 4px;

12
static/templates/settings/organization-profile-admin.handlebars
View File

@@ -4,7 +4,11 @@
<div id="org-org-profile" class="org-subsection-parent"> <div id="org-org-profile" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Organization profile" }}</h3> <h3>{{t "Organization profile" }}
<a href="/help/create-your-organization-profile" target="_blank">
<i class="fa fa-question-circle-o" aria-hidden="true"></i>
</a>
</h3>
{{ partial "settings-save-discard-widget" "section_name" "org-profile" }} {{ partial "settings-save-discard-widget" "section_name" "org-profile" }}
</div> </div>
@@ -22,9 +26,7 @@
</div> </div>
</div> </div>
<h3>{{t "Organization avatar" }}</h3> <div>{{t "Organization avatar" }}</div>
<p>{{t "A square logo used to brand your Zulip organization." }}</p>
<div class="realm-icon-section"> <div class="realm-icon-section">
<div class="inline-block"> <div class="inline-block">
<img id="realm-settings-icon" src="{{ realm_icon_url }}"/> <img id="realm-settings-icon" src="{{ realm_icon_url }}"/>
@@ -35,7 +37,7 @@
<div id="realm_icon_file_input_error" class="alert text-error"></div> <div id="realm_icon_file_input_error" class="alert text-error"></div>
<button class="button rounded sea-green w-200 block input-size" <button class="button rounded sea-green w-200 block input-size"
id="realm_icon_upload_button"> id="realm_icon_upload_button">
<span id="upload_icon_button_text">{{t 'Upload new icon' }}</span> <span id="upload_icon_button_text">{{t 'Upload new avatar' }}</span>
<span id="upload_icon_spinner"></span> <span id="upload_icon_spinner"></span>
</button> </button>
<button class="button rounded btn-danger w-200 m-t-10 block input-size" <button class="button rounded btn-danger w-200 m-t-10 block input-size"