kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

General code review

Browse Source
This commit is contained in:
Bernd Bestel
2022-04-03 19:14:54 +02:00
parent 3091a06194
commit 5c6f84a68e
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/css/grocy.css
View File

@@ -228,7 +228,8 @@ form.has-sticky-form-footer .form-group:nth-last-child(2) {
cursor: wait; cursor: wait;
} }
.expandable-text .collapse, .module .collapsing { .expandable-text .collapse,
.module .collapsing {
height: 2.4rem; height: 2.4rem;
} }
@@ -255,7 +256,8 @@ form.has-sticky-form-footer .form-group:nth-last-child(2) {
.table-inline-menu.dropdown-menu { .table-inline-menu.dropdown-menu {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
width: 96vw; /* Set width of popup menu to screen size */ width: 96vw;
/* Set width of popup menu to screen size */
} }
a:not([href]) { a:not([href]) {
@@ -331,7 +333,8 @@ a:not([href]) {
padding-right: 0.75rem !important; padding-right: 0.75rem !important;
} }
.btn-group-xs > .btn, .btn-xs { .btn-group-xs>.btn,
.btn-xs {
padding: 0.25rem 0.4rem; padding: 0.25rem 0.4rem;
font-size: 0.875rem; font-size: 0.875rem;
line-height: 0.5; line-height: 0.5;
@@ -492,7 +495,6 @@ canvas.drawingBuffer {
top: 0; top: 0;
} }
.warning-message, .warning-message,
.error-message, .error-message,
.normal-message, .normal-message,

2
public/viewjs/equipment.js
View File

@@ -80,7 +80,7 @@ function DisplayEquipment(id)
$("#file-userfield-" + userfield.name + "-download-button").addClass("d-none"); $("#file-userfield-" + userfield.name + "-download-button").addClass("d-none");
$("#file-userfield-" + userfield.name + "-empty-hint").removeClass("d-none"); $("#file-userfield-" + userfield.name + "-empty-hint").removeClass("d-none");
} }
});; });
}, },
function(xhr) function(xhr)
{ {

4
public/viewjs/equipmentform.js
View File

@@ -88,7 +88,7 @@
Grocy.Api.UploadFile($("#instruction-manual")[0].files[0], 'equipmentmanuals', jsonData.instruction_manual_file_name, Grocy.Api.UploadFile($("#instruction-manual")[0].files[0], 'equipmentmanuals', jsonData.instruction_manual_file_name,
function(result) function(result)
{ {
window.location.href = U('/equipment');; window.location.href = U('/equipment');
}, },
function(xhr) function(xhr)
{ {
@@ -99,7 +99,7 @@
} }
else else
{ {
window.location.href = U('/equipment');; window.location.href = U('/equipment');
} }
}); });
}, },

4
public/viewjs/mealplan.js
View File

@@ -606,11 +606,11 @@ $('#save-add-product-button').on('click', function(e)
} }
var jsonData = $('#add-product-form').serializeJSON(); var jsonData = $('#add-product-form').serializeJSON();
jsonData.day = Grocy.Components.DateTimePicker.GetValue();; jsonData.day = Grocy.Components.DateTimePicker.GetValue();
delete jsonData.display_amount; delete jsonData.display_amount;
jsonData.product_amount = jsonData.amount; jsonData.product_amount = jsonData.amount;
delete jsonData.amount; delete jsonData.amount;
jsonData.product_qu_id = $("#qu_id").val();; jsonData.product_qu_id = $("#qu_id").val();
delete jsonData.qu_id; delete jsonData.qu_id;
jsonData.section_id = jsonData.section_id_product; jsonData.section_id = jsonData.section_id_product;
delete jsonData.section_id_product; delete jsonData.section_id_product;