Selaa lähdekoodia

Merge branch 'master' into t/ckeditor5-core/64

Kamil Piechaczek 7 vuotta sitten
vanhempi
sitoutus
7b12ae21ea

+ 5 - 0
packages/ckeditor5-editor-decoupled/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 Changelog
 =========
 =========
 
 
+## [10.0.2](https://github.com/ckeditor/ckeditor5-editor-decoupled/compare/v10.0.1...v10.0.2) (2018-06-21)
+
+Internal changes only (updated dependencies, documentation, etc.).
+
+
 ## [10.0.1](https://github.com/ckeditor/ckeditor5-editor-decoupled/compare/v10.0.0...v10.0.1) (2018-05-22)
 ## [10.0.1](https://github.com/ckeditor/ckeditor5-editor-decoupled/compare/v10.0.0...v10.0.1) (2018-05-22)
 
 
 ### Bug fixes
 ### Bug fixes

+ 20 - 15
packages/ckeditor5-editor-decoupled/docs/framework/guides/document-editor.md

@@ -92,7 +92,6 @@ Styles are what the document editor really needs to materialize. Begin with the
 	/* This element is a flex container for easier rendering. */
 	/* This element is a flex container for easier rendering. */
 	display: flex;
 	display: flex;
 	flex-flow: column nowrap;
 	flex-flow: column nowrap;
-	overflow: hidden;
 }
 }
 ```
 ```
 
 
@@ -154,7 +153,7 @@ All you need to do now is style the actual content of the editor. Start with def
 ```css
 ```css
 /* Set the default font for the "page" of the content. */
 /* Set the default font for the "page" of the content. */
 .document-editor .ck-content,
 .document-editor .ck-content,
-.document-editor .ck-heading-dropdown .ck-list {
+.document-editor .ck-heading-dropdown .ck-list .ck-button__label {
 	font: 16px/1.6 "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font: 16px/1.6 "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 }
 ```
 ```
@@ -167,15 +166,23 @@ Then focus on headings and paragraphs. Note that what the users see in the headi
 
 
 ```css
 ```css
 /* Adjust the headings dropdown to host some larger heading styles. */
 /* Adjust the headings dropdown to host some larger heading styles. */
-.document-editor .ck-heading-dropdown .ck-dropdown__panel .ck-list > .ck-list__item {
-	line-height: calc( 1.2 * var(--ck-line-height-base) * var(--ck-font-size-base) );
-	min-width: 8em;
+.document-editor .ck-heading-dropdown .ck-list .ck-button__label {
+	line-height: calc( 1.7 * var(--ck-line-height-base) * var(--ck-font-size-base) );
+	min-width: 6em;
+}
+
+/* Scale down all heading previews because they are way too big to be presented in the UI.
+Preserve the relative scale, though. */
+.document-editor .ck-heading-dropdown .ck-list .ck-button:not(.ck-heading_paragraph) .ck-button__label {
+	transform: scale(0.8);
+	transform-origin: left;
 }
 }
 
 
 /* Set the styles for "Heading 1". */
 /* Set the styles for "Heading 1". */
 .document-editor .ck-content h2,
 .document-editor .ck-content h2,
-.document-editor .ck-heading-dropdown .ck-heading_heading1 {
+.document-editor .ck-heading-dropdown .ck-heading_heading1 .ck-button__label {
 	font-size: 2.18em;
 	font-size: 2.18em;
+	font-weight: normal;
 }
 }
 
 
 .document-editor .ck-content h2 {
 .document-editor .ck-content h2 {
@@ -186,13 +193,14 @@ Then focus on headings and paragraphs. Note that what the users see in the headi
 
 
 /* Set the styles for "Heading 2". */
 /* Set the styles for "Heading 2". */
 .document-editor .ck-content h3,
 .document-editor .ck-content h3,
-.document-editor .ck-heading-dropdown .ck-heading_heading2 {
+.document-editor .ck-heading-dropdown .ck-heading_heading2 .ck-button__label {
 	font-size: 1.75em;
 	font-size: 1.75em;
+	font-weight: normal;
 	color: hsl( 203, 100%, 50% );
 	color: hsl( 203, 100%, 50% );
 }
 }
 
 
-.document-editor .ck-heading-dropdown .ck-heading_heading2.ck-list__item_active {
-	color: var(--ck-color-list-item-text-active);
+.document-editor .ck-heading-dropdown .ck-heading_heading2.ck-on .ck-button__label {
+	color: var(--ck-color-list-button-on-text);
 }
 }
 
 
 /* Set the styles for "Heading 2". */
 /* Set the styles for "Heading 2". */
@@ -204,8 +212,9 @@ Then focus on headings and paragraphs. Note that what the users see in the headi
 
 
 /* Set the styles for "Heading 3". */
 /* Set the styles for "Heading 3". */
 .document-editor .ck-content h4,
 .document-editor .ck-content h4,
-.document-editor .ck-heading-dropdown .ck-heading_heading3 {
+.document-editor .ck-heading-dropdown .ck-heading_heading3 .ck-button__label {
 	font-size: 1.31em;
 	font-size: 1.31em;
+	font-weight: bold;
 }
 }
 
 
 .document-editor .ck-content h4 {
 .document-editor .ck-content h4 {
@@ -215,12 +224,8 @@ Then focus on headings and paragraphs. Note that what the users see in the headi
 }
 }
 
 
 /* Set the styles for "Paragraph". */
 /* Set the styles for "Paragraph". */
-.document-editor .ck-content p,
-.document-editor .ck-heading-dropdown .ck-heading_paragraph {
-	font-size: 1em;
-}
-
 .document-editor .ck-content p {
 .document-editor .ck-content p {
+	font-size: 1em;
 	line-height: 1.63em;
 	line-height: 1.63em;
 	padding-top: .5em;
 	padding-top: .5em;
 	margin-bottom: 1.13em;
 	margin-bottom: 1.13em;

+ 12 - 12
packages/ckeditor5-editor-decoupled/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "@ckeditor/ckeditor5-editor-decoupled",
   "name": "@ckeditor/ckeditor5-editor-decoupled",
-  "version": "10.0.1",
+  "version": "10.0.2",
   "description": "Decoupled editor implementation for CKEditor 5.",
   "description": "Decoupled editor implementation for CKEditor 5.",
   "keywords": [
   "keywords": [
     "ckeditor",
     "ckeditor",
@@ -9,19 +9,19 @@
     "ckeditor5-editor"
     "ckeditor5-editor"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^10.0.0",
-    "@ckeditor/ckeditor5-engine": "^10.0.0",
-    "@ckeditor/ckeditor5-theme-lark": "^10.0.0",
-    "@ckeditor/ckeditor5-ui": "^10.0.0",
-    "@ckeditor/ckeditor5-utils": "^10.0.0"
+    "@ckeditor/ckeditor5-core": "^10.1.0",
+    "@ckeditor/ckeditor5-engine": "^10.1.0",
+    "@ckeditor/ckeditor5-theme-lark": "^10.1.0",
+    "@ckeditor/ckeditor5-ui": "^10.1.0",
+    "@ckeditor/ckeditor5-utils": "^10.1.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.0",
-    "@ckeditor/ckeditor5-enter": "^10.0.0",
-    "@ckeditor/ckeditor5-heading": "^10.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.0",
-    "@ckeditor/ckeditor5-typing": "^10.0.0",
-    "@ckeditor/ckeditor5-undo": "^10.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "^10.0.1",
+    "@ckeditor/ckeditor5-enter": "^10.1.0",
+    "@ckeditor/ckeditor5-heading": "^10.0.1",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.1",
+    "@ckeditor/ckeditor5-typing": "^10.0.1",
+    "@ckeditor/ckeditor5-undo": "^10.0.1",
     "eslint": "^4.15.0",
     "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
     "husky": "^0.14.3",