Merge pull request #367 from ckeditor/t/ckeditor5/831

Fix: Button icon styles should not touch the dropdown's arrow. Closes ckeditor/ckeditor5#831.
ckeditor · Feb 9, 2018 · 507549f · 507549f
2 parents 052bfb1 + d19d71a
commit 507549f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/button/buttonview.js b/src/button/buttonview.js
@@ -151,6 +151,12 @@ export default class ButtonView extends View {
 
 			iconView.bind( 'content' ).to( this, 'icon' );
 
+			iconView.extendTemplate( {
+				attributes: {
+					class: 'ck-button__icon'
+				}
+			} );
+
 			this.children.add( iconView );
 		}
 

diff --git a/tests/button/buttonview.js b/tests/button/buttonview.js
@@ -248,6 +248,7 @@ describe( 'ButtonView', () => {
 
 			expect( view.iconView ).to.instanceOf( IconView );
 			expect( view.iconView.content ).to.equal( '<svg></svg>' );
+			expect( view.iconView.element.classList.contains( 'ck-button__icon' ) ).to.be.true;
 
 			view.icon = '<svg>bar</svg>';
 			expect( view.iconView.content ).to.equal( '<svg>bar</svg>' );

diff --git a/theme/components/button/button.css b/theme/components/button/button.css
@@ -3,7 +3,6 @@
  * For licensing, see LICENSE.md.
  */
 
-@import "./mixins/_button.css";
 @import "../../mixins/_unselectable.css";
 @import "../tooltip/mixins/_tooltip.css";
 

diff --git a/theme/components/button/mixins/_button.css b/theme/components/button/mixins/_button.css