Merge branch 'CRUD-init' of framagit.org:Chill-project/Chill-Main into CRUD-init

This commit is contained in:
Tchama 2019-12-13 18:20:03 +01:00
commit 56d7096e93
3 changed files with 15 additions and 1 deletions

View File

@ -97,3 +97,5 @@ Branch CRUD-Init
================
- create an api for rendering entities
- css: render the placeholder in expanded choice item as italic (the "no specified" choice")
- css: add an extra space around choices expanded widget

View File

@ -25,10 +25,17 @@ label {
abbr {
display: none;
}
// mark the label for empty placeholder
&[for$="_placeholder"] {
font-style: italic;
}
}
.inline-choice {
white-space:nowrap;
display: inline-block;
label {
white-space:normal;
display: inline;
@ -38,6 +45,11 @@ label {
}
}
div.choice-widget-expanded {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
textarea,
//input,
#{$all-text-inputs},

View File

@ -52,7 +52,7 @@
{% block choice_widget_expanded %}
{% spaceless %}
<div {{ block('widget_container_attributes') }}>
<div {{ block('widget_container_attributes') }} class="choice-widget-expanded">
{% for child in form %}
<span class="inline-choice">
{{ form_widget(child) }}