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 #1188 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 0934496 + 8730244 commit 5f65823
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/view/placeholder.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import extend from '@ckeditor/ckeditor5-utils/src/lib/lodash/extend';
import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import '../../theme/placeholder.scss';
import '../../theme/placeholder.css';

const listener = {};
extend( listener, EmitterMixin );
Expand Down
22 changes: 22 additions & 0 deletions tests/manual/nestededitable.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css";
@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css";

figure {
background-color: #f3f3f3;
padding: 10px;

& figcaption {
background: white;
outline: none;

&.focused {
@mixin ck-focus-ring;
@mixin ck-box-shadow var(--ck-inner-shadow);
}
}
}
2 changes: 1 addition & 1 deletion tests/manual/nestededitable.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import ViewEditableElement from '../../src/view/editableelement';
import { getData } from '../../src/dev-utils/model';
import global from '@ckeditor/ckeditor5-utils/src/dom/global';

import './nestededitable.scss';
import './nestededitable.css';

class NestedEditable extends Plugin {
init() {
Expand Down
25 changes: 0 additions & 25 deletions tests/manual/nestededitable.scss

This file was deleted.

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

.ck-placeholder::before {
content: attr( data-placeholder );

/* See ckeditor/ckeditor5#469. */
pointer-events: none;
}
9 changes: 0 additions & 9 deletions theme/placeholder.scss

This file was deleted.

0 comments on commit 5f65823

Please sign in to comment.