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

FIX: better alignment of badge selector and edit btn (#6651) 

Input located at /admin/badges/new
This commit is contained in:
Joffrey JAFFEUX 2018-11-22 16:21:15 +01:00 committed by GitHub
parent e77cc44f07
commit 2843944315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/admin/templates/badges-show.hbs
View File

@ -32,11 +32,15 @@
<div> <div>
<label for="badge_grouping_id">{{i18n 'admin.badges.badge_grouping'}}</label> <label for="badge_grouping_id">{{i18n 'admin.badges.badge_grouping'}}</label>
{{combo-box name="badge_grouping_id"
value=buffered.badge_grouping_id <div class="badge-grouping-control">
content=badgeGroupings {{combo-box name="badge_grouping_id"
nameProperty="name"}} value=buffered.badge_grouping_id
&nbsp;<button {{action "editGroupings"}} class='btn btn-icon btn-default'>{{d-icon 'pencil'}}</button> content=badgeGroupings
class="badge-selector"
nameProperty="name"}}
<button {{action "editGroupings"}} class='btn btn-icon no-text btn-default'>{{d-icon 'pencil'}}</button>
</div>
</div> </div>

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

@ -21,6 +21,15 @@
color: dark-light-choose($primary-medium, $secondary-medium); color: dark-light-choose($primary-medium, $secondary-medium);
font-size: $font-down-1; font-size: $font-down-1;
} }
.badge-grouping-control {
display: flex;
align-items: center;
.badge-selector {
margin-right: 5px;
}
}
} }
.form-horizontal { .form-horizontal {
.ace-wrapper { .ace-wrapper {