Merge remote-tracking branch 'origin/master' into brand-name-protection

This commit is contained in:
Bryan Housel
2018-11-26 15:27:56 -05:00
31 changed files with 546 additions and 171 deletions
+10 -6
View File
@@ -310,20 +310,24 @@ export function uiFieldLocalized(field, context) {
var label = wrap
.append('label')
.attr('class', 'form-label')
.text(t('translate.localized_translation_label'))
.attr('for', 'localized-lang');
label
.append('span')
.attr('class', 'label-text')
.text(t('translate.localized_translation_label'));
label
.append('div')
.attr('class', 'form-label-button-wrap')
.append('button')
.attr('class', 'minor remove')
.on('click', function(d) {
.attr('class', 'minor remove-icon')
.on('click', function(d){
if (_isLocked) return;
d3_event.preventDefault();
var t = {};
t[key(d.lang)] = undefined;
dispatch.call('change', this, t);
d3_select(this.parentNode.parentNode)
d3_select(this.parentNode.parentNode.parentNode)
.style('top', '0')
.style('max-height', '240px')
.transition()