From 8a48236d2dab5a0f092c9c4259ec70c06baca8f5 Mon Sep 17 00:00:00 2001
From: "Angelo D. Moura" <up201303828@fe.up.pt>
Date: Sun, 3 Jan 2021 23:17:06 +0000
Subject: [PATCH] [UI][NOTE][MARKDOWN] Add markdown support to the notes

---
 public/assets/css/network/public.css       | 2 --
 public/assets/css/network/public_mid.css   | 2 --
 public/assets/css/network/public_small.css | 2 --
 templates/note/view.html.twig              | 6 +++++-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/public/assets/css/network/public.css b/public/assets/css/network/public.css
index b48b15135c..5f51b39ca4 100644
--- a/public/assets/css/network/public.css
+++ b/public/assets/css/network/public.css
@@ -143,8 +143,6 @@
     padding: var(--small-size);
     border-radius: 0 0 var(--unit-size) var(--unit-size);
     width: 100%;
-    display: flex;
-    flex-wrap: wrap;
 }
 .note-attachments {
     display: flex;
diff --git a/public/assets/css/network/public_mid.css b/public/assets/css/network/public_mid.css
index c637e042fe..2d908b6b13 100644
--- a/public/assets/css/network/public_mid.css
+++ b/public/assets/css/network/public_mid.css
@@ -143,8 +143,6 @@
     padding: var(--small-size);
     border-radius: 0 0 var(--unit-size) var(--unit-size);
     width: 100%;
-    display: flex;
-    flex-wrap: wrap;
 }
 .note-attachments {
     display: flex;
diff --git a/public/assets/css/network/public_small.css b/public/assets/css/network/public_small.css
index d08cf68981..f6c8eaef48 100644
--- a/public/assets/css/network/public_small.css
+++ b/public/assets/css/network/public_small.css
@@ -143,8 +143,6 @@
     padding: var(--small-size);
     border-radius: 0 0 var(--unit-size) var(--unit-size);
     width: 100%;
-    display: flex;
-    flex-wrap: wrap;
 }
 .note-attachments {
     display: flex;
diff --git a/templates/note/view.html.twig b/templates/note/view.html.twig
index 0ace8b89bd..1a1e471639 100644
--- a/templates/note/view.html.twig
+++ b/templates/note/view.html.twig
@@ -11,7 +11,11 @@
     {% endif %}
   </div>
   <div class="note-content">
-    {{ note.getContent() }}
+      {% block markdown %}
+          {% apply markdown_to_html %}
+            {{ note.getContent() }}
+          {% endapply %}
+      {% endblock %}
       <div class="note-other-content">
           {% for other in get_note_other_content(note) %}
               {% include '/'~ other.name ~ '/view.html.twig' with {'vars': other.vars} only %}