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-07-18 14:50:39 -03:00
parent d59a563e9f 2457e16fcc
commit 473390af31
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/admin/components/other/processes-popup.vue
View File

@ -82,10 +82,12 @@
class="separator"
v-if="!showProcessesList" />
<div class="popup-footer">
<span class="icon has-text-tertiary"><i class="mdi mdi-18px mdi-autorenew"/></span>
<span
v-if="hasAnyProcessExecuting"
class="icon has-text-tertiary"><i class="mdi mdi-18px mdi-autorenew"/></span>
<p class="footer-title">
{{ hasAnyProcessExecuting ?
(bgProcesses[0].progress_label ? bgProcesses[0].progress_label + (bgProcesses[0].progress_value ? ' - ' + bgProcesses[0].progress_value : '') : $i18n.get('label_no_details_of_process')):
(bgProcesses[0].progress_label ? bgProcesses[0].progress_label + ((bgProcesses[0].progress_value && bgProcesses[0].value >= 0) ? ' - ' + bgProcesses[0].progress_value : '') : $i18n.get('label_no_details_of_process')):
$i18n.get('info_no_process')
}}
</p>

4
src/admin/pages/lists/items-page.vue
View File

@ -921,6 +921,8 @@
.filters-menu {
position: relative;
z-index: 9;
background-color: white;
width: $filter-menu-width;
min-width: 180px;
min-height: 100%;
@ -974,7 +976,7 @@
}
#filter-menu-compress-button {
position: absolute;
z-index: 9;
z-index: 99;
top: 152px;
left: 0;
max-width: 23px;

7
src/admin/theme-items-list.vue
View File

@ -287,7 +287,8 @@ export default {
}
.filters-menu {
height: auto;
// height: auto;
position: absolute !important;
min-width: $filter-menu-width-theme;
border-right: 0;
padding: 25px 12px 25px 4.1666667%;
@ -327,6 +328,10 @@ export default {
#items-list-area {
width: 100%;
overflow-y: unset;
margin-left: 0;
&.spaced-to-right {
margin-left: $filter-menu-width-theme;
}
}
}