Merge branch 'develop' of https://github.com/tainacan/tainacan into develop
This commit is contained in:
weryques
commit
194cf8285d
|
|
@ -80,7 +80,7 @@
|
|||
margin: $header-height auto 0 auto;
|
||||
position: relative;
|
||||
overflow-y: auto;
|
||||
height: calc(100% - 52px);
|
||||
height: calc(100% - 53px);
|
||||
|
||||
@media screen and (max-width: 769px) {
|
||||
& {
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
width: 23px;
|
||||
border: none;
|
||||
background-color: $primary-light;
|
||||
color: $tertiary;
|
||||
color: $secondary;
|
||||
padding: 0px;
|
||||
border-top-right-radius: 2px;
|
||||
border-bottom-right-radius: 2px;
|
||||
|
|
|
|||
|
|
@ -649,6 +649,9 @@ export default {
|
|||
|
||||
@import "../../scss/_variables.scss";
|
||||
|
||||
.tainacan-form>.columns>.column {
|
||||
overflow: auto;
|
||||
}
|
||||
.thumbnail-field {
|
||||
max-height: 128px;
|
||||
margin-bottom: 96px;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
form.document_type != undefined && form.document_type != null &&
|
||||
form.document != '' && form.document_type != 'empty'">
|
||||
<div v-if="form.document_type == 'attachment'">
|
||||
File ID: {{ form.document }}
|
||||
<div v-html="item.document_as_html" />
|
||||
<button
|
||||
class="button is-primary"
|
||||
size="is-small"
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
</button>
|
||||
</div>
|
||||
<div v-if="form.document_type == 'text'">
|
||||
<p>{{ form.document }}</p>
|
||||
<div v-html="item.document_as_html" />
|
||||
<button
|
||||
class="button is-primary"
|
||||
size="is-small"
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
</button>
|
||||
</div>
|
||||
<div v-if="form.document_type == 'url'">
|
||||
<p>{{ form.document }}</p>
|
||||
<div v-html="item.document_as_html" />
|
||||
<button
|
||||
class="button is-primary"
|
||||
size="is-small"
|
||||
|
|
@ -469,7 +469,11 @@ export default {
|
|||
onSave: (file) => {
|
||||
this.form.document_type = 'attachment';
|
||||
this.form.document = file.id + '';
|
||||
this.updateItemDocument({ item_id: this.itemId, document: this.form.document, document_type: this.form.document_type });
|
||||
this.updateItemDocument({ item_id: this.itemId, document: this.form.document, document_type: this.form.document_type })
|
||||
.then((item) => {
|
||||
this.item.document_as_html = item.document_as_html;
|
||||
})
|
||||
.catch(error => this.$console.error(error));
|
||||
}
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -16,16 +16,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="level-right">
|
||||
<a
|
||||
v-show="!showSearch"
|
||||
@click="showSearch = true;"
|
||||
class="level-item">
|
||||
<b-icon icon="magnify"/>
|
||||
</a>
|
||||
<span
|
||||
@mouseleave="searchTerm.length <= 0 ? showSearch = false : showSearch = true"
|
||||
v-show="showSearch"
|
||||
class="search-area">
|
||||
<span class="search-area">
|
||||
<b-input
|
||||
:placeholder="$i18n.get('instruction_search_repository')"
|
||||
type="search"
|
||||
|
|
@ -51,7 +42,6 @@ export default {
|
|||
return {
|
||||
logoHeader: tainacan_plugin.base_url + '/admin/images/tainacan_logo_header.png',
|
||||
wordpressAdmin: window.location.origin + window.location.pathname.replace('admin.php', ''),
|
||||
showSearch: false,
|
||||
searchTerm: ''
|
||||
}
|
||||
},
|
||||
|
|
@ -83,7 +73,7 @@ export default {
|
|||
margin-left: -12px;
|
||||
|
||||
.level-item{
|
||||
height: 52px;
|
||||
height: $header-height;
|
||||
width: 180px;
|
||||
transition: margin 0.15s linear;
|
||||
-webkit-transition: margin 0.15s linear;
|
||||
|
|
@ -91,7 +81,7 @@ export default {
|
|||
cursor: pointer;
|
||||
|
||||
&:hover{
|
||||
background-color: #257887;
|
||||
background-color: #257787;
|
||||
}
|
||||
&:focus {
|
||||
box-shadow: none;
|
||||
|
|
@ -115,7 +105,10 @@ export default {
|
|||
align-items: center;
|
||||
|
||||
input {
|
||||
height: 27px;
|
||||
margin: 0px 12px;
|
||||
font-size: 11px;
|
||||
color: $gray-light;
|
||||
}
|
||||
.icon {
|
||||
color: $tertiary;
|
||||
|
|
|
|||
|
|
@ -126,8 +126,7 @@
|
|||
isLoadingFilters: false,
|
||||
isLoadingFields: false,
|
||||
hasFiltered: false,
|
||||
isFiltersMenuCompressed: false,
|
||||
collapseAll: true,
|
||||
isFiltersMenuCompressed: false
|
||||
}
|
||||
},
|
||||
props: {
|
||||
|
|
@ -154,14 +153,7 @@
|
|||
]),
|
||||
...mapGetters('filter', [
|
||||
'getFilters'
|
||||
]),
|
||||
toggleCollapseAll() {
|
||||
this.collapseAll = !this.collapseAll;
|
||||
|
||||
for (let i = 0; i < this.fieldCollapses.length; i++)
|
||||
this.fieldCollapses[i] = this.collapseAll;
|
||||
|
||||
},
|
||||
])
|
||||
},
|
||||
computed: {
|
||||
items() {
|
||||
|
|
@ -282,11 +274,6 @@
|
|||
|
||||
@import '../../scss/_variables.scss';
|
||||
|
||||
.collapse-all {
|
||||
font-size: 12px;
|
||||
.icon { vertical-align: bottom; }
|
||||
}
|
||||
|
||||
.page-container, .page-container-small {
|
||||
padding: 0px;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ $primary: #2cb4c1;// #25a189;
|
|||
$primary-invert: findColorInvert($primary);
|
||||
$secondary: #298596;
|
||||
$secondary-invert: findColorInvert($secondary);
|
||||
$tertiary: #1f2f56;
|
||||
$tertiary: #01295c;
|
||||
$tertiary-invert: findColorInvert($tertiary);
|
||||
|
||||
$primary-light:#A5CDD7;
|
||||
|
|
@ -53,11 +53,11 @@ $colors: map-merge($colors, $addColors);
|
|||
$size-small: 0.85em; // 0.75em on Bulma.
|
||||
|
||||
// Tainacan Header and side menus
|
||||
$header-height: 52px;
|
||||
$header-height: 53px;
|
||||
$subheader-height: 82px;
|
||||
$side-menu-width: 180px;
|
||||
$filter-menu-width: 200px;
|
||||
$page-height: calc(100% - 52px);
|
||||
$page-height: calc(100% - 53px);
|
||||
|
||||
// Overall Pages padding:
|
||||
$page-side-padding: 82px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue