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

Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
weryques 2018-08-06 10:50:36 -03:00
parent 1def75a4cc df01b1e047
commit 28f7b1cab5
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/admin/components/lists/processes-list.vue
View File

@ -125,14 +125,14 @@
<td
class="column-small-width"
:label="$i18n.get('label_last_processed_on')"
:aria-label="$i18n.get('label_last_processed_on') + ' ' + getDate(bgProcess.last_processed_on)">
:aria-label="$i18n.get('label_last_processed_on') + ' ' + getDate(bgProcess.processed_last)">
<p
v-tooltip="{
content: getDate(bgProcess.last_processed_on),
content: getDate(bgProcess.processed_last),
autoHide: false,
placement: 'auto-start'
}">
{{ getDate(bgProcess.last_processed_on) }}</p>
{{ getDate(bgProcess.processed_last) }}</p>
</td>
<!-- Logs -->
<td

2
src/admin/scss/_buttons.scss
View File

@ -27,7 +27,7 @@
transform: none !important;
}
&.is-outlined {
color: #150e38 !important;
color: $turquoise5 !important;
background-color: white !important;
border-color: $gray4 !important;
}

2
src/admin/scss/_variables.scss
View File

@ -17,7 +17,7 @@ $blue5-invert: findColorInvert($blue5);
// Turquoise, used mainly for collection level
$turquoise1: #e6f6f8;
$turquoise1-invert: findColorInvert($turquoise1);
$turquoise2: #ceedef;
$turquoise2: #d9eced;
$turquoise2-invert: findColorInvert($turquoise2);
$turquoise3: #76c6cc;
$turquoise3-invert: findColorInvert($turquoise3);

3
src/admin/scss/tainacan-admin.scss
View File

@ -100,6 +100,9 @@ a:hover {
color: $gray4 !important;
background-color: $gray2 !important;
}
.button.is-outlined {
color: $blue5 !important;
}
.tabs {
li.is-active a {
border-bottom: 5px solid $blue5;

11
src/theme-helper/view-mode-records.vue
View File

@ -27,13 +27,14 @@
<div
class="media"
@click="goToItemPage(item)">
<a
v-if="item.thumbnail != undefined"
@click="goToItemPage(item)">
<img :src="item['thumbnail'].medium_large ? item['thumbnail'].medium_large : thumbPlaceholderPath">
</a>
<div class="list-metadata media-body">
<a
v-if="item.thumbnail != undefined"
@click="goToItemPage(item)">
<img :src="item['thumbnail'].medium_large ? item['thumbnail'].medium_large : thumbPlaceholderPath">
</a>
<span
v-for="(column, index) in displayedMetadata"
:key="index"