##// END OF EJS Templates
Merge pull request #6645 from jdfreder/css_order...
Jonathan Frederic -
r18183:13bf5162 merge
parent child Browse files
Show More
@@ -481,9 +481,8 b' define(["widgets/js/manager",'
481
481
482 this.after_displayed(function() {
482 this.after_displayed(function() {
483 this.update_visible(this.model, this.model.get("visible"));
483 this.update_visible(this.model, this.model.get("visible"));
484 this.update_css(this.model, this.model.get("_css"));
485
486 this.update_classes([], this.model.get('_dom_classes'));
484 this.update_classes([], this.model.get('_dom_classes'));
485
487 this.update_attr('color', this.model.get('color'));
486 this.update_attr('color', this.model.get('color'));
488 this.update_attr('background', this.model.get('background_color'));
487 this.update_attr('background', this.model.get('background_color'));
489 this.update_attr('width', this.model.get('width'));
488 this.update_attr('width', this.model.get('width'));
@@ -498,6 +497,8 b' define(["widgets/js/manager",'
498 this.update_attr('padding', this.model.get('padding'));
497 this.update_attr('padding', this.model.get('padding'));
499 this.update_attr('margin', this.model.get('margin'));
498 this.update_attr('margin', this.model.get('margin'));
500 this.update_attr('border-radius', this.model.get('border_radius'));
499 this.update_attr('border-radius', this.model.get('border_radius'));
500
501 this.update_css(this.model, this.model.get("_css"));
501 }, this);
502 }, this);
502 },
503 },
503
504
General Comments 0
You need to be logged in to leave comments. Login now