Merge branch 'bug/fixes' into 'master'

Fix editor related issues

See merge request framasoft/mobilizon!234

js/src/components/Editor.vue

@@ -520,6 +520,9 @@ export default class EditorComponent extends Vue {
             ul,
             ol {
                 padding-left: 1rem;
+            }
+
+            ul {
                 list-style-type: disc;
             }
 

js/src/components/Event/TagInput.vue

@@ -39,7 +39,7 @@ export default {
                 :allow-new="true"
                 :field="path"
                 icon="label"
-                :placeholder="$t('Add a tag')"
+                :placeholder="$t('Eg: Stockholm, Dance, Chess…')"
                 @typing="getFilteredTags"
         >
         </b-taginput>

js/src/views/Event/Edit.vue

@@ -16,7 +16,7 @@
           <picture-upload v-model="pictureFile" />
 
           <b-field :label="$t('Title')" :type="checkTitleLength[0]" :message="checkTitleLength[1]">
-            <b-input aria-required="true" required v-model="event.title" />
+            <b-input size="is-large" aria-required="true" required v-model="event.title" />
           </b-field>
 
           <tag-input v-model="event.tags" :data="tags" path="title" />

js/src/views/Event/Event.vue

@@ -137,7 +137,7 @@
                 {{ $t("The event organizer didn't add any description.") }}
               </p>
               <div class="columns" v-else>
-                <div class="column is-half" v-html="event.description">
+                <div class="column is-half description-content" v-html="event.description">
                 </div>
               </div>
             </div>
@@ -660,14 +660,38 @@ export default class Event extends EventMixin {
     border-top: solid 1px #111;
     border-bottom: solid 1px #111;
 
-    p {
-      margin: 10px auto;
+    .description-content {
+      /deep/ h1 {
+        font-size: 2rem;
+      }
 
-      a {
-        display: inline-block;
-        padding: 0.3rem;
-        background: $secondary;
-        color: #111;
+      /deep/ h2 {
+        font-size: 1.5rem;
+      }
+
+      /deep/ h3 {
+        font-size: 1.25rem;
+      }
+
+      /deep/ ul {
+        list-style-type: disc;
+      }
+
+      /deep/ blockquote {
+        border-left: .2em solid #333;
+        display: block;
+        padding-left: 1em;
+      }
+
+      /deep/ p {
+        margin: 10px auto;
+
+        a {
+          display: inline-block;
+          padding: 0.3rem;
+          background: $secondary;
+          color: #111;
+        }
       }
     }
   }

lib/service/html.ex

@@ -59,6 +59,7 @@ defmodule Mobilizon.Service.HTML.Scrubber.Default do
   Meta.allow_tag_with_these_attributes("strong", [])
   Meta.allow_tag_with_these_attributes("u", [])
   Meta.allow_tag_with_these_attributes("ul", [])
+  Meta.allow_tag_with_these_attributes("img", ["src", "alt"])
 
   Meta.allow_tag_with_this_attribute_values("span", "class", ["h-card"])
   Meta.allow_tag_with_these_attributes("span", [])