kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +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
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
4 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
public/css/grocy.css
View File

@ -94,10 +94,10 @@ body.fullscreen-card {
margin: 0 auto; margin: 0 auto;
} }
.form-check-input.is-valid ~ .form-check-label, .form-check-input.is-valid~.form-check-label,
.was-validated .form-check-input:valid ~ .form-check-label, .was-validated .form-check-input:valid~.form-check-label,
.custom-control-input.is-valid ~ .custom-control-label, .custom-control-input.is-valid~.custom-control-label,
.was-validated .custom-control-input:valid ~ .custom-control-label { .was-validated .custom-control-input:valid~.custom-control-label {
color: inherit; color: inherit;
} }
@ -192,20 +192,20 @@ form.has-sticky-form-footer .form-group:nth-last-child(2) {
border-color: #d6d6d6 !important; border-color: #d6d6d6 !important;
} }
.navbar-sidenav > li, .navbar-sidenav>li,
.sidenav-second-level > li { .sidenav-second-level>li {
transition: all 0.3s !important; transition: all 0.3s !important;
} }
.navbar-sidenav > li:hover, .navbar-sidenav>li:hover,
.sidenav-second-level > li:hover, .sidenav-second-level>li:hover,
.navbar-nav .dropdown-item:hover { .navbar-nav .dropdown-item:hover {
box-shadow: inset 5px 0 0 #337ab7 !important; box-shadow: inset 5px 0 0 #337ab7 !important;
background-color: #d6d6d6 !important; background-color: #d6d6d6 !important;
} }
.navbar-sidenav > li > a:focus, .navbar-sidenav>li>a:focus,
.sidenav-second-level > li > a:focus, .sidenav-second-level>li>a:focus,
.navbar-nav .dropdown-item:focus { .navbar-nav .dropdown-item:focus {
box-shadow: inset 5px 0 0 #ab2230 !important; box-shadow: inset 5px 0 0 #ab2230 !important;
background-color: #d6d6d6 !important; background-color: #d6d6d6 !important;
@ -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;
@ -346,7 +349,7 @@ a:not([href]) {
font-size: 125%; font-size: 125%;
} }
.input-group > .form-control:focus { .input-group>.form-control:focus {
z-index: inherit; z-index: inherit;
} }
@ -384,7 +387,7 @@ tr.dtrg-group {
} }
/* Third party component customizations - toastr */ /* Third party component customizations - toastr */
#toast-container > div { #toast-container>div {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
@ -397,7 +400,7 @@ tr.dtrg-group {
background-color: #dc3545; background-color: #dc3545;
} }
#toast-container > div { #toast-container>div {
box-shadow: none; box-shadow: none;
} }
@ -408,19 +411,19 @@ tr.dtrg-group {
} }
/* Third party component customizations - SB Admin 2 */ /* Third party component customizations - SB Admin 2 */
#mainNav .navbar-collapse .navbar-nav > .nav-item.dropdown > .nav-link:after, #mainNav .navbar-collapse .navbar-nav>.nav-item.dropdown>.nav-link:after,
#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse:after { #mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
font-family: 'Font Awesome 5 Free'; font-family: 'Font Awesome 5 Free';
font-weight: 900; font-weight: 900;
} }
#mainNav .navbar-collapse .navbar-nav > .nav-item.dropdown > .nav-link.py-0:after, #mainNav .navbar-collapse .navbar-nav>.nav-item.dropdown>.nav-link.py-0:after,
#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse.py-0:after { #mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse.py-0:after {
padding-top: 8px; padding-top: 8px;
} }
#mainNav .navbar-collapse .navbar-sidenav > .nav-item > .nav-link, #mainNav .navbar-collapse .navbar-sidenav>.nav-item>.nav-link,
#mainNav .navbar-collapse .navbar-sidenav > .nav-item .sidenav-second-level > li > a { #mainNav .navbar-collapse .navbar-sidenav>.nav-item .sidenav-second-level>li>a {
padding: 0.75em; padding: 0.75em;
} }
@ -460,7 +463,7 @@ html {
margin-left: -0.15em !important; margin-left: -0.15em !important;
} }
#mainNav .navbar-collapse .navbar-sidenav > .nav-item > .nav-link { #mainNav .navbar-collapse .navbar-sidenav>.nav-item>.nav-link {
padding-right: 1.25em !important; padding-right: 1.25em !important;
} }
@ -492,7 +495,6 @@ canvas.drawingBuffer {
top: 0; top: 0;
} }
.warning-message, .warning-message,
.error-message, .error-message,
.normal-message, .normal-message,
@ -603,7 +605,7 @@ canvas.drawingBuffer {
margin-bottom: -.65rem; margin-bottom: -.65rem;
} }
.grocy-tabs.tab-content > .active { .grocy-tabs.tab-content>.active {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
@ -615,7 +617,7 @@ canvas.drawingBuffer {
} }
@media print { @media print {
.grocy-tabs.print.tab-content > .tab-pane { .grocy-tabs.print.tab-content>.tab-pane {
display: flex !important; display: flex !important;
flex-direction: column !important; flex-direction: column !important;
opacity: 1 !important; opacity: 1 !important;
@ -625,7 +627,7 @@ canvas.drawingBuffer {
height: auto !important; height: auto !important;
} }
.grocy-tabs.break > .tab-pane { .grocy-tabs.break>.tab-pane {
page-break-after: always; page-break-after: always;
} }

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;