Merge branch 'develop' into feature/bulk-edit-items
This commit is contained in:
commit
8eedca3715
|
@ -111,7 +111,7 @@
|
|||
<filters-tags-list
|
||||
class="filter-tags-list"
|
||||
:filters="filters"
|
||||
v-if="hasFiltered">Teste</filters-tags-list>
|
||||
v-if="hasFiltered && !openAdvancedSearch">Teste</filters-tags-list>
|
||||
|
||||
<!-- SEARCH CONTROL ------------------------- -->
|
||||
<div
|
||||
|
|
|
@ -113,7 +113,7 @@
|
|||
<filters-tags-list
|
||||
class="filter-tags-list"
|
||||
:filters="filters"
|
||||
v-if="hasFiltered">Teste</filters-tags-list>
|
||||
v-if="hasFiltered && !openAdvancedSearch">Teste</filters-tags-list>
|
||||
|
||||
<!-- SEARCH CONTROL ------------------------- -->
|
||||
<div
|
||||
|
|
|
@ -244,6 +244,7 @@
|
|||
{{ $i18n.getFrom('items','edit_item') }}
|
||||
</router-link>
|
||||
<a
|
||||
target="_blank"
|
||||
class="button is-success is-pulled-right"
|
||||
:href="item.url">
|
||||
{{ $i18n.getFrom('items', 'view_item') }}
|
||||
|
|
|
@ -247,9 +247,9 @@ $modal-z: 9999999;
|
|||
height: 0px;
|
||||
max-height: 0px;
|
||||
min-height: 0px;
|
||||
-ms-transform: translate(2%, -30%); /* IE 9 */
|
||||
-webkit-transform: translate(2%, -30%); /* Safari */
|
||||
transform: translate(2%, -30%);
|
||||
-ms-transform: translate(0%, -30%); /* IE 9 */
|
||||
-webkit-transform: translate(0%, -30%); /* Safari */
|
||||
transform: translate(0%, -30%);
|
||||
}
|
||||
to {
|
||||
height: 80px;
|
||||
|
@ -277,9 +277,9 @@ $modal-z: 9999999;
|
|||
max-height: 0px;
|
||||
min-height: 0px;
|
||||
opacity: 0;
|
||||
-ms-transform: translate(2%, -30%); /* IE 9 */
|
||||
-webkit-transform: translate(2%, -30%); /* Safari */
|
||||
transform: translate(2%, -30%);
|
||||
-ms-transform: translate(0%, -30%); /* IE 9 */
|
||||
-webkit-transform: translate(0%, -30%); /* Safari */
|
||||
transform: translate(0%, -30%);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
:title="metadatum.metadatum.name"
|
||||
:message="metadatum.metadatum.description"/>
|
||||
</span>
|
||||
<transition name="filter-item">
|
||||
<div
|
||||
v-show="isCollapsed || metadatumTypeMessage == 'is-danger'"
|
||||
v-if="isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
|
||||
|
@ -62,9 +63,11 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
</transition>
|
||||
<transition name="filter-item">
|
||||
<div
|
||||
v-show="isCollapsed"
|
||||
v-else>
|
||||
v-if="!isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
|
||||
<component
|
||||
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
|
||||
:is="metadatum.metadatum.metadata_type_object.component"
|
||||
|
@ -72,6 +75,7 @@
|
|||
:metadatum="metadatum"
|
||||
@input="emitIsChangingValue()"/>
|
||||
</div>
|
||||
</transition>
|
||||
</b-field>
|
||||
</template>
|
||||
|
||||
|
|
Loading…
Reference in New Issue