tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes build-watch on Linux. Disables dragging when editing a filter or field.

This commit is contained in:
mateuswetah 2018-03-21 08:56:07 -03:00
parent 73319097f6
commit fc10a7db54
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-watch.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
## Run the build script whenever there is a change in src folder

2
src/admin/components/edition/field-edition-form.vue
View File

@ -13,7 +13,7 @@
</b-field>
<b-field
:addons="false"
:addons="false"
:type="formErrors['description'] != undefined ? 'is-danger' : ''"
:message="formErrors['description'] != undefined ? formErrors['description'] : ''">
<label class="label">{{$i18n.get('label_description')}} <a class="help-button"><b-icon size="is-small" icon="help-circle-outline"></b-icon></a></label>

16
src/admin/components/lists/fields-list.vue
View File

@ -13,6 +13,8 @@
:list="activeFieldList"
:options="{
group: { name:'fields', pull: false, put: true },
sort: openedFieldId == '' || openedFieldId == undefined,
disabled: openedFieldId != '' && openedFieldId != undefined,
handle: '.handle',
ghostClass: 'sortable-ghost',
filter: 'not-sortable-item',
@ -20,7 +22,7 @@
<div
class="active-field-item"
:class="{
'not-sortable-item': field.id == undefined || openedFieldId == field.id,
'not-sortable-item': field.id == undefined || openedFieldId != '' ,
'not-focusable-item': openedFieldId == field.id,
'disabled-field': field.enabled == false}"
v-for="(field, index) in activeFieldList" :key="index">
@ -368,11 +370,17 @@ export default {
i, i:before { font-size: 20px; }
}
&.not-sortable-item, &.not-sortable-item:hover, &.not-focusable-item, &.not-focusable-item:hover {
box-shadow: none !important;
&.not-sortable-item, &.not-sortable-item:hover {
cursor: default;
background-color: white !important;
.label-details, .icon {
color: $gray !important;
}
}
&.not-focusable-item, &.not-focusable-item:hover {
cursor: default;
.field-name {
color: $primary;
}

16
src/admin/components/lists/filters-list.vue
View File

@ -13,6 +13,8 @@
:list="activeFilterList"
:options="{
group: { name:'filters', pull: false, put: true },
sort: openedFilterId == '' || openedFilterId == undefined,
disabled: openedFilterId != '' && openedFilterId != undefined,
handle: '.handle',
ghostClass: 'sortable-ghost',
filter: 'not-sortable-item',
@ -20,7 +22,7 @@
<div
class="active-filter-item"
:class="{
'not-sortable-item': filter.id == undefined || openedFilterId == filter.id || choosenField.name == filter.name,
'not-sortable-item': filter.id == undefined || openedFilterId != '' || choosenField.name == filter.name,
'not-focusable-item': openedFilterId == filter.id,
'disabled-filter': filter.enabled == false
}"
@ -485,11 +487,17 @@ export default {
border-bottom: 1px solid $draggable-border-color;
margin-top: 1.0em;
}
&.not-sortable-item, &.not-sortable-item:hover, &.not-focusable-item, &.not-focusable-item:hover {
box-shadow: none !important;
background-color: white !important;
&.not-sortable-item, &.not-sortable-item:hover {
cursor: default;
background-color: white !important;
.label-details, .icon {
color: $gray !important;
}
}
&.not-focusable-item, &.not-focusable-item:hover {
cursor: default;
.field-name {
color: $primary;
}