Merge branch 'develop' into feature/digital/SSR-207

This commit is contained in:
Kroell 2023-02-03 16:43:42 -05:00
commit 010c4f14e1
4 changed files with 27 additions and 5 deletions

View file

@ -69,7 +69,6 @@
</div> </div>
<div class="row form-test-error mt-1"> <div class="row form-test-error mt-1">
<error-message <error-message
class="small"
:name="formatString(groupName)" :name="formatString(groupName)"
v-if="!suppressError"></error-message> v-if="!suppressError"></error-message>
</div> </div>

View file

@ -20,7 +20,7 @@
{{ value }} {{ value }}
</option> </option>
</select> </select>
<div v-show="errorMessage" class="row mt-2 form-test-error"> <div v-show="errorMessage" class="row mt-1 form-test-error">
<span role="alert">{{ errorMessage }}</span> <span role="alert">{{ errorMessage }}</span>
</div> </div>
</div> </div>

View file

@ -39,13 +39,15 @@
:maxlength="maxLength ? maxLength : '999'" :maxlength="maxLength ? maxLength : '999'"
@focus="$emit('focus', $event.target.value)" @focus="$emit('focus', $event.target.value)"
:data-bs-toggle="includeSelectIcon ? 'modal' : ''" :data-bs-toggle="includeSelectIcon ? 'modal' : ''"
:data-bs-target="'#' + this.cmsWidgetName" /> :data-bs-target="'#' + this.cmsWidgetName"
@paste="trimOnPaste"
@drop="trimOnPaste"/>
<button v-if="includeSearchIcon" type="submit" aria-label="Search button" /> <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
<button v-if="includeSelectIcon" type="submit" data-bs-toggle="modal" <button v-if="includeSelectIcon" type="submit" data-bs-toggle="modal"
:data-bs-target="'#' + this.cmsWidgetName" aria-label="Select button" /> :data-bs-target="'#' + this.cmsWidgetName" aria-label="Select button" />
</div> </div>
<div v-show="errorMessage" class="row my-1 form-test-error"> <div v-show="errorMessage" class="row my-1 form-test-error">
<span class="d-inline-flex small mt-0" role="alert">{{ errorMessage }}</span> <span class="d-inline-flex mt-0" role="alert">{{ errorMessage }}</span>
</div> </div>
</div> </div>
</template> </template>
@ -124,6 +126,19 @@ export default {
errors, errors,
}; };
}, },
methods: {
trimOnPaste(evt) {
evt.stopPropagation();
evt.preventDefault();
const data = evt.type == "paste" ? (evt.clipboardData || window.clipboardData) : evt.dataTransfer;
const value = data.getData('Text');
evt.target.value = value.trim();
evt.target.dispatchEvent(new Event('change'));
}
},
computed: { computed: {
questionText() { questionText() {
return this.getCmsContent(this.cmsWidgetName, "QuestionText"); return this.getCmsContent(this.cmsWidgetName, "QuestionText");

View file

@ -151,6 +151,7 @@ export default {
justify-content: flex-start; justify-content: flex-start;
} }
} }
& > .container-fluid { & > .container-fluid {
overflow-x: visible; // needed to fix hidden footer on some iphones overflow-x: visible; // needed to fix hidden footer on some iphones
} }
@ -160,8 +161,15 @@ export default {
text-align: center; text-align: center;
position: sticky; position: sticky;
bottom: 72px; bottom: 72px;
} }
@media only screen and (max-width: 340px) {
.footerImage
{
bottom: 85px;
}
}
#siteFooterImage #siteFooterImage
{ {
width: 100%; width: 100%;