Commit 4abc42e0 authored by Thomas's avatar Thomas
Browse files

Some fixes/improvements

parent 493f1966
......@@ -270,7 +270,7 @@ document = window.document || {};
},
custom_emoji: {
icon: "yum",
icon: "grinning",
title: "Custom emoji",
emoji: "",
},
......
......@@ -75,7 +75,7 @@
<blockquote class="blockquote text-center" style="margin-top: 50px;">
<p class="mb-0">{{ 'page.index.about'|trans |raw}}</p>
<p>{{ 'page.index.data'|trans |raw}}</p>
<footer class="blockquote-footer">FediPlan 1.1.0</footer>
<footer class="blockquote-footer">FediPlan 1.1.1</footer>
</blockquote>
{{ form_end(form) }}
......
......@@ -53,12 +53,12 @@
</div>
<div class="row">
<div class=" col-md-3" style="margin-top: 20px;">
<div class="col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback">
<label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" class="form-control">0</span>
</div>
</div>
<div class=" col-md-4" style="margin-top: 20px;">
<div class=" col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback">
{{ form_label(form.visibility) }}&nbsp;&nbsp;
{{ form_widget(form.visibility, {'attr': {'class': 'form-control'}}) }}
......@@ -71,7 +71,7 @@
{% endif %}
</div>
</div>
<div class=" col-md-4" style="margin-top: 20px;">
<div class=" col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback">
{{ form_label(form.sensitive) }}&nbsp;&nbsp;
{{ form_widget(form.sensitive, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-on': 'common.yes'|trans , 'data-off':'common.no'|trans}}) }}
......@@ -86,7 +86,7 @@
</div>
</div>
<div class="row" style="margin-top: 20px;">
<div class=" col-md-5">
<div class=" col-md-5 col-6">
<div class="form-group has-feedback">
{{ form_label(form.scheduled_at) }}
{{ form_widget(form.scheduled_at, {'attr': {'class': 'form-control'}}) }}
......@@ -99,7 +99,7 @@
{% endif %}
</div>
</div>
<div class=" col-md-5">
<div class=" col-md-5 col-4">
<div class="form-group has-feedback">
{{ form_label(form.timeZone) }}
{{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }}
......@@ -112,7 +112,7 @@
{% endif %}
</div>
</div>
<div class="col-md-2">
<div class="col-md-2 col-2">
<label for="count">{{ 'common.poll'|trans }}</label>&nbsp;&nbsp;
<span id="poll_switch" class="form-control" style="text-align: center;cursor:pointer;" > <i class="fa fa-tasks fa-fw"></i></span>
......@@ -431,7 +431,6 @@
$('#media_container').append($(content));
},
url: 'https://{{ instance }}/api/v1/media',
acceptFileTypes: /(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i
});
......@@ -519,12 +518,14 @@
attributes: {
spellcheck : true,
autocomplete : "on",
}
},
search: false
});
$("#compose_content_warning").emojioneArea({
pickerPosition: "bottom",
filtersPosition: "bottom",
searchPosition: "bottom",
search: false
});
var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
$('#compose_timeZone').val(timezone);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment