Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: broken badge groupings modal UI (#6653)

This commit is contained in:
Joffrey JAFFEUX 2018-11-22 17:09:45 +01:00 committed by GitHub
parent 052bf37578
commit 56478166e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
View File

@ -2,13 +2,15 @@
<div>
<ul class='badge-groupings'>
{{#each workingCopy as |wc|}}
<li>
{{#if wc.editing}}
{{input value=wc.name}}
<button {{action "save" wc}} class="btn no-text">{{d-icon 'check'}}</button>
{{else}}
{{wc.displayName}}
{{/if}}
<li class="badge-grouping-item">
<div class="badge-grouping">
{{#if wc.editing}}
{{input value=wc.name class="badge-grouping-name-input"}}
<button {{action "save" wc}} class="btn no-text">{{d-icon 'check'}}</button>
{{else}}
{{wc.displayName}}
{{/if}}
</div>
<div class='actions'>
<button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon 'pencil'}}</button>
<button {{action "up" wc}} class="btn no-text">{{d-icon 'toggle-up'}}</button>

15
app/assets/stylesheets/common/admin/badges.scss
View File

@ -126,11 +126,20 @@
list-style: none;
margin: 0;
padding: 10px 3px;
li {
padding: 6px 0;
width: 600px;
.badge-grouping-item {
border-bottom: 1px solid #dfdfdf;
display: flex;
justify-content: space-between;
align-items: center;
}
.badge-grouping {
.badge-grouping-name-input {
margin: 0;
}
}
.actions {
float: right;
.btn {