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

Commit

Permalink
Merge branch 'master' into t/ckeditor5/578
Browse files Browse the repository at this point in the history
  • Loading branch information
oleq committed Mar 30, 2018
2 parents a09d6c5 + 173481c commit 583f740
Show file tree
Hide file tree
Showing 30 changed files with 85 additions and 87 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This package implements Lark theme — the default CKEditor 5 theme.

## Documentation

See the [`@ckeditor/ckeditor5-theme-lark` package](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/api/theme-lark.html) page in [CKEditor 5 documentation](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/).
See the [`@ckeditor/ckeditor5-theme-lark` package](https://docs.ckeditor.com/ckeditor5/latest/api/theme-lark.html) page in [CKEditor 5 documentation](https://docs.ckeditor.com/ckeditor5/latest/).

## License

Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/theme-lark.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="snippet-classic-editor">
<p>
This is <a href="https://ckeditor5.github.io">CKEditor&nbsp;5</a>.
This is <a href="https://ckeditor.com">CKEditor&nbsp;5</a>.
</p>
<p>
It uses the default
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/theme-lark.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset';
import EasyImage from '@ckeditor/ckeditor5-easy-image/src/easyimage';
import { CS_CONFIG } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
import './custom.css';

ClassicEditor
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"@ckeditor/ckeditor5-alignment": "^1.0.0-beta.1",
"@ckeditor/ckeditor5-basic-styles": "^1.0.0-beta.1",
"@ckeditor/ckeditor5-cloudservices": "^1.0.0-beta.1",
"@ckeditor/ckeditor5-cloud-services": "^1.0.0-beta.1",
"@ckeditor/ckeditor5-core": "^1.0.0-beta.1",
"@ckeditor/ckeditor5-editor-balloon": "^1.0.0-beta.1",
"@ckeditor/ckeditor5-editor-classic": "^1.0.0-beta.1",
Expand All @@ -26,15 +26,15 @@
"eslint": "^4.15.0",
"eslint-config-ckeditor5": "^1.0.7",
"husky": "^0.14.3",
"lint-staged": "^6.0.0"
"lint-staged": "^7.0.0"
},
"engines": {
"node": ">=6.0.0",
"npm": ">=3.0.0"
},
"author": "CKSource (http://cksource.com/)",
"license": "(GPL-2.0 OR LGPL-2.1 OR MPL-1.1)",
"homepage": "https://ckeditor5.github.io",
"homepage": "https://ckeditor.com",
"bugs": "https://github.com/ckeditor/ckeditor5-theme-lark/issues",
"repository": {
"type": "git",
Expand Down
28 changes: 14 additions & 14 deletions tests/manual/theme.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ <h3>Icon: In–text</h3>
<h2>Button</h2>

<h3>Button: States</h3>
<div id="button-states" class="ck-reset_all"></div>
<div id="button-states" class="ck ck-reset_all"></div>

<h3>Button: Types</h3>
<div id="button-types" class="ck-reset_all"></div>
<div id="button-types" class="ck ck-reset_all"></div>

<h3>Button: Icon</h3>
<div class="ck-reset_all" >
<div class="ck ck-reset_all" >
<div id="button-icon" class="wrappable"></div>

<br/>
Expand All @@ -66,40 +66,40 @@ <h3>Button: Responsiveness</h3>
</div>

<h3>Button: Tooltip</h3>
<div id="button-tooltip" class="ck-reset_all"></div>
<div id="button-tooltip" class="ck ck-reset_all"></div>

<h2>Dropdown</h2>

<h3>ListDropdown</h3>
<div id="list-dropdown" class="ck-reset_all"></div>
<div id="list-dropdown" class="ck ck-reset_all"></div>

<h3>ButtonDropdown</h3>
<div id="button-dropdown" class="ck-reset_all"></div>
<div id="button-dropdown" class="ck ck-reset_all"></div>

<h2>Toolbar</h2>

<h3>Toolbar: Text</h3>
<div id="toolbar-text" class="ck-reset_all"></div>
<div id="toolbar-text" class="ck ck-reset_all"></div>

<h3>Toolbar: Button</h3>
<div id="toolbar-button" class="ck-reset_all"></div>
<div id="toolbar-button" class="ck ck-reset_all"></div>

<h3>Toolbar: Rounded</h3>
<div id="toolbar-rounded" class="ck-reset_all ck-rounded-corners"></div>
<div id="toolbar-rounded" class="ck ck-reset_all ck-rounded-corners"></div>

<h3>Toolbar: Wrapping content</h3>
<div id="toolbar-wrap" class="ck-reset_all"></div>
<div id="toolbar-wrap" class="ck ck-reset_all"></div>

<h3>Toolbar: Item separators</h3>
<div id="toolbar-separator" class="ck-reset_all"></div>
<div id="toolbar-separator" class="ck ck-reset_all"></div>

<h3>Toolbar: Multi-row</h3>
<div id="toolbar-multi-row" class="ck-reset_all"></div>
<div id="toolbar-multi-row" class="ck ck-reset_all"></div>

<h2>Inputs</h2>

<h3>Labeled</h3>
<div id="input-labeled" class="ck-reset_all"></div>
<div id="input-labeled" class="ck ck-reset_all"></div>

<h3>Read–only</h3>
<div id="input-read-only" class="ck-reset_all"></div>
<div id="input-read-only" class="ck ck-reset_all"></div>
4 changes: 2 additions & 2 deletions theme/ckeditor5-editor-classic/classiceditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@import "../mixins/_rounded.css";

.ck-editor__top {
.ck.ck-editor__top {
& .ck-sticky-panel {
& .ck-toolbar {
@mixin ck-rounded-corners {
Expand All @@ -27,7 +27,7 @@
}

/* Note: Use ck-editor__main to make sure these styles don't apply to other editor types */
.ck-editor__main > .ck-editor__editable {
.ck.ck-editor__main > .ck-editor__editable {
/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/113 */
background: var(--ck-color-base-background);

Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-engine/placeholder.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* For licensing, see LICENSE.md.
*/

.ck-placeholder::before {
.ck.ck-placeholder::before {
cursor: text;
color: var(--ck-color-engine-placeholder-text);
}
2 changes: 1 addition & 1 deletion theme/ckeditor5-heading/heading.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/* Resize dropdown's button label. */
.ck-dropdown.ck-heading-dropdown {
.ck.ck-dropdown.ck-heading-dropdown {
& .ck-dropdown__button .ck-button__label {
width: 8em;
}
Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-image/imageuploadprogress.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
--ck-image-upload-progress-line-width: 30px;
}

figure.image {
.ck.image {
/* Showing animation. */
&.ck-appear {
animation: fadeIn 700ms;
Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-image/textalternativeform.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* For licensing, see LICENSE.md.
*/

.ck-text-alternative-form {
.ck.ck-text-alternative-form {
padding: var(--ck-spacing-standard);

&:focus {
Expand Down
3 changes: 1 addition & 2 deletions theme/ckeditor5-link/link.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

/* Class added to span element surrounding currently selected link. */
.ck-link_selected {
.ck.ck-link_selected {
background: var(--ck-color-link-selected-background);
outline: 1px solid var(--ck-color-link-selected-background);
}
2 changes: 1 addition & 1 deletion theme/ckeditor5-link/linkactions.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@import "../mixins/_focus.css";
@import "../mixins/_shadow.css";

.ck-link-actions {
.ck.ck-link-actions {
padding: var(--ck-spacing-standard);

& .ck-button.ck-link-actions__preview {
Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-link/linkform.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* For licensing, see LICENSE.md.
*/

.ck-link-form {
.ck.ck-link-form {
padding: var(--ck-spacing-standard);

&:focus {
Expand Down
13 changes: 7 additions & 6 deletions theme/ckeditor5-ui/components/button/button.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
@import "../../../mixins/_rounded.css";
@import "../../mixins/_button.css";

.ck-button,
a.ck-button {
.ck.ck-button,
a.ck.ck-button {
@mixin ck-button-colors --ck-color-button-default;
@mixin ck-rounded-corners;

Expand All @@ -34,6 +34,7 @@ a.ck-button {
/* Avoid flickering when the foucs border shows up. */
border: 1px solid transparent;

&:active,
&:focus {
@mixin ck-focus-ring;
@mixin ck-box-shadow var(--ck-focus-outer-shadow);
Expand Down Expand Up @@ -97,14 +98,14 @@ a.ck-button {
}

/* A style of the button which handles the primary action. */
.ck-button-action,
a.ck-button-action {
.ck.ck-button-action,
a.ck.ck-button-action {
@mixin ck-button-colors --ck-color-button-action;

color: var(--ck-color-button-action-text);
}

.ck-button-bold,
a.ck-button-bold {
.ck.ck-button-bold,
a.ck.ck-button-bold {
font-weight: bold;
}
4 changes: 2 additions & 2 deletions theme/ckeditor5-ui/components/dropdown/dropdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
--ck-dropdown-arrow-size: calc(0.5 * var(--ck-icon-size));
}

.ck-dropdown {
.ck.ck-dropdown {
/* Enable font size inheritance, which allows fluid UI scaling. */
font-size: inherit;

Expand Down Expand Up @@ -53,7 +53,7 @@
}
}

.ck-dropdown__panel {
.ck.ck-dropdown__panel {
@mixin ck-rounded-corners;
@mixin ck-drop-shadow;

Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/dropdown/listdropdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@import "../../../mixins/_rounded.css";

.ck-dropdown .ck-dropdown__panel .ck-list {
.ck.ck-dropdown .ck-dropdown__panel .ck-list {
/* Disabled radius of top-left border to be consistent with .dropdown__button
https://github.com/ckeditor/ckeditor5/issues/816 */
@mixin ck-rounded-corners {
Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/dropdown/splitbutton.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
--ck-color-split-button-hover-border: hsl(0, 0%, 70%);
}

.ck-splitbutton {
.ck.ck-splitbutton {
& > .ck-splitbutton__action {
/* Don't round the first button on the right side */
@mixin ck-rounded-corners {
Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/dropdown/toolbardropdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* For licensing, see LICENSE.md.
*/

.ck-toolbar-dropdown .ck-toolbar {
.ck.ck-toolbar-dropdown .ck-toolbar {
border: 0;
}
8 changes: 4 additions & 4 deletions theme/ckeditor5-ui/components/editorui/editorui.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@import "../../../mixins/_focus.css";
@import "../../mixins/_button.css";

.ck-editor__editable:not(.ck-editor__nested-editable) {
.ck.ck-editor__editable:not(.ck-editor__nested-editable) {
@mixin ck-rounded-corners;

&.ck-focused {
Expand All @@ -18,7 +18,7 @@
}
}

.ck-editor__editable_inline {
.ck.ck-editor__editable_inline {
overflow: auto;
padding: 0 var(--ck-spacing-standard);
border: 1px solid transparent;
Expand All @@ -35,13 +35,13 @@
}

/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/111 */
.ck-toolbar-container[class*="arrow_n"] {
.ck.ck-toolbar-container[class*="arrow_n"] {
&::after {
border-bottom-color: var(--ck-color-base-foreground);
}
}

.ck-toolbar-container[class*="arrow_s"] {
.ck.ck-toolbar-container[class*="arrow_s"] {
&::after {
border-top-color: var(--ck-color-base-foreground);
}
Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/icon/icon.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
--ck-icon-size: calc(var(--ck-line-height-base) * var(--ck-font-size-normal));
}

svg.ck-icon {
.ck.ck-icon {
width: var(--ck-icon-size);
height: var(--ck-icon-size);

Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/inputtext/inputtext.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
--ck-input-text-width: 18em;
}

.ck-input-text {
.ck.ck-input-text {
@mixin ck-rounded-corners;
@mixin ck-box-shadow var(--ck-inner-shadow);

Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/label/label.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* For licensing, see LICENSE.md.
*/

.ck-label {
.ck.ck-label {
font-weight: bold;
}
6 changes: 3 additions & 3 deletions theme/ckeditor5-ui/components/list/list.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
@import "../../../mixins/_rounded.css";
@import "../../../mixins/_shadow.css";

.ck-list {
.ck.ck-list {
@mixin ck-rounded-corners;

list-style-type: none;
background: var(--ck-color-list-background);
}

.ck-list__item {
.ck.ck-list__item {
padding: var(--ck-spacing-medium);
cursor: default;
min-width: 12em;
Expand All @@ -30,7 +30,7 @@
}
}

.ck-list__item_active {
.ck.ck-list__item_active {
background: var(--ck-color-list-item-background-active);
color: var(--ck-color-list-item-text-active);

Expand Down
2 changes: 1 addition & 1 deletion theme/ckeditor5-ui/components/panel/balloonpanel.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
--ck-balloon-arrow-half-width: 8px;
}

.ck-balloon-panel {
.ck.ck-balloon-panel {
@mixin ck-rounded-corners;
@mixin ck-drop-shadow;

Expand Down
Loading

0 comments on commit 583f740

Please sign in to comment.