Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further badge tweaks

Browse Source
This commit is contained in:
Oliver 2021-10-28 17:57:03 +11:00
parent f8ac016d60
commit 3ce8ba85f4
4 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
InvenTree/InvenTree/static/css/inventree.css
View File

@ -434,22 +434,6 @@
.badge { .badge {
float: right; float: right;
background-color: #777;
color: #fff;
border-radius: 5px;
margin-left: 10px;
}
.badge-alert {
background-color: #f33;
}
.badge-orange {
background-color: #fcba03;
}
.badge-green {
background-color: #1A1;
} }
.part-properties > span { .part-properties > span {

8
InvenTree/templates/InvenTree/index.html
View File

@ -48,7 +48,7 @@ function addHeaderAction(label, title, icon, options) {
<span class='fas ${icon}'></span> <span class='fas ${icon}'></span>
${title} ${title}
</a> </a>
<span class='badge' id='badge-${label}'> <span class='badge rounded-pill bg-dark' id='badge-${label}'>
<span class='fas fa-spin fa-spinner'></span> <span class='fas fa-spin fa-spinner'></span>
</span> </span>
</li>` </li>`
@ -89,8 +89,12 @@ function addHeaderAction(label, title, icon, options) {
$(`#badge-${label}`).html(count); $(`#badge-${label}`).html(count);
$(`#badge-${label}`).removeClass('bg-dark');
if (count > 0) { if (count > 0) {
$(`#badge-${label}`).addClass('badge-orange'); $(`#badge-${label}`).addClass('bg-primary');
} else {
$(`#badge-${label}`).addClass('bg-warning');
} }
}); });
} }

8
InvenTree/templates/InvenTree/search.html
View File

@ -61,7 +61,7 @@
<span class='fas ${icon}'></span> <span class='fas ${icon}'></span>
${title} ${title}
</a> </a>
<span class='badge' id='badge-${label}'> <span class='badge rounded-pill bg-dark' id='badge-${label}'>
<span class='fas fa-spin fa-spinner'></span> <span class='fas fa-spin fa-spinner'></span>
</span> </span>
</li>` </li>`
@ -104,8 +104,12 @@
$(`#badge-${label}`).html(count); $(`#badge-${label}`).html(count);
$(`#badge-${label}`).removeClass('bg-dark');
if (count > 0) { if (count > 0) {
$(`#badge-${label}`).addClass('badge-orange'); $(`#badge-${label}`).addClass('bg-primary');
} else {
$(`#badge-${label}`).addClass('bg-warning');
} }
}); });
} }

4
InvenTree/templates/js/translated/stock.js
View File

@ -884,10 +884,6 @@ function loadStockTable(table, options) {
return html; return html;
} }
}; };
if (!options.params.ordering) {
col['sortable'] = true;
}
columns.push(col); columns.push(col);