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 #158 from ckeditor/t/ckeditor5-ui/144
Browse files Browse the repository at this point in the history
Other: Migrated package styles to PostCSS. Moved visual styles to ckeditor5-theme-lark (see ckeditor/ckeditor5-ui#144).
  • Loading branch information
oleq authored Nov 30, 2017
2 parents ef2712c + b46b8d6 commit ed6e1cf
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 114 deletions.
2 changes: 1 addition & 1 deletion src/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Widget from '@ckeditor/ckeditor5-widget/src/widget';
import ImageTextAlternative from './imagetextalternative';
import { isImageWidgetSelected } from './image/utils';

import '../theme/theme.scss';
import '../theme/image.css';

/**
* The image plugin.
Expand Down
3 changes: 2 additions & 1 deletion src/imagecaption.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
import ImageCaptionEngine from './imagecaption/imagecaptionengine';
import '../theme/imagecaption/theme.scss';

import '../theme/imagecaption.css';

/**
* The image caption plugin.
Expand Down
2 changes: 2 additions & 0 deletions src/imagestyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
import ImageStyleEngine from './imagestyle/imagestyleengine';
import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';

import '../theme/imagestyle.css';

/**
* The image style plugin.
*
Expand Down
2 changes: 0 additions & 2 deletions src/imagetextalternative.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import textAlternativeIcon from '@ckeditor/ckeditor5-core/theme/icons/low-vision
import { repositionContextualBalloon, getBalloonPositionData } from './image/ui/utils';
import { isImageWidgetSelected } from './image/utils';

import '../theme/imagetextalternative/theme.scss';

/**
* The image text alternative plugin.
*
Expand Down
2 changes: 2 additions & 0 deletions src/imagetextalternative/ui/textalternativeformview.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import KeystrokeHandler from '@ckeditor/ckeditor5-utils/src/keystrokehandler';
import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
import FocusCycler from '@ckeditor/ckeditor5-ui/src/focuscycler';

import '../../../theme/textalternativeform.css';

/**
* The TextAlternativeFormView class.
*
Expand Down
15 changes: 15 additions & 0 deletions theme/image.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

.ck-editor__editable {
& .image {
clear: both;

& > img {
/* Prevent unnecessary margins caused by line-height (see #44). */
display: block;
}
}
}
4 changes: 4 additions & 0 deletions theme/imagecaption.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/*
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/
21 changes: 0 additions & 21 deletions theme/imagecaption/theme.scss

This file was deleted.

4 changes: 4 additions & 0 deletions theme/imagestyle.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/*
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/
37 changes: 0 additions & 37 deletions theme/imagetextalternative/theme.scss

This file was deleted.

20 changes: 20 additions & 0 deletions theme/textalternativeform.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

.cke-text-alternative-form {
overflow: hidden;
}

.cke-text-alternative-form__actions {
clear: both;

& .ck-button {
float: right;

& + .ck-button + .ck-button {
float: left;
}
}
}
52 changes: 0 additions & 52 deletions theme/theme.scss

This file was deleted.

0 comments on commit ed6e1cf

Please sign in to comment.