Przeglądaj źródła

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

Fix: Button icon styles should not touch the dropdown's arrow. Closes ckeditor/ckeditor5#831.
Aleksander Nowodzinski 7 lat temu
rodzic
commit
dbd5da0ba5

+ 6 - 0
packages/ckeditor5-ui/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 );
 		}
 

+ 1 - 0
packages/ckeditor5-ui/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>' );

+ 0 - 1
packages/ckeditor5-ui/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";
 

+ 0 - 13
packages/ckeditor5-ui/theme/components/button/mixins/_button.css

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-/**
- * A helper to define button–specific icon styles.
- */
-@define-mixin ck-button-icon {
-	& .ck-icon {
-		@mixin-content;
-	}
-}