Browse Source

Merge branch 'master' into t/17

Piotrek Koszuliński 8 năm trước cách đây
mục cha
commit
eaa0b35608

+ 1 - 1
packages/ckeditor5-block-quote/tests/manual/blockquote.js

@@ -15,7 +15,7 @@ ClassicEditor
 		plugins: [
 		plugins: [
 			ArticlePluginSet
 			ArticlePluginSet
 		],
 		],
-		toolbar: [ 'headings', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ]
+		toolbar: [ 'headings', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ]
 	} )
 	} )
 	.then( editor => {
 	.then( editor => {
 		window.editor = editor;
 		window.editor = editor;

+ 5 - 1
packages/ckeditor5-block-quote/theme/blockquote.css

@@ -3,7 +3,11 @@
  * For licensing, see LICENSE.md.
  * For licensing, see LICENSE.md.
  */
  */
 
 
-blockquote {
+.ck-content blockquote {
 	/* See #12 */
 	/* See #12 */
 	overflow: hidden;
 	overflow: hidden;
+	padding-left: 1.5em;
+	margin-left: 0;
+	font-style: italic;
+	border-left: solid 5px hsl(0, 0%, 80%);
 }
 }