merge editor.css fix from upstream