composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 06:28:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3526 - Clean up pass on UIBlocks

Browse Source 
- Add ancestors CSS classes on UIBlocks when missing (programmatically)
- Fix SCSS due to some blocks inheriting their ancestors rules
This commit is contained in:
Molkobain
2021-11-14 22:33:33 +01:00
parent 3598da8808
commit 0dc3d249da
46 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/base/components/input/input-textarea.html.twig
View File

@@ -9,7 +9,7 @@
data-{{ sName }}="{{ sValue }}"
{% endfor %}
{% endif %}
{% if oUIBlock.GetAdditionalCSSClassesAsString() %} class="{{ oUIBlock.GetAdditionalCSSClassesAsString() }}"{% endif %}
{% if oUIBlock.GetAdditionalCSSClassesAsString() %} class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }}"{% endif %}
{% if oUIBlock.GetPlaceHolder() %} placeholder="{{ oUIBlock.GetPlaceHolder() }}" {% endif %}
{% if oUIBlock.IsDisabled() %} disabled {% endif %}
>{{ oUIBlock.GetValue()|raw }}</textarea>

2
templates/base/components/input/layout.html.twig
View File

@@ -2,7 +2,7 @@
{% endblock %}
{% block iboInput %}
<input type="{{ oUIBlock.GetType() }}" id="{{ oUIBlock.GetId() }}" name="{{ oUIBlock.GetName() }}" value="{{ oUIBlock.GetValue()|raw }}"
class="ibo-input {% if oUIBlock.IsHidden() %} ibo-is-hidden{% endif %}{% if oUIBlock.GetAdditionalCSSClassesAsString() %} {{ oUIBlock.GetAdditionalCSSClassesAsString() }}{% endif %}"
class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }} {% if oUIBlock.IsHidden() %}ibo-is-hidden{% endif %}"
data-role="ibo-input"
{% if oUIBlock.IsChecked() %} checked="checked"{% endif %}
{% if oUIBlock.IsDisabled() %} disabled{% endif %}