mirror of
https://github.com/grocy/grocy.git
synced 2025-08-17 03:04:36 +00:00
Visual refresh
This commit is contained in:
Bernd Bestel
@@ -14,7 +14,7 @@
|
||||
"ezyang/htmlpurifier": "^4.13",
|
||||
"interficieis/php-barcode": "^2.0.2",
|
||||
"guzzlehttp/guzzle": "^7.0",
|
||||
"mike42/escpos-php": "^3.0"
|
||||
"mike42/escpos-php": "^4.0"
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
|
||||
118
composer.lock
generated
118
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "6dfc1d419951aa282b533401e748ee0d",
|
||||
"content-hash": "1cf8f22d7531c954a9e4297eb65c5e03",
|
||||
"packages": [
|
||||
{
|
||||
"name": "berrnd/slim-blade-view",
|
||||
@@ -1055,7 +1055,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/bus",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/bus.git",
|
||||
@@ -1108,16 +1108,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/collections",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/collections.git",
|
||||
"reference": "21868f9ac221a42d4346dc56495d11ab7e0d339a"
|
||||
"reference": "9100b083eeb85d38d78fc1de28f7326596ab2eda"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/21868f9ac221a42d4346dc56495d11ab7e0d339a",
|
||||
"reference": "21868f9ac221a42d4346dc56495d11ab7e0d339a",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/9100b083eeb85d38d78fc1de28f7326596ab2eda",
|
||||
"reference": "9100b083eeb85d38d78fc1de28f7326596ab2eda",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1160,11 +1160,11 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-12-13T13:58:10+00:00"
|
||||
"time": "2024-12-18T14:14:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/conditionable",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/conditionable.git",
|
||||
@@ -1210,7 +1210,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/container",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/container.git",
|
||||
@@ -1261,7 +1261,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/contracts",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/contracts.git",
|
||||
@@ -1309,7 +1309,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/events",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/events.git",
|
||||
@@ -1364,7 +1364,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/filesystem",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/filesystem.git",
|
||||
@@ -1431,7 +1431,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/macroable",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/macroable.git",
|
||||
@@ -1477,7 +1477,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/pipeline",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/pipeline.git",
|
||||
@@ -1525,16 +1525,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "fba1ff58e30fa280248ce3db9b18d6341c6ac339"
|
||||
"reference": "388c916b143a104e732cbaf7e6b19cd7a4e21a1e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/fba1ff58e30fa280248ce3db9b18d6341c6ac339",
|
||||
"reference": "fba1ff58e30fa280248ce3db9b18d6341c6ac339",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/388c916b143a104e732cbaf7e6b19cd7a4e21a1e",
|
||||
"reference": "388c916b143a104e732cbaf7e6b19cd7a4e21a1e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1558,7 +1558,7 @@
|
||||
},
|
||||
"suggest": {
|
||||
"illuminate/filesystem": "Required to use the Composer class (^11.0).",
|
||||
"laravel/serializable-closure": "Required to use the once function (^1.3).",
|
||||
"laravel/serializable-closure": "Required to use the once function (^1.3|^2.0).",
|
||||
"league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.6).",
|
||||
"league/uri": "Required to use the Uri class (^7.5.1).",
|
||||
"ramsey/uuid": "Required to use Str::uuid() (^4.7).",
|
||||
@@ -1598,20 +1598,20 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-12-17T20:20:09+00:00"
|
||||
"time": "2024-12-20T14:43:22+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/view",
|
||||
"version": "v11.36.1",
|
||||
"version": "v11.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/view.git",
|
||||
"reference": "4b99f92084c9ff0a896d35c43c3ebd492e9ed1b3"
|
||||
"reference": "24f011946fbe2159f56ea61399ec779784d0c027"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/view/zipball/4b99f92084c9ff0a896d35c43c3ebd492e9ed1b3",
|
||||
"reference": "4b99f92084c9ff0a896d35c43c3ebd492e9ed1b3",
|
||||
"url": "https://api.github.com/repos/illuminate/view/zipball/24f011946fbe2159f56ea61399ec779784d0c027",
|
||||
"reference": "24f011946fbe2159f56ea61399ec779784d0c027",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1652,7 +1652,7 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-12-13T14:08:30+00:00"
|
||||
"time": "2024-12-26T21:39:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "interficieis/php-barcode",
|
||||
@@ -1768,16 +1768,16 @@
|
||||
},
|
||||
{
|
||||
"name": "mike42/escpos-php",
|
||||
"version": "v3.0",
|
||||
"version": "v4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mike42/escpos-php.git",
|
||||
"reference": "dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3"
|
||||
"reference": "74fd89a3384135c90a8c6dc4b724e03df7c0e4f9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/mike42/escpos-php/zipball/dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3",
|
||||
"reference": "dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3",
|
||||
"url": "https://api.github.com/repos/mike42/escpos-php/zipball/74fd89a3384135c90a8c6dc4b724e03df7c0e4f9",
|
||||
"reference": "74fd89a3384135c90a8c6dc4b724e03df7c0e4f9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1785,10 +1785,10 @@
|
||||
"ext-json": "*",
|
||||
"ext-zlib": "*",
|
||||
"mike42/gfx-php": "^0.6",
|
||||
"php": ">=7.0.0"
|
||||
"php": ">=7.3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^6.5",
|
||||
"phpunit/phpunit": "^9",
|
||||
"squizlabs/php_codesniffer": "^3.3"
|
||||
},
|
||||
"suggest": {
|
||||
@@ -1822,9 +1822,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/mike42/escpos-php/issues",
|
||||
"source": "https://github.com/mike42/escpos-php/tree/v3.0"
|
||||
"source": "https://github.com/mike42/escpos-php/tree/v4.0"
|
||||
},
|
||||
"time": "2019-10-13T06:27:43+00:00"
|
||||
"time": "2022-05-23T11:05:09+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mike42/gfx-php",
|
||||
@@ -1932,16 +1932,16 @@
|
||||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
"version": "3.8.3",
|
||||
"version": "3.8.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/briannesbitt/Carbon.git",
|
||||
"reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe"
|
||||
"url": "https://github.com/CarbonPHP/carbon.git",
|
||||
"reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
|
||||
"reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
|
||||
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
|
||||
"reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2034,7 +2034,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-12-21T18:03:19+00:00"
|
||||
"time": "2024-12-27T09:25:35+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/fast-route",
|
||||
@@ -3283,12 +3283,12 @@
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"thanks": {
|
||||
"url": "https://github.com/symfony/contracts",
|
||||
"name": "symfony/contracts"
|
||||
},
|
||||
"branch-alias": {
|
||||
"dev-main": "3.5-dev"
|
||||
},
|
||||
"thanks": {
|
||||
"name": "symfony/contracts",
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -3333,16 +3333,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v7.2.0",
|
||||
"version": "v7.2.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
"reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49"
|
||||
"reference": "87a71856f2f56e4100373e92529eed3171695cfb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49",
|
||||
"reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
|
||||
"reference": "87a71856f2f56e4100373e92529eed3171695cfb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3377,7 +3377,7 @@
|
||||
"description": "Finds files and directories via an intuitive fluent interface",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/finder/tree/v7.2.0"
|
||||
"source": "https://github.com/symfony/finder/tree/v7.2.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -3393,7 +3393,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-10-23T06:56:12+00:00"
|
||||
"time": "2024-12-30T19:00:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
@@ -3633,16 +3633,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v7.2.0",
|
||||
"version": "v7.2.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5"
|
||||
"reference": "e2674a30132b7cc4d74540d6c2573aa363f05923"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5",
|
||||
"reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/e2674a30132b7cc4d74540d6c2573aa363f05923",
|
||||
"reference": "e2674a30132b7cc4d74540d6c2573aa363f05923",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3708,7 +3708,7 @@
|
||||
"description": "Provides tools to internationalize your application",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/translation/tree/v7.2.0"
|
||||
"source": "https://github.com/symfony/translation/tree/v7.2.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -3724,7 +3724,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-11-12T20:47:56+00:00"
|
||||
"time": "2024-12-07T08:18:10+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation-contracts",
|
||||
@@ -3745,12 +3745,12 @@
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"thanks": {
|
||||
"url": "https://github.com/symfony/contracts",
|
||||
"name": "symfony/contracts"
|
||||
},
|
||||
"branch-alias": {
|
||||
"dev-main": "3.5-dev"
|
||||
},
|
||||
"thanks": {
|
||||
"name": "symfony/contracts",
|
||||
"url": "https://github.com/symfony/contracts"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"dependencies": {
|
||||
"@danielfarrell/bootstrap-combobox": "https://github.com/berrnd/bootstrap-combobox.git#master",
|
||||
"@ericblade/quagga2": "^1.2.1",
|
||||
"@fontsource/open-sans": "^5.0.0",
|
||||
"@fontsource/roboto": "^5.1.1",
|
||||
"@fortawesome/fontawesome-free": "^6.1.1",
|
||||
"@iframe-resizer/child": "^5.3.2",
|
||||
"@iframe-resizer/parent": "^5.3.2",
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -350,10 +350,6 @@ toastr.options = {
|
||||
extendedTimeOut: 5000
|
||||
};
|
||||
|
||||
window.FontAwesomeConfig = {
|
||||
searchPseudoElements: true
|
||||
}
|
||||
|
||||
Grocy.FrontendHelpers = {};
|
||||
Grocy.FrontendHelpers.ValidateForm = function(formId, reportValidity = false)
|
||||
{
|
||||
|
||||
@@ -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,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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -7,22 +7,22 @@
|
||||
<div class="col-12 col-md-6 text-center">
|
||||
<h2 class="title">@yield('title')</h2>
|
||||
|
||||
<ul class="nav nav-tabs justify-content-center mt-3">
|
||||
<ul class="nav nav-tabs grocy-tabs justify-content-center mt-3">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active"
|
||||
<a class="nav-link discrete-link active"
|
||||
id="system-info-tab"
|
||||
data-toggle="tab"
|
||||
href="#system-info">{{ $__t('System info') }}</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link"
|
||||
<a class="nav-link discrete-link"
|
||||
id="changelog-tab"
|
||||
data-toggle="tab"
|
||||
href="#changelog">{{ $__t('Changelog') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content mt-3">
|
||||
<div class="tab-content grocy-tabs mt-3">
|
||||
|
||||
<div class="tab-pane show active"
|
||||
id="system-info">
|
||||
|
||||
@@ -227,7 +227,7 @@
|
||||
class="text-muted"
|
||||
data-toggle="tooltip"
|
||||
title="{{ $__t('Rescheduled') }}">
|
||||
<i class="fa-regular fa-clock"></i>
|
||||
<i class="fa-solid fa-clock"></i>
|
||||
</span>
|
||||
@endif
|
||||
</td>
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-md-8">
|
||||
<ul class="nav nav-tabs grocy-tabs">
|
||||
<ul class="nav nav-tabs grocy-tabs mb-1">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active"
|
||||
data-toggle="tab"
|
||||
|
||||
@@ -24,11 +24,13 @@
|
||||
|
||||
<title>@yield('title') | Grocy</title>
|
||||
|
||||
<link href="{{ $U('/packages/@fontsource/open-sans/latin.css?v=', true) }}{{ $version }}"
|
||||
<link href="{{ $U('/packages/@fontsource/roboto/latin.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/packages/bootstrap/dist/css/bootstrap.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/packages/@fortawesome/fontawesome-free/css/all.min.css?v=', true) }}{{ $version }}"
|
||||
<link href="{{ $U('/packages/@fortawesome/fontawesome-free/css/fontawesome.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/packages/@fortawesome/fontawesome-free/css/solid.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<link href="{{ $U('/packages/toastr/build/toastr.min.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
@@ -135,7 +137,7 @@
|
||||
</a>
|
||||
<span id="clock-container"
|
||||
class="text-muted font-italic d-none">
|
||||
<i class="fa-regular fa-clock"></i>
|
||||
<i class="fa-solid fa-clock"></i>
|
||||
<span id="clock-small"
|
||||
class="d-inline d-sm-none"></span>
|
||||
<span id="clock-big"
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
|
||||
.swagger-ui .scheme-container {
|
||||
box-shadow: none !important;
|
||||
-webkit-box-shadow: none !important;
|
||||
border-bottom: 1px solid rgba(59, 65, 81, 0.3) !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -249,7 +249,7 @@
|
||||
|
||||
<div class="tab-pane show"
|
||||
id="gallery">
|
||||
<div class="card-columns no-gutters">
|
||||
<div class="card-columns no-gutters mt-1">
|
||||
@foreach($recipes as $recipe)
|
||||
<div class="cursor-link recipe-gallery-item @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) recipe-enoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) recipe-enoughinstockwithshoppinglist @else recipe-notenoughinstock @endif"
|
||||
data-recipe-id="{{ $recipe->id }}"
|
||||
@@ -305,7 +305,7 @@
|
||||
<div id="selectedRecipeCard"
|
||||
class="card grocy-card">
|
||||
@if(count($allRecipes) > 1)
|
||||
<div class="card-header card-header-fullscreen d-print-none">
|
||||
<div class="card-header card-header-fullscreen mb-1 d-print-none">
|
||||
<ul class="nav nav-tabs grocy-tabs card-header-tabs">
|
||||
@foreach($allRecipes as $index=>$recipe)
|
||||
<li class="nav-item">
|
||||
@@ -502,7 +502,7 @@
|
||||
data-toggle="tooltip"
|
||||
data-placement="right"
|
||||
title="{{ $__t('Mark this item as done') }}">
|
||||
<i class="fa-regular fa-check-circle"></i>
|
||||
<i class="fa-solid fa-check-circle"></i>
|
||||
</a>
|
||||
@endif
|
||||
@php
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
<head>
|
||||
<title>{{ $product->name }}</title>
|
||||
<link href="{{ $U('/packages/@fontsource/open-sans/latin.css?v=', true) }}{{ $version }}"
|
||||
<link href="{{ $U('/packages/@fontsource/roboto/latin.css?v=', true) }}{{ $version }}"
|
||||
rel="stylesheet">
|
||||
<style>
|
||||
body {
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
font-family: 'Roboto', sans-serif;
|
||||
}
|
||||
|
||||
img {
|
||||
|
||||
24
yarn.lock
24
yarn.lock
@@ -28,10 +28,10 @@
|
||||
optionalDependencies:
|
||||
fsevents "2.3.3"
|
||||
|
||||
"@fontsource/open-sans@^5.0.0":
|
||||
version "5.1.0"
|
||||
resolved "https://registry.yarnpkg.com/@fontsource/open-sans/-/open-sans-5.1.0.tgz#3fb106a5e0a208bbe8e66ac5e9a2130afff6b859"
|
||||
integrity sha512-g+mjF8gWUDwck9DrRCkhmFeEj7fskjtKZJKAQguVzSg93lc6ThakTHMRgs0dZfe5qBbktrV839tDrb4bIDyZSA==
|
||||
"@fontsource/roboto@^5.1.1":
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-5.1.1.tgz#64b3f819baf8d3bcfb48c0437ddc7e4118a6ab14"
|
||||
integrity sha512-XwVVXtERDQIM7HPUIbyDe0FP4SRovpjF7zMI8M7pbqFp3ahLJsJTd18h+E6pkar6UbV3btbwkKjYARr5M+SQow==
|
||||
|
||||
"@fortawesome/fontawesome-free@^6.1.1":
|
||||
version "6.7.2"
|
||||
@@ -246,11 +246,11 @@ datatables.net-bs4@^1.10.22, datatables.net-bs4@^1.13.0:
|
||||
jquery "1.8 - 4"
|
||||
|
||||
datatables.net-bs4@^2:
|
||||
version "2.1.8"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.1.8.tgz#bf90a2729bfdff18ac71526f5b9171c43070adcd"
|
||||
integrity sha512-2mFfyD6KdeFaq5qlOWggcjLPblZTuoOFv1fHN3WzquYNiWe8BuSEEARvl7OQ+53/sEY3HOkHsbZ5+Pat0faG9Q==
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.2.0.tgz#bf35a667b05a3ee5dc4626d07c92a57d0dfc2090"
|
||||
integrity sha512-dTgsblxSftIkLuyUItcQwbRfunAhFygxwpXxLCfKmE3xA8QBkl8KREAx9OQuVxJUMc5Ao+LCknd5kT+kzEqREg==
|
||||
dependencies:
|
||||
datatables.net "2.1.8"
|
||||
datatables.net "2.2.0"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-colreorder-bs4@^1.5.2:
|
||||
@@ -319,10 +319,10 @@ datatables.net@1.13.11, datatables.net@^1.10.22, datatables.net@^1.13.0, datatab
|
||||
dependencies:
|
||||
jquery "1.8 - 4"
|
||||
|
||||
datatables.net@2.1.8, datatables.net@^2:
|
||||
version "2.1.8"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.1.8.tgz#9b020f18e927cc924d72411f62dc595cc688669b"
|
||||
integrity sha512-47ULt+U4bcjbuGTpTlT6SnCuSFVRBxxdWa6X3NfvTObBJ2BZU0o+JUIl05wQ6cABNIavjbAV51gpgvFsMHL9zA==
|
||||
datatables.net@2.2.0, datatables.net@^2:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.2.0.tgz#d7e92ede9a3bf23ac4c360e475fbe6313f16fd56"
|
||||
integrity sha512-q/G5ylL+AhMLFFHNYQAgvooCZtmbudc7wwzKkCZI4B1HnYec4SqnWtcTFjC7P6EtL1UGyx16FcjQ0U84S86mLg==
|
||||
dependencies:
|
||||
jquery ">=1.7"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user