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

org settings: Fix error handling for upload custom emoji.

Browse Source
This commit is contained in:
Balaji2198
2018-03-29 10:51:46 +05:30
committed by Tim Abbott
parent 9156591406
commit 591e152e38
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/styles/settings.css
View File

@@ -572,8 +572,7 @@ input[type=checkbox].inline-block {
padding: 6px; padding: 6px;
} }
.add-new-emoji-box #emoji-file-name, .add-new-emoji-box #emoji-file-name {
.add-new-emoji-box #emoji_file_input_error {
width: 0; width: 0;
top: -19px; top: -19px;
left: 3px; left: 3px;
@@ -585,6 +584,10 @@ input[type=checkbox].inline-block {
font-style: italic; font-style: italic;
} }
#emoji_file_input_error {
vertical-align: middle;
}
.add-new-emoji-box #emoji-file-name { .add-new-emoji-box #emoji-file-name {
color: hsl(0, 0%, 66%); color: hsl(0, 0%, 66%);
} }

2
static/templates/settings/emoji-settings-admin.handlebars
View File

@@ -17,12 +17,12 @@
id="emoji_file_input" value="{{t 'Upload emoji' }}"/> id="emoji_file_input" value="{{t 'Upload emoji' }}"/>
<button class="button white rounded display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button> <button class="button white rounded display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button>
<button class="button rounded" id="emoji_upload_button">{{t "Upload emoji" }}</button> <button class="button rounded" id="emoji_upload_button">{{t "Upload emoji" }}</button>
<span id="emoji_file_input_error" class="text-error"></span>
</div> </div>
<button id="admin_emoji_submit" type="submit" class="button rounded sea-green"> <button id="admin_emoji_submit" type="submit" class="button rounded sea-green">
{{t 'Add emoji' }} {{t 'Add emoji' }}
</button> </button>
</div> </div>
<span id="emoji_file_input_error" class="text-error"></span>
</div> </div>
</form> </form>
<div class="admin-table-wrapper"> <div class="admin-table-wrapper">