8
0
Просмотр исходного кода

Merge branch 'master' into t/ckeditor5-engine/1555

Maciej Gołaszewski 7 лет назад
Родитель
Сommit
38ed1b5632

+ 3 - 0
packages/ckeditor5-link/.travis.yml

@@ -12,6 +12,9 @@ node_js:
 - '8'
 cache:
 - node_modules
+branches:
+   except:
+   - stable
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start

+ 1 - 1
packages/ckeditor5-link/CONTRIBUTING.md

@@ -1,4 +1,4 @@
 Contributing
 ========================================
 
-Information about contributing can be found on the following page: <https://github.com/ckeditor/ckeditor5/blob/master/CONTRIBUTING.md>.
+See the [official contributors' guide to CKEditor 5](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html) to learn more.

+ 1 - 1
packages/ckeditor5-link/README.md

@@ -10,7 +10,7 @@ CKEditor 5 link feature
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-link/status.svg)](https://david-dm.org/ckeditor/ckeditor5-link)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-link/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-link?type=dev)
 
-This package implements the link feature for CKEditor 5.
+This package implements the link feature for CKEditor 5. It allows for inserting hyperlinks into the edited content and offers the UI to create and edit them.
 
 ## Documentation
 

+ 1 - 1
packages/ckeditor5-link/docs/api/link.md

@@ -6,7 +6,7 @@ category: api-reference
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-link.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-link)
 
-This package implements the link feature for CKEditor 5.
+This package implements the link feature for CKEditor 5. It allows for inserting hyperlinks into the edited content and offers the UI to create and edit them.
 
 ## Documentation
 

+ 9 - 9
packages/ckeditor5-link/docs/features/link.md

@@ -3,30 +3,30 @@ title: Link
 category: features
 ---
 
-The {@link module:link/link~Link} plugin brings the link editing to the editor. It allows links in the edited content and offers the UI to create and edit them.
+The {@link module:link/link~Link} feature brings support for link editing to the editor. It allows for inserting hyperlinks into the edited content and offers the UI to create and edit them.
 
 ## Demo
 
-You can edit existing links by clicking them and using the balloon. Use the toolbar button press or press <kbd>Ctrl/⌘</kbd>+<kbd>K</kbd> to create new links.
+You can edit existing links by clicking them and using the balloon. Use the Link toolbar button or press <kbd>Ctrl/⌘</kbd>+<kbd>K</kbd> to create a new link.
 
 {@snippet features/link}
 
 ## Typing around links
 
-CKEditor 5 allows typing both at inner and outer boundaries of links to make the editing easier for the users.
+CKEditor 5 allows for typing both at inner and outer boundaries of links to make the editing easier for the users.
 
-**To type inside a link**, move the caret to its (start or end) boundary. As long as the link remains highlighted blue, typing and and applying formatting will be done within its boundaries:
+**To type inside a link**, move the caret to its (start or end) boundary. As long as the link remains highlighted (by default: blue), typing and and applying formatting will be done within its boundaries:
 
 {@img assets/img/typing-inside.gif 770 The animation showing typing inside the link in CKEditor 5 rich text editor.}
 
-**To type before or after a link**, move the caret to its boundary, then press the arrow key (<kbd>→</kbd> or <kbd>←</kbd>) once. The link is no longer highlighted and whatever text you type or formatting you apply will not be enclosed by a link:
+**To type before or after a link**, move the caret to its boundary, then press the Arrow key (<kbd>→</kbd> or <kbd>←</kbd>) once. The link is no longer highlighted and whatever text you type or formatting you apply will not be enclosed by the link:
 
 {@img assets/img/typing-before.gif 770 The animation showing typing before the link in CKEditor 5 rich text editor.}
 
 ## Installation
 
 <info-box info>
-	This feature is enabled by default in all builds. The installation instructions are for developers interested in building their own, custom editor.
+	This feature is enabled by default in all builds. The installation instructions are for developers interested in building their own, custom rich text editor.
 </info-box>
 
 To add this feature to your editor, install the [`@ckeditor/ckeditor5-link`](https://www.npmjs.com/package/@ckeditor/ckeditor5-link) package:
@@ -35,7 +35,7 @@ To add this feature to your editor, install the [`@ckeditor/ckeditor5-link`](htt
 npm install --save @ckeditor/ckeditor5-link
 ```
 
-Then add `Link` plugin to your plugin list:
+Then add the `Link` plugin to your plugin list:
 
 ```js
 import Link from '@ckeditor/ckeditor5-link/src/link';
@@ -56,11 +56,11 @@ The {@link module:link/link~Link} plugin registers the UI button component (`'li
 * The `'link'` command implemented by {@link module:link/linkcommand~LinkCommand}.
 * The `'unlink'` command implemented by {@link module:link/unlinkcommand~UnlinkCommand}.
 
-which can be executed using the {@link module:core/editor/editor~Editor#execute `editor.execute()`} method:
+The commands can be executed using the {@link module:core/editor/editor~Editor#execute `editor.execute()`} method:
 
 ```js
 // Applies the link to the selected content.
-// When the selection is collapsed, it creates a new text wrapped in a link.
+// When the selection is collapsed, it creates new text wrapped in a link.
 editor.execute( 'link', 'http://example.com' );
 
 // Removes the link from the selection.

+ 18 - 0
packages/ckeditor5-link/theme/linkactions.css

@@ -3,7 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
+@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_rwd.css";
+
 .ck.ck-link-actions {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+
 	& .ck-link-actions__preview {
 		display: inline-block;
 
@@ -11,4 +17,16 @@
 			overflow: hidden;
 		}
 	}
+
+	@mixin ck-media-phone {
+		flex-wrap: wrap;
+
+		& .ck-link-actions__preview {
+			flex-basis: 100%;
+		}
+
+		& .ck-button:not(.ck-link-actions__preview) {
+			flex-basis: 50%;
+		}
+	}
 }

+ 17 - 3
packages/ckeditor5-link/theme/linkform.css

@@ -3,12 +3,26 @@
  * For licensing, see LICENSE.md.
  */
 
+@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_rwd.css";
+
 .ck.ck-link-form {
-	& .ck-labeled-input {
-		display: inline-block;
-	}
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
 
 	& .ck-label {
 		display: none;
 	}
+
+	@mixin ck-media-phone {
+		flex-wrap: wrap;
+
+		& .ck-labeled-input {
+			flex-basis: 100%;
+		}
+
+		& .ck-button {
+			flex-basis: 50%;
+		}
+	}
 }