Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -97,3 +97,5 @@ Branch CRUD-Init
================ ================
- create an api for rendering entities - 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

12
Resources/public/sass/modules/_forms.scss
View File

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

2
Resources/views/Form/fields.html.twig
View File

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