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

Visual refresh

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-08 20:50:35 +01:00
parent 98fad559d4
commit 1900a5b8a2
18 changed files with 126 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
public/css/grocy.css
View File

@@ -1,6 +1,6 @@
/* Main style customizations */
body {
font-family: 'Open Sans', sans-serif;
font-family: 'Roboto', sans-serif;
}
.content-text {
@@ -16,14 +16,23 @@ body {
font-size: 0.8em;
}
a.discrete-link {
color: inherit !important;
transition: all 0.3s !important;
a:not(.btn):not(.nav-link):not(.dropdown-item) {
color: inherit;
text-decoration: underline;
text-decoration-style: dotted;
text-underline-offset: 0.2rem;
}
a.discrete-link:hover,
a.discrete-link:focus {
color: #337ab7 !important;
a:not(.btn):not(.nav-link):not(.dropdown-item):hover {
text-decoration: underline;
}
a.discrete-link {
color: inherit !important;
text-decoration: none !important;
}
a.discrete-link:hover {
text-decoration: none !important;
}
@@ -31,13 +40,8 @@ a.discrete-link:focus {
background-color: inherit;
}
.grocy-card .card-title {
color: #495157;
}
.grocy-card .card-icons a {
font-size: 22px;
color: #495157;
padding: 2px 4px;
text-decoration: none;
text-align: center;
@@ -116,12 +120,7 @@ iframe.embed-responsive {
/* Hide the default up/down arrow buttons for number inputs because we use our own buttons in numberpicker */
input[type='number'] {
-moz-appearance: textfield;
}
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
appearance: textfield;
}
.sticky-form-footer {
@@ -448,7 +447,7 @@ canvas.drawingBuffer {
}
.grocy-tabs .nav-link {
color: #767676;
color: inherit;
text-transform: uppercase;
}
@@ -459,12 +458,12 @@ canvas.drawingBuffer {
.grocy-tabs .nav-link.active {
border: 2px solid transparent;
border-bottom-color: #0b024c !important;
border-bottom-color: #000 !important;
}
.grocy-tabs .nav-link:hover {
border: 2px solid transparent;
border-bottom-color: #0b024c7d;
border-bottom-color: #000;
}
.grocy-tabs .nav-item {

84
public/css/grocy_menu_layout.css
View File

@@ -28,7 +28,7 @@ body.fixed-nav {
#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
float: right;
content: '\f107';
font-family: 'Font Awesome 5 Free';
font-family: 'Font Awesome 6 Free';
}
#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse.collapsed:after {
@@ -78,7 +78,7 @@ body.fixed-nav {
width: auto;
content: '\f105';
border: none;
font-family: 'Font Awesome 5 Free';
font-family: 'Font Awesome 6 Free';
}
#mainNav .navbar-collapse .navbar-nav>.nav-item.dropdown>.nav-link .indicator {
@@ -120,8 +120,6 @@ body.fixed-nav {
position: absolute;
top: 0;
left: 0;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
margin-top: 56px;
}
@@ -202,8 +200,6 @@ body.fixed-nav {
top: 0;
left: 0;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
margin-top: calc(100vh - 56px);
}
@@ -218,16 +214,8 @@ body.fixed-nav {
}
}
#mainNav.fixed-top.navbar-dark .sidenav-toggler {
background-color: #212529;
}
#mainNav.fixed-top.navbar-dark .sidenav-toggler a i {
color: #adb5bd;
}
#mainNav.fixed-top.navbar-light .sidenav-toggler {
background-color: #dee2e6;
background-color: #d6d6d6;
}
#mainNav.fixed-top.navbar-light .sidenav-toggler a i {
@@ -245,12 +233,8 @@ body.sidenav-toggled #mainNav.fixed-top .sidenav-toggler .nav-link {
}
body.sidenav-toggled #mainNav.fixed-top #sidenavToggler i {
-webkit-transform: scaleX(-1);
-moz-transform: scaleX(-1);
-o-transform: scaleX(-1);
transform: scaleX(-1);
filter: FlipH;
-ms-filter: 'FlipH';
}
.content-wrapper {
@@ -304,34 +288,6 @@ body.sidenav-toggled .navbar-sidenav-tooltip.show {
display: flex;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
color: #868e96;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item>.nav-link {
color: #868e96;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item>.nav-link:hover {
color: #adb5bd;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-second-level>li>a,
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-third-level>li>a {
color: #868e96;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-second-level>li>a:focus,
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-second-level>li>a:hover,
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-third-level>li>a:focus,
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-third-level>li>a:hover {
color: #adb5bd;
}
#mainNav.navbar-dark .navbar-collapse .navbar-nav>.nav-item.dropdown>.nav-link:after {
color: #adb5bd;
}
#mainNav {
padding-left: 0.25rem;
padding-right: 0.25rem;
@@ -346,25 +302,6 @@ body.sidenav-toggled .navbar-sidenav-tooltip.show {
.sidenav-toggled>#mainNav {
padding-left: 0.25rem;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav {
background: #343a40;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav li.active a {
color: white !important;
background-color: #495057;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav li.active a:focus,
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav li.active a:hover {
color: white;
}
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-second-level,
#mainNav.navbar-dark .navbar-collapse .navbar-sidenav>.nav-item .sidenav-third-level {
background: #343a40;
}
}
#mainNav.navbar-light .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
@@ -402,7 +339,7 @@ body.sidenav-toggled .navbar-sidenav-tooltip.show {
#mainNav.navbar-light .navbar-collapse .navbar-sidenav li.active a {
color: #000 !important;
background-color: #e9ecef;
background-color: #d6d6d6;
}
#mainNav.navbar-light .navbar-collapse .navbar-sidenav li.active a:focus,
@@ -462,11 +399,6 @@ body.sidenav-toggled .navbar-sidenav-tooltip.show {
border-color: #d6d6d6 !important;
}
.navbar-sidenav>li,
.sidenav-second-level>li {
transition: all 0.3s !important;
}
.navbar-sidenav>li:hover,
.sidenav-second-level>li:hover,
.navbar-nav .dropdown-item:hover,
@@ -474,21 +406,17 @@ body.sidenav-toggled .navbar-sidenav-tooltip.show {
.sidenav-second-level>li>a:focus,
.navbar-nav .dropdown-item:focus,
.active-page {
box-shadow: inset 5px 0 0 #337ab7 !important;
box-shadow: inset 7px 0 0 #337ab7 !important;
background-color: #d6d6d6 !important;
}
.active-page {
color: #337ab7 !important;
}
.navbar-brand {
margin-right: 0;
}
#mainNav .navbar-collapse .navbar-nav>.nav-item.dropdown>.nav-link:after,
#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
font-family: 'Font Awesome 5 Free';
font-family: 'Font Awesome 6 Free';
font-weight: 900;
}

4
public/js/grocy.js
View File

@@ -350,10 +350,6 @@ toastr.options = {
extendedTimeOut: 5000
};
window.FontAwesomeConfig = {
searchPseudoElements: true
}
Grocy.FrontendHelpers = {};
Grocy.FrontendHelpers.ValidateForm = function(formId, reportValidity = false)
{

2
public/viewjs/components/barcodescanner.js
View File

@@ -234,7 +234,7 @@ $(document).on("click", "#barcodescanner-start-button", async function(e)
closeButton: true,
buttons: {
torch: {
label: '<i class="fa-regular fa-lightbulb"></i>',
label: '<i class="fa-solid fa-lightbulb"></i>',
className: 'btn-warning responsive-button torch',
callback: function()
{

8
public/viewjs/components/calendarcard.js
View File

@@ -8,15 +8,15 @@ $('#calendar').datetimepicker(
calendarWeeks: true,
locale: moment.locale(),
icons: {
time: 'fa-regular fa-clock',
date: 'fa-regular fa-calendar',
time: 'fa-solid fa-clock',
date: 'fa-solid fa-calendar',
up: 'fa-solid fa-arrow-up',
down: 'fa-solid fa-arrow-down',
previous: 'fa-solid fa-chevron-left',
next: 'fa-solid fa-chevron-right',
today: 'fa-solid fa-calendar-check',
clear: 'fa-regular fa-trash-alt',
close: 'fa-regular fa-times-circle'
clear: 'fa-solid fa-trash-can',
close: 'fa-solid fa-circle-xmark'
},
keepOpen: true,
inline: true,

6
public/viewjs/components/datetimepicker.js
View File

@@ -95,14 +95,14 @@ Grocy.Components.DateTimePicker.Init = function(reInit = false)
defaultDate: startDate,
useCurrent: false,
icons: {
time: 'fa-regular fa-clock',
date: 'fa-regular fa-calendar',
time: 'fa-solid fa-clock',
date: 'fa-solid fa-calendar',
up: 'fa-solid fa-arrow-up',
down: 'fa-solid fa-arrow-down',
previous: 'fa-solid fa-chevron-left',
next: 'fa-solid fa-chevron-right',
today: 'fa-solid fa-calendar-day',
clear: 'fa-regular fa-trash-alt',
clear: 'fa-solid fa-trash-can',
close: 'fa-solid fa-check'
},
sideBySide: true,

6
public/viewjs/components/datetimepicker2.js
View File

@@ -95,14 +95,14 @@ Grocy.Components.DateTimePicker2.Init = function(reInit = false)
defaultDate: startDate,
useCurrent: false,
icons: {
time: 'fa-regular fa-clock',
date: 'fa-regular fa-calendar',
time: 'fa-solid fa-clock',
date: 'fa-solid fa-calendar',
up: 'fa-solid fa-arrow-up',
down: 'fa-solid fa-arrow-down',
previous: 'fa-solid fa-chevron-left',
next: 'fa-solid fa-chevron-right',
today: 'fa-solid fa-calendar-day',
clear: 'fa-regular fa-trash-alt',
clear: 'fa-solid fa-trash-can',
close: 'fa-solid fa-check'
},
sideBySide: true,