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

CSS tweaks

Browse Source 
- Still doesn't look exactly right
This commit is contained in:
Oliver Walters 2020-04-11 22:25:34 +10:00
parent 5e706554b1
commit f06078f4ac
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,8 @@
vertical-align: middle; vertical-align: middle;
margin: 1px; margin: 1px;
padding: 2px; padding: 2px;
border: 1px solid #aaa; background: #eee;
border: 1px solid #eee;
border-radius: 3px; border-radius: 3px;
} }
@ -206,6 +207,12 @@
margin-right: 5px; margin-right: 5px;
} }
.filter-input {
display: inline-block;
*display: inline;
zoom: 1;
}
.filter-tag:hover { .filter-tag:hover {
background: #ddd; background: #ddd;
} }

16
InvenTree/InvenTree/static/script/inventree/filters.js
View File

@ -185,7 +185,7 @@ function generateAvailableFilterList(tableKey) {
var id = 'filter-tag-' + tableKey.toLowerCase(); var id = 'filter-tag-' + tableKey.toLowerCase();
var html = `<select class='form-control' id='${id}' name='tag'>`; var html = `<select class='form-control filter-input' id='${id}' name='tag'>`;
html += `<option value=''>Select filter</option>`; html += `<option value=''>Select filter</option>`;
@ -209,7 +209,7 @@ function generateFilterInput(tableKey, filterKey) {
if (filterKey == null || filterKey.length == 0) { if (filterKey == null || filterKey.length == 0) {
// Return an 'empty' element // Return an 'empty' element
return `<div id='${id}'></div>`; return `<div class='filter-input' id='${id}'></div>`;
} }
var options = getFilterOptionList(tableKey, filterKey); var options = getFilterOptionList(tableKey, filterKey);
@ -218,10 +218,10 @@ function generateFilterInput(tableKey, filterKey) {
// A 'null' options list means that a simple text-input dialog should be used // A 'null' options list means that a simple text-input dialog should be used
if (options == null) { if (options == null) {
html = `<input class='form-control' id='${id}' name='value'></input>`; html = `<input class='form-control filter-input' id='${id}' name='value'></input>`;
} else { } else {
// Return a 'select' input with the available values // Return a 'select' input with the available values
html = `<select class='form-control' id='${id}' name='value'>`; html = `<select class='form-control filter-input' id='${id}' name='value'>`;
for (var key in options) { for (var key in options) {
option = options[key]; option = options[key];
@ -286,14 +286,16 @@ function setupFilterList(tableKey, table, target) {
addClicked = true; addClicked = true;
var html = '<div>'; var html = '';
//`<div class='filter-input'>`;
html += generateAvailableFilterList(tableKey); html += generateAvailableFilterList(tableKey);
html += generateFilterInput(tableKey); html += generateFilterInput(tableKey);
html += `<button class='btn btn-default' id='${make}'>Add</button>`; html += `<button title='Create filter' class='btn btn-default filter-tag' id='${make}'><span class='fas fa-plus'></span></button>`;
html += '</div>'; //html += '</div>';
element.append(html); element.append(html);