pitchum/debianize-mobilizon
pitchum/debianize-mobilizon
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'bug/fixes' into 'master'

Browse Source 
Fix editor related issues

See merge request framasoft/mobilizon!234
This commit is contained in:
Thomas Citharel 2019-10-10 11:07:18 +02:00
commit 4d1780c58d
5 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/components/Editor.vue
View File

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

2
js/src/components/Event/TagInput.vue
View File

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

2
js/src/views/Event/Edit.vue
View File

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

40
js/src/views/Event/Event.vue
View File

@ -137,7 +137,7 @@
{{ $t("The event organizer didn't add any description.") }} {{ $t("The event organizer didn't add any description.") }}
</p> </p>
<div class="columns" v-else> <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> </div>
</div> </div>
@ -660,14 +660,38 @@ export default class Event extends EventMixin {
border-top: solid 1px #111; border-top: solid 1px #111;
border-bottom: solid 1px #111; border-bottom: solid 1px #111;
p { .description-content {
margin: 10px auto; /deep/ h1 {
font-size: 2rem;
}
a { /deep/ h2 {
display: inline-block; font-size: 1.5rem;
padding: 0.3rem; }
background: $secondary;
color: #111; /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;
}
} }
} }
} }

1
lib/service/html.ex
View File

@ -59,6 +59,7 @@ defmodule Mobilizon.Service.HTML.Scrubber.Default do
Meta.allow_tag_with_these_attributes("strong", []) Meta.allow_tag_with_these_attributes("strong", [])
Meta.allow_tag_with_these_attributes("u", []) Meta.allow_tag_with_these_attributes("u", [])
Meta.allow_tag_with_these_attributes("ul", []) 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_this_attribute_values("span", "class", ["h-card"])
Meta.allow_tag_with_these_attributes("span", []) Meta.allow_tag_with_these_attributes("span", [])