Skip to content

Commit 91be5a6

Browse files
authored
Merge pull request #473 from ProcessMaker/bugfix/FOUR-29727
Fix visibility of required asterisk on toggle checkboxes
2 parents 83e3e6f + 2d5aece commit 91be5a6

2 files changed

Lines changed: 25 additions & 2 deletions

File tree

‎src/components/FormCheckbox.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
:checked="isChecked"
1111
@change="$emit('change', $event.target.checked)"
1212
>
13-
<required-asterisk />
13+
<required-asterisk :toggle-enabled="toggle"/>
1414
<label :class="labelClass" v-uni-for="name">{{label}}</label>
1515
<div v-if="(validator && validator.errorCount) || error" class="invalid-feedback">
1616
<div v-for="(error, index) in validatorErrors" :key="index">{{error}}</div>

‎src/components/common/RequiredAsterisk.vue‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,36 @@
11
<template>
2-
<span v-if="$parent.required" :title="$t('required')" class="required-asterisk">*</span>
2+
<span v-if="$parent.required" :title="$t('required')" :class="classList">*</span>
33
</template>
44

5+
<script>
6+
export default {
7+
props: {
8+
toggleEnabled: {
9+
type: Boolean,
10+
default: false
11+
}
12+
},
13+
computed: {
14+
classList() {
15+
return {
16+
'required-asterisk': true,
17+
'toggle-enabled': this.toggleEnabled
18+
}
19+
}
20+
}
21+
}
22+
</script>
523
<style>
624
.required-asterisk {
725
color: #dc3545;
826
padding-right: 0.5em;
927
}
1028
29+
.required-asterisk.toggle-enabled {
30+
position:relative;
31+
left: -33px;
32+
}
33+
1134
.conversational-chat .required-asterisk {
1235
display: none;
1336
}

0 commit comments

Comments
 (0)