From 1f75e1324eaf31a93c4c3ee0cdf14d28859590e2 Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Fri, 9 Nov 2018 09:38:39 +0200 Subject: [PATCH 1/2] Markdown block: move support link away from description --- client/gutenberg/extensions/markdown/edit.jsx | 11 ++++++++++- client/gutenberg/extensions/markdown/editor.js | 15 +-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/client/gutenberg/extensions/markdown/edit.jsx b/client/gutenberg/extensions/markdown/edit.jsx index be311b8d51a83..20d4336f5c25a 100644 --- a/client/gutenberg/extensions/markdown/edit.jsx +++ b/client/gutenberg/extensions/markdown/edit.jsx @@ -3,8 +3,9 @@ /** * External dependencies */ -import { BlockControls, PlainText } from '@wordpress/editor'; +import { BlockControls, InspectorControls, PlainText } from '@wordpress/editor'; import { Component } from '@wordpress/element'; +import { ExternalLink, PanelBody } from '@wordpress/components'; /** * Internal dependencies @@ -82,6 +83,14 @@ class MarkdownEdit extends Component { return (
+ + + + { __( 'Support reference' ) } + + + +
{ this.renderToolbarButton( PANEL_EDITOR, __( 'Markdown' ) ) } diff --git a/client/gutenberg/extensions/markdown/editor.js b/client/gutenberg/extensions/markdown/editor.js index 2221018f86d8f..b48adf9569b2c 100644 --- a/client/gutenberg/extensions/markdown/editor.js +++ b/client/gutenberg/extensions/markdown/editor.js @@ -1,11 +1,5 @@ /** @format */ -/** - * External dependencies - */ -import { ExternalLink } from '@wordpress/components'; -import { Fragment } from '@wordpress/element'; - /** * Internal dependencies */ @@ -18,14 +12,7 @@ import JetpackBlockType from 'gutenberg/extensions/presets/jetpack/utils/jetpack const MarkdownBlock = new JetpackBlockType( 'markdown', { title: __( 'Markdown' ), - description: ( - -

{ __( 'Use regular characters and punctuation to style text, links, and lists.' ) }

- - { __( 'Support reference' ) } - -
- ), + description: __( 'Use regular characters and punctuation to style text, links, and lists.' ), icon: ( From 959031729cc45fe4ffc9b695866ac3a2f81a6c76 Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Tue, 13 Nov 2018 08:52:41 +0200 Subject: [PATCH 2/2] Add CSS to move support link under description --- client/gutenberg/extensions/markdown/edit.jsx | 2 +- client/gutenberg/extensions/markdown/editor.scss | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/gutenberg/extensions/markdown/edit.jsx b/client/gutenberg/extensions/markdown/edit.jsx index 20d4336f5c25a..70d15d80b2a9a 100644 --- a/client/gutenberg/extensions/markdown/edit.jsx +++ b/client/gutenberg/extensions/markdown/edit.jsx @@ -84,7 +84,7 @@ class MarkdownEdit extends Component { return (
- + { __( 'Support reference' ) } diff --git a/client/gutenberg/extensions/markdown/editor.scss b/client/gutenberg/extensions/markdown/editor.scss index 2203e889b16fc..55f880df2b23e 100644 --- a/client/gutenberg/extensions/markdown/editor.scss +++ b/client/gutenberg/extensions/markdown/editor.scss @@ -145,3 +145,10 @@ $text-editor-font-size: inherit; } } } + +// Sidebar +.components-panel .jetpack-markdown__support { + border-top: 0; + padding-left: 54px; + padding-top: 0; +}