Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] Fix select overlay issue #172

Merged
merged 5 commits into from
May 28, 2020
Merged

[3.x] Fix select overlay issue #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b0352c
Add class if select-element will have a button next to it
Erikmitk May 27, 2020
d642d68
Adjust width of select-elements with buttons
Erikmitk May 27, 2020
fbfde42
Center that stupid X for god’s sake
Erikmitk May 27, 2020
b868ad3
Remove duplicate rules
Erikmitk May 27, 2020
c3fea31
Adjust selector to get rid of !important declaration
Erikmitk May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Private/Partials/DocumentForm/Field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
additionalAttributes="{data-field:fieldItem.uid,data-index:fieldIndex,data-mandatory:fieldItem.mandatory,data-group:formGroupUid,data-groupindex:groupIndex,data-default:fieldItem.hasDefaultValue,data-regexp:fieldItem.validation,data-datatype:fieldItem.dataType,data-label:fieldItem.displayName,data-maxlength:fieldItem.maxInputLength}"/>
</f:case>
<f:case value="2">
<div class="form-control has-select">
<div class="form-control has-select {f:if(condition: '{fieldItem.maxIteration} == 0', then: 'has-button', else: '')}">
<f:form.select id="inp_{fieldItem.uid}"
property="metadata.{formPageUid}-{formGroupUid}-{groupIndex}-{fieldItem.uid}-{fieldIndex}"
value="{fieldItem.value}" class="form-control input-field {fieldItem.fillOutService}"
Expand Down
15 changes: 15 additions & 0 deletions Resources/Public/CSS/qucosa.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@
border: none;
}

.tx-dpf .form-container .form-group:first-child .form-control.has-button,
.tx-dpf .form-container .form-group:first-child .form-control.has-button select {
width: calc(100% - 32px);
}

.tx-dpf .form-group .form-control.has-button,
.tx-dpf .form-group .form-control.has-button select {
width: calc(100% - 62px);
}

.tx-dpf .form-group .form-control {
position: relative;
z-index: 2;
Expand Down Expand Up @@ -289,6 +299,11 @@
left: 1px;
}

.tx-dpf button .glyphicon-remove {
top: 1.5px;
left: 0;
}

.tx-dpf ol li {
list-style: none;
}
Expand Down