Bladeren bron

Merge branch 'master' into i/6415

Aleksander Nowodzinski 5 jaren geleden
bovenliggende
commit
edf7df482d

+ 13 - 0
packages/ckeditor5-theme-lark/CHANGELOG.md

@@ -1,6 +1,19 @@
 Changelog
 =========
 
+## [18.0.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v17.0.0...v18.0.0) (2020-03-19)
+
+### Features
+
+* Brought styles for the new [`BalloonPanelView.defaultPositions`](https://ckeditor.com/docs/ckeditor5/latest/api/module_ui_panel_balloon_balloonpanelview-BalloonPanelView.html#static-member-defaultPositions). Adjusted toolbar styles for better items grouping in different scenarios (see [ckeditor/ckeditor5#5597](https://github.com/ckeditor/ckeditor5/issues/5597)). ([0c17040](https://github.com/ckeditor/ckeditor5-theme-lark/commit/0c17040))
+* Introduced RTL support to the table and table cell property forms (see [ckeditor/ckeditor5#6107](https://github.com/ckeditor/ckeditor5/issues/6107)). ([931351c](https://github.com/ckeditor/ckeditor5-theme-lark/commit/931351c))
+
+### Bug fixes
+
+* The focused table cell background color should blend with the pre-existing cell background rather than completely override it. Closes [ckeditor/ckeditor5#6229](https://github.com/ckeditor/ckeditor5/issues/6229). ([f5312ed](https://github.com/ckeditor/ckeditor5-theme-lark/commit/f5312ed))
+* Pointer inside a restricted editing exception should be set to text for all the children. Closes [ckeditor/ckeditor5#6272](https://github.com/ckeditor/ckeditor5/issues/6272). ([a20d13b](https://github.com/ckeditor/ckeditor5-theme-lark/commit/a20d13b))
+
+
 ## [17.0.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v16.0.0...v17.0.0) (2020-02-19)
 
 ### MAJOR BREAKING CHANGES

+ 24 - 24
packages/ckeditor5-theme-lark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-theme-lark",
-  "version": "17.0.0",
+  "version": "18.0.0",
   "description": "A bright theme for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,31 +9,31 @@
     "ckeditor5-theme"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^17.0.0"
+    "@ckeditor/ckeditor5-ui": "^18.0.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": "^17.0.0",
-    "@ckeditor/ckeditor5-basic-styles": "^17.0.0",
-    "@ckeditor/ckeditor5-code-block": "^17.0.0",
-    "@ckeditor/ckeditor5-ckfinder": "^17.0.0",
-    "@ckeditor/ckeditor5-core": "^17.0.0",
-    "@ckeditor/ckeditor5-editor-balloon": "^17.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^17.0.0",
-    "@ckeditor/ckeditor5-font": "^17.0.0",
-    "@ckeditor/ckeditor5-heading": "^17.0.0",
-    "@ckeditor/ckeditor5-highlight": "^17.0.0",
-    "@ckeditor/ckeditor5-indent": "^17.0.0",
-    "@ckeditor/ckeditor5-link": "^17.0.0",
-    "@ckeditor/ckeditor5-list": "^17.0.0",
-    "@ckeditor/ckeditor5-media-embed": "^17.0.0",
-    "@ckeditor/ckeditor5-page-break": "^17.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^17.0.0",
-    "@ckeditor/ckeditor5-remove-format": "^17.0.0",
-    "@ckeditor/ckeditor5-restricted-editing": "^17.0.0",
-    "@ckeditor/ckeditor5-special-characters": "^17.0.0",
-    "@ckeditor/ckeditor5-undo": "^17.0.0",
-    "@ckeditor/ckeditor5-utils": "^17.0.0",
-    "@ckeditor/ckeditor5-table": "^17.0.0",
+    "@ckeditor/ckeditor5-alignment": "^18.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "^18.0.0",
+    "@ckeditor/ckeditor5-code-block": "^18.0.0",
+    "@ckeditor/ckeditor5-ckfinder": "^18.0.0",
+    "@ckeditor/ckeditor5-core": "^18.0.0",
+    "@ckeditor/ckeditor5-editor-balloon": "^18.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^18.0.0",
+    "@ckeditor/ckeditor5-font": "^18.0.0",
+    "@ckeditor/ckeditor5-heading": "^18.0.0",
+    "@ckeditor/ckeditor5-highlight": "^18.0.0",
+    "@ckeditor/ckeditor5-indent": "^18.0.0",
+    "@ckeditor/ckeditor5-link": "^18.0.0",
+    "@ckeditor/ckeditor5-list": "^18.0.0",
+    "@ckeditor/ckeditor5-media-embed": "^18.0.0",
+    "@ckeditor/ckeditor5-page-break": "^18.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^18.0.0",
+    "@ckeditor/ckeditor5-remove-format": "^18.0.0",
+    "@ckeditor/ckeditor5-restricted-editing": "^18.0.0",
+    "@ckeditor/ckeditor5-special-characters": "^18.0.0",
+    "@ckeditor/ckeditor5-undo": "^18.0.0",
+    "@ckeditor/ckeditor5-utils": "^18.0.0",
+    "@ckeditor/ckeditor5-table": "^18.0.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^2.0.0",
     "husky": "^1.3.1",

+ 5 - 4
packages/ckeditor5-theme-lark/tests/manual/theme.js

@@ -20,8 +20,9 @@ import { createDropdown, addListToDropdown, addToolbarToDropdown } from '@ckedit
 
 import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
 import ToolbarSeparatorView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarseparatorview';
-import InputTextView from '@ckeditor/ckeditor5-ui/src/inputtext/inputtextview';
-import LabeledInputView from '@ckeditor/ckeditor5-ui/src/labeledinput/labeledinputview';
+
+import LabeledFieldView from '@ckeditor/ckeditor5-ui/src/labeledfield/labeledfieldview';
+import { createLabeledInputText } from '@ckeditor/ckeditor5-ui/src/labeledfield/utils';
 
 import boldIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/bold.svg';
 import italicIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/italic.svg';
@@ -636,9 +637,9 @@ function input( {
 	isReadOnly = false,
 	value = 'The value of the input'
 } = {} ) {
-	const labeledInput = new LabeledInputView( {}, InputTextView );
+	const labeledInput = new LabeledFieldView( {}, createLabeledInputText );
 
-	labeledInput.set( { isReadOnly, label, value } );
+	labeledInput.fieldView.set( { isReadOnly, label, value } );
 
 	return labeledInput;
 }

+ 1 - 1
packages/ckeditor5-theme-lark/theme/ckeditor5-special-characters/charactergrid.css

@@ -16,7 +16,7 @@
 	max-height: 200px;
 
 	& .ck-character-grid__tiles {
-		margin: var(--ck-spacing-standard);
+		margin: var(--ck-spacing-standard) var(--ck-spacing-large);
 		grid-gap: var(--ck-spacing-standard);
 	}
 

+ 1 - 2
packages/ckeditor5-theme-lark/theme/ckeditor5-special-characters/characterinfo.css

@@ -4,7 +4,7 @@
  */
 
 .ck.ck-character-info {
-	padding: var(--ck-spacing-small) var(--ck-spacing-standard);
+	padding: var(--ck-spacing-small) var(--ck-spacing-large);
 	border-top: 1px solid var(--ck-color-base-border);
 
 	& > * {
@@ -22,4 +22,3 @@
 		opacity: .6;
 	}
 }
-

+ 1 - 1
packages/ckeditor5-theme-lark/theme/ckeditor5-special-characters/specialcharacters.css

@@ -7,7 +7,7 @@
 
 .ck.ck-special-characters-navigation {
 	border-bottom: 1px solid var(--ck-color-base-border);
-	padding: var(--ck-spacing-standard);
+	padding: var(--ck-spacing-standard) var(--ck-spacing-large);
 
 	@mixin ck-dir ltr {
 		padding-left: var(--ck-spacing-large);

+ 0 - 19
packages/ckeditor5-theme-lark/theme/ckeditor5-table/formheader.css

@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-
-:root {
-	--ck-table-form-header-height: 38px;
-}
-
-.ck.ck-form__header {
-	padding: 0 var(--ck-spacing-large);
-	height: var(--ck-table-form-header-height);
-	line-height: var(--ck-table-form-header-height);
-	border-bottom: 1px solid var(--ck-color-base-border);
-
-	& .ck-form__header__label {
-		font-weight: bold;
-	}
-}

+ 87 - 83
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/dropdown.css

@@ -9,100 +9,104 @@
 @import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";
 
 :root {
-	--ck-dropdown-arrow-size: calc(0.5 * var(--ck-icon-size));
+  --ck-dropdown-arrow-size: calc(0.5 * var(--ck-icon-size));
 }
 
 .ck.ck-dropdown {
-	/* Enable font size inheritance, which allows fluid UI scaling. */
-	font-size: inherit;
-
-	& .ck-dropdown__arrow {
-		width: var(--ck-dropdown-arrow-size);
-	}
-
-	@mixin ck-dir ltr {
-		& .ck-dropdown__arrow {
-			right: var(--ck-spacing-standard);
-
-			/* A space to accommodate the triangle. */
-			margin-left: var(--ck-spacing-small);
-		}
-	}
-
-	@mixin ck-dir rtl {
-		& .ck-dropdown__arrow {
-			left: var(--ck-spacing-standard);
-
-			/* A space to accommodate the triangle. */
-			margin-right: var(--ck-spacing-small);
-		}
-	}
-
-	&.ck-disabled .ck-dropdown__arrow {
-		@mixin ck-disabled;
-	}
-
-	& .ck-button.ck-dropdown__button {
-		@mixin ck-dir ltr {
-			&:not(.ck-button_with-text) {
-				/* Make sure dropdowns with just an icon have the right inner spacing */
-				padding-left: var(--ck-spacing-small);
-			}
-		}
-
-		@mixin ck-dir rtl {
-			&:not(.ck-button_with-text) {
-				/* Make sure dropdowns with just an icon have the right inner spacing */
-				padding-right: var(--ck-spacing-small);
-			}
-		}
-
-		/* #23 */
-		& .ck-button__label {
-			width: 7em;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-
-		/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/70 */
-	&.ck-disabled .ck-button__label {
-		@mixin ck-disabled;
-		}
-
-		/* https://github.com/ckeditor/ckeditor5/issues/816 */
-		&.ck-on {
-			border-bottom-left-radius: 0;
-			border-bottom-right-radius: 0;
-		}
-	}
+  /* Enable font size inheritance, which allows fluid UI scaling. */
+  font-size: inherit;
+
+  & .ck-dropdown__arrow {
+    width: var(--ck-dropdown-arrow-size);
+  }
+
+  @mixin ck-dir ltr {
+    & .ck-dropdown__arrow {
+      right: var(--ck-spacing-standard);
+
+      /* A space to accommodate the triangle. */
+      margin-left: var(--ck-spacing-standard);
+    }
+  }
+
+  @mixin ck-dir rtl {
+    & .ck-dropdown__arrow {
+      left: var(--ck-spacing-standard);
+
+      /* A space to accommodate the triangle. */
+      margin-right: var(--ck-spacing-small);
+    }
+  }
+
+  &.ck-disabled .ck-dropdown__arrow {
+    @mixin ck-disabled;
+  }
+
+  & .ck-button.ck-dropdown__button {
+    @mixin ck-dir ltr {
+      &:not(.ck-button_with-text) {
+        /* Make sure dropdowns with just an icon have the right inner spacing */
+        padding-left: var(--ck-spacing-small);
+      }
+    }
+
+    @mixin ck-dir rtl {
+      &:not(.ck-button_with-text) {
+        /* Make sure dropdowns with just an icon have the right inner spacing */
+        padding-right: var(--ck-spacing-small);
+      }
+    }
+
+    /* #23 */
+    & .ck-button__label {
+      width: 7em;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    /* https://github.com/ckeditor/ckeditor5-theme-lark/issues/70 */
+    &.ck-disabled .ck-button__label {
+      @mixin ck-disabled;
+    }
+
+    /* https://github.com/ckeditor/ckeditor5/issues/816 */
+    &.ck-on {
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+
+    &.ck-dropdown__button_label-width_auto .ck-button__label {
+      width: auto;
+    }
+  }
 }
 
 .ck.ck-dropdown__panel {
-	@mixin ck-rounded-corners;
-	@mixin ck-drop-shadow;
+  @mixin ck-rounded-corners;
+  @mixin ck-drop-shadow;
 
-	background: var(--ck-color-dropdown-panel-background);
-	border: 1px solid var(--ck-color-dropdown-panel-border);
-	bottom: 0;
+  background: var(--ck-color-dropdown-panel-background);
+  border: 1px solid var(--ck-color-dropdown-panel-border);
+  bottom: 0;
 
-	/* Make sure the panel is at least as wide as the drop-down's button. */
-	min-width: 100%;
+  /* Make sure the panel is at least as wide as the drop-down's button. */
+  min-width: 100%;
 
-	/* Disabled corner border radius to be consistent with the .dropdown__button
+  /* Disabled corner border radius to be consistent with the .dropdown__button
 	https://github.com/ckeditor/ckeditor5/issues/816 */
-	&.ck-dropdown__panel_se {
-		border-top-left-radius: 0;
-	}
+  &.ck-dropdown__panel_se {
+    border-top-left-radius: 0;
+  }
 
-	&.ck-dropdown__panel_sw {
-		border-top-right-radius: 0;
-	}
+  &.ck-dropdown__panel_sw {
+    border-top-right-radius: 0;
+  }
 
-	&.ck-dropdown__panel_ne {
-		border-bottom-left-radius: 0;
-	}
+  &.ck-dropdown__panel_ne {
+    border-bottom-left-radius: 0;
+  }
 
-	&.ck-dropdown__panel_nw {
-		border-bottom-right-radius: 0;
-	}
+  &.ck-dropdown__panel_nw {
+    border-bottom-right-radius: 0;
+  }
 }

packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/labeledview/labeledview.css → packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/labeledfieldview/labeledfieldview.css