@eturnity/eturnity_reusable_components 7.22.4-qa-09.0 → 7.22.4-qa-09.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -3,11 +3,7 @@
|
|
|
3
3
|
<container
|
|
4
4
|
:checkColor="checkColor"
|
|
5
5
|
:size="size"
|
|
6
|
-
<<<<<<< HEAD
|
|
7
|
-
:hasLabel="hasLabel"
|
|
8
|
-
=======
|
|
9
6
|
:hasLabel="label && !!label.length"
|
|
10
|
-
>>>>>>> master
|
|
11
7
|
:backgroundColor="backgroundColor"
|
|
12
8
|
:isChecked="isChecked"
|
|
13
9
|
:isDisabled="isDisabled"
|
|
@@ -22,11 +18,7 @@
|
|
|
22
18
|
<check-wrapper :hasLabel="hasLabel">
|
|
23
19
|
<span class="checkmark"></span>
|
|
24
20
|
</check-wrapper>
|
|
25
|
-
<<<<<<< HEAD
|
|
26
|
-
<label-text v-if="hasLabel">{{ label }}</label-text>
|
|
27
|
-
=======
|
|
28
21
|
<label-text v-if="label && !!label.length">{{ label }}</label-text>
|
|
29
|
-
>>>>>>> master
|
|
30
22
|
</container>
|
|
31
23
|
</component-wrapper>
|
|
32
24
|
</template>
|
|
@@ -40,16 +40,12 @@
|
|
|
40
40
|
"
|
|
41
41
|
@click.stop="onSelectedTemplateClick(item.row)"
|
|
42
42
|
>
|
|
43
|
-
<<<<<<< HEAD
|
|
44
|
-
<img :src="fileIcon" alt="icon" width="12" height="16" />
|
|
45
|
-
=======
|
|
46
43
|
<!-- <img :src="fileIcon" alt="icon" width="12" height="16" /> -->
|
|
47
44
|
<icon
|
|
48
45
|
name="template_icon_not_clickable"
|
|
49
46
|
:color="theme.colors.brightBlue"
|
|
50
47
|
size="14px"
|
|
51
48
|
/>
|
|
52
|
-
>>>>>>> master
|
|
53
49
|
<div>{{ item.value }}</div>
|
|
54
50
|
</template-link>
|
|
55
51
|
<no-template v-if="item.type && item.type === 'no-template'">
|
|
@@ -187,11 +183,8 @@ import InputText from '../inputs/inputText'
|
|
|
187
183
|
import CollapseArrowIcon from '../../assets/icons/collapse_arrow_icon.svg'
|
|
188
184
|
import SubpositionMarkerIcon from '../../assets/icons/subposition_marker.svg'
|
|
189
185
|
import fileIconPng from '../../assets/icons/file_icon.png'
|
|
190
|
-
<<<<<<< HEAD
|
|
191
|
-
=======
|
|
192
186
|
import Icon from '../icon'
|
|
193
187
|
import theme from '@/assets/theme.js'
|
|
194
|
-
>>>>>>> master
|
|
195
188
|
|
|
196
189
|
const rowAttrs = { disabled: Boolean, isOpen: Boolean }
|
|
197
190
|
const DropdownRow = styled('div', rowAttrs)`
|