Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge pull request #371 from ckeditor/t/ckeditor5-theme-lark/135
Browse files Browse the repository at this point in the history
Other: Removed the `.ck-editor-toolbar` and `.ck-editor-toolbar-container` classes (see ckeditor/ckeditor5-theme-lark#135).
  • Loading branch information
oleq committed Feb 16, 2018
2 parents a2d1b5e + 607defd commit 352d056
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions src/toolbar/contextual/contextualtoolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export default class ContextualToolbar extends Plugin {
this.toolbarView.extendTemplate( {
attributes: {
class: [
'ck-editor-toolbar',
'ck-toolbar_floating'
]
}
Expand Down Expand Up @@ -178,7 +177,7 @@ export default class ContextualToolbar extends Plugin {
this._balloon.add( {
view: this.toolbarView,
position: this._getBalloonPositionData(),
balloonClassName: 'ck-toolbar-container ck-editor-toolbar-container'
balloonClassName: 'ck-toolbar-container'
} );
}

Expand Down
5 changes: 2 additions & 3 deletions tests/toolbar/contextual/contextualtoolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ describe( 'ContextualToolbar', () => {
expect( contextualToolbar ).to.instanceOf( Plugin );
expect( contextualToolbar ).to.instanceOf( ContextualToolbar );
expect( contextualToolbar.toolbarView ).to.instanceof( ToolbarView );
expect( contextualToolbar.toolbarView.element.classList.contains( 'ck-editor-toolbar' ) ).to.be.true;
expect( contextualToolbar.toolbarView.element.classList.contains( 'ck-toolbar_floating' ) ).to.be.true;
} );

Expand Down Expand Up @@ -183,7 +182,7 @@ describe( 'ContextualToolbar', () => {

sinon.assert.calledWith( balloonAddSpy, {
view: contextualToolbar.toolbarView,
balloonClassName: 'ck-toolbar-container ck-editor-toolbar-container',
balloonClassName: 'ck-toolbar-container',
position: {
target: sinon.match.func,
positions: [
Expand Down Expand Up @@ -226,7 +225,7 @@ describe( 'ContextualToolbar', () => {

sinon.assert.calledWithExactly( balloonAddSpy, {
view: contextualToolbar.toolbarView,
balloonClassName: 'ck-toolbar-container ck-editor-toolbar-container',
balloonClassName: 'ck-toolbar-container',
position: {
target: sinon.match.func,
positions: [
Expand Down

0 comments on commit 352d056

Please sign in to comment.