From 9d087dbe458fb5b407a4e27b3f94da01ab476615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Edling?= Date: Mon, 25 Oct 2021 21:55:37 +0200 Subject: [PATCH] Added new markdown block. Fixes #1744 --- .../Manager/Shared/Partial/_SiteModal.cshtml | 2 +- .../assets/dist/css/full.min.css | 10 +-- .../assets/dist/css/slim.min.css | 10 +-- .../assets/dist/js/piranha.components.js | 26 +++++++- .../assets/dist/js/piranha.components.min.js | 2 +- .../js/components/blocks/markdown-block.vue | 30 +++++++++ .../js/components/fields/markdown-field.vue | 2 +- .../assets/src/scss/inc/_blocks.scss | 18 +++++ .../assets/src/scss/inc/_blocktypes.scss | 8 +-- .../assets/src/scss/inc/_fields.scss | 7 ++ core/Piranha.Manager/gulpfile.js | 1 + core/Piranha/App.cs | 1 + core/Piranha/Extend/Blocks/HtmlBlock.cs | 9 +++ core/Piranha/Extend/Blocks/MarkdownBlock.cs | 65 +++++++++++++++++++ core/Piranha/Extend/Blocks/TextBlock.cs | 9 +++ .../Pages/DisplayTemplates/HtmlBlock.cshtml | 2 +- .../DisplayTemplates/MarkdownBlock.cshtml | 5 ++ .../Pages/DisplayTemplates/TextBlock.cshtml | 2 +- 18 files changed, 189 insertions(+), 20 deletions(-) create mode 100644 core/Piranha.Manager/assets/src/js/components/blocks/markdown-block.vue create mode 100644 core/Piranha/Extend/Blocks/MarkdownBlock.cs create mode 100644 examples/RazorWeb/Pages/DisplayTemplates/MarkdownBlock.cshtml diff --git a/core/Piranha.Manager/Areas/Manager/Shared/Partial/_SiteModal.cshtml b/core/Piranha.Manager/Areas/Manager/Shared/Partial/_SiteModal.cshtml index 6760c6b18..3154ffc67 100644 --- a/core/Piranha.Manager/Areas/Manager/Shared/Partial/_SiteModal.cshtml +++ b/core/Piranha.Manager/Areas/Manager/Shared/Partial/_SiteModal.cshtml @@ -14,7 +14,7 @@