From ee9ebce9c3490d52e9fca6ec3cc0ec1678c15dc2 Mon Sep 17 00:00:00 2001 From: "ugur@nomadinteractive.co" Date: Sat, 18 Apr 2020 22:11:06 +0300 Subject: [PATCH] menu problem solved --- composer.lock | 279 ++++++------------ config/app.php | 1 - public/css/argon.css | 58 ---- public/css/custom.css | 74 +++++ .../sass/core/navbars/_navbar-vertical.scss | 65 ---- 5 files changed, 169 insertions(+), 308 deletions(-) diff --git a/composer.lock b/composer.lock index fb02c16bf..ecaf8999d 100644 --- a/composer.lock +++ b/composer.lock @@ -836,25 +836,26 @@ }, { "name": "brick/math", - "version": "0.8.14", + "version": "0.8.15", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "6f7a46b5c3d487b277f38fbd17df57d348cace8a" + "reference": "9b08d412b9da9455b210459ff71414de7e6241cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/6f7a46b5c3d487b277f38fbd17df57d348cace8a", - "reference": "6f7a46b5c3d487b277f38fbd17df57d348cace8a", + "url": "https://api.github.com/repos/brick/math/zipball/9b08d412b9da9455b210459ff71414de7e6241cd", + "reference": "9b08d412b9da9455b210459ff71414de7e6241cd", "shasum": "" }, "require": { - "php": ">=7.1" + "ext-json": "*", + "php": "^7.1|^8.0" }, "require-dev": { - "php-coveralls/php-coveralls": "2.*", - "phpunit/phpunit": "7.*", - "vimeo/psalm": "3.*" + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^7.5.15|^8.5", + "vimeo/psalm": "^3.5" }, "type": "library", "autoload": { @@ -877,20 +878,20 @@ "brick", "math" ], - "time": "2020-02-17T13:57:43+00:00" + "time": "2020-04-15T15:59:35+00:00" }, { "name": "composer/ca-bundle", - "version": "1.2.6", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e" + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e", - "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd", + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd", "shasum": "" }, "require": { @@ -933,20 +934,20 @@ "ssl", "tls" ], - "time": "2020-01-13T10:02:55+00:00" + "time": "2020-04-08T08:27:21+00:00" }, { "name": "composer/composer", - "version": "1.10.1", + "version": "1.10.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011" + "reference": "7a4d5b6aa30d2118af27c04f5e897b57156ccfa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/b912a45da3e2b22f5cb5a23e441b697a295ba011", - "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011", + "url": "https://api.github.com/repos/composer/composer/zipball/7a4d5b6aa30d2118af27c04f5e897b57156ccfa9", + "reference": "7a4d5b6aa30d2118af27c04f5e897b57156ccfa9", "shasum": "" }, "require": { @@ -1013,7 +1014,7 @@ "dependency", "package" ], - "time": "2020-03-13T19:34:27+00:00" + "time": "2020-04-10T09:44:22+00:00" }, { "name": "composer/semver", @@ -2207,16 +2208,16 @@ }, { "name": "genealabs/laravel-model-caching", - "version": "0.8.0", + "version": "0.8.3", "source": { "type": "git", "url": "https://github.com/GeneaLabs/laravel-model-caching.git", - "reference": "5b0bf609f2a758c36d3be67ca4d3413ca9f0bd79" + "reference": "a76e9f143905fca08690fdf2421b0132e8881af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/5b0bf609f2a758c36d3be67ca4d3413ca9f0bd79", - "reference": "5b0bf609f2a758c36d3be67ca4d3413ca9f0bd79", + "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/a76e9f143905fca08690fdf2421b0132e8881af4", + "reference": "a76e9f143905fca08690fdf2421b0132e8881af4", "shasum": "" }, "require": { @@ -2232,7 +2233,8 @@ "predis/predis": "^1.1" }, "require-dev": { - "fzaninotto/faker": "^1.9.1", + "fzaninotto/faker": "^1.9", + "laravel/nova": "3.*", "orchestra/testbench": "^5.0", "orchestra/testbench-browser-kit": "^5.0", "php-coveralls/php-coveralls": "^2.2", @@ -2266,7 +2268,7 @@ } ], "description": "Automatic caching for Eloquent models.", - "time": "2020-02-29T19:22:25+00:00" + "time": "2020-04-15T18:52:17+00:00" }, { "name": "genealabs/laravel-pivot-events", @@ -2321,16 +2323,16 @@ }, { "name": "graham-campbell/markdown", - "version": "v12.0.0", + "version": "v12.0.2", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git", - "reference": "1566129f213adf7f508e0bebc2399102c4c78cd6" + "reference": "584eb9f24004238b80ee98b6e7be82f0933554dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/1566129f213adf7f508e0bebc2399102c4c78cd6", - "reference": "1566129f213adf7f508e0bebc2399102c4c78cd6", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/584eb9f24004238b80ee98b6e7be82f0933554dd", + "reference": "584eb9f24004238b80ee98b6e7be82f0933554dd", "shasum": "" }, "require": { @@ -2384,27 +2386,28 @@ "laravel", "markdown" ], - "time": "2020-03-01T11:40:45+00:00" + "time": "2020-04-14T16:14:52+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.5.2", + "version": "6.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" + "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", + "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5" + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.11" }, "require-dev": { "ext-curl": "*", @@ -2412,7 +2415,6 @@ "psr/log": "^1.1" }, "suggest": { - "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", @@ -2451,7 +2453,7 @@ "rest", "web service" ], - "time": "2019-12-23T11:57:10+00:00" + "time": "2020-04-18T10:38:46+00:00" }, { "name": "guzzlehttp/promises", @@ -2645,108 +2647,18 @@ ], "time": "2019-11-02T09:15:47+00:00" }, - { - "name": "jakub-onderka/php-console-color", - "version": "v0.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "1.0", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "~4.3", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleColor\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com" - } - ], - "abandoned": "php-parallel-lint/php-console-color", - "time": "2018-09-29T17:23:10+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.4", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547", - "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "jakub-onderka/php-console-color": "~0.2", - "php": ">=5.4.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~1.0", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleHighlighter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" - } - ], - "description": "Highlight PHP code in terminal", - "abandoned": "php-parallel-lint/php-console-highlighter", - "time": "2018-09-29T18:48:56+00:00" - }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.94", + "version": "v1.2.95", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "fbd4c12741583fb9d8f0bcbf65248a34eed68fc9" + "reference": "a7936c4b60c78f8ae9024eeecf7e8d4cf470b730" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/fbd4c12741583fb9d8f0bcbf65248a34eed68fc9", - "reference": "fbd4c12741583fb9d8f0bcbf65248a34eed68fc9", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/a7936c4b60c78f8ae9024eeecf7e8d4cf470b730", + "reference": "a7936c4b60c78f8ae9024eeecf7e8d4cf470b730", "shasum": "" }, "require": { @@ -2782,7 +2694,7 @@ "crawlerdetect", "php crawler detect" ], - "time": "2020-02-20T21:42:59+00:00" + "time": "2020-04-14T20:42:56+00:00" }, { "name": "jenssegers/agent", @@ -3077,16 +2989,16 @@ }, { "name": "laravel/framework", - "version": "v7.4.0", + "version": "v7.6.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "dafdd1e19f86add02e48fa9f6cac9be2c5329772" + "reference": "695be25d84b5cedd0026c428d4e9697fe8cd06f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/dafdd1e19f86add02e48fa9f6cac9be2c5329772", - "reference": "dafdd1e19f86add02e48fa9f6cac9be2c5329772", + "url": "https://api.github.com/repos/laravel/framework/zipball/695be25d84b5cedd0026c428d4e9697fe8cd06f9", + "reference": "695be25d84b5cedd0026c428d4e9697fe8cd06f9", "shasum": "" }, "require": { @@ -3224,20 +3136,20 @@ "framework", "laravel" ], - "time": "2020-03-31T15:01:12+00:00" + "time": "2020-04-15T20:57:47+00:00" }, { "name": "laravel/tinker", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "5271893ec90ad9f8d3e34792ac6b72cad3b84cc2" + "reference": "cde90a7335a2130a4488beb68f4b2141869241db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/5271893ec90ad9f8d3e34792ac6b72cad3b84cc2", - "reference": "5271893ec90ad9f8d3e34792ac6b72cad3b84cc2", + "url": "https://api.github.com/repos/laravel/tinker/zipball/cde90a7335a2130a4488beb68f4b2141869241db", + "reference": "cde90a7335a2130a4488beb68f4b2141869241db", "shasum": "" }, "require": { @@ -3245,12 +3157,12 @@ "illuminate/contracts": "^6.0|^7.0|^8.0", "illuminate/support": "^6.0|^7.0|^8.0", "php": "^7.2", - "psy/psysh": "^0.9|^0.10", - "symfony/var-dumper": "^4.0|^5.0" + "psy/psysh": "^0.10.3", + "symfony/var-dumper": "^4.3|^5.0" }, "require-dev": { "mockery/mockery": "^1.3.1", - "phpunit/phpunit": "^8.0|^9.0" + "phpunit/phpunit": "^8.4|^9.0" }, "suggest": { "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)." @@ -3288,7 +3200,7 @@ "laravel", "psysh" ], - "time": "2020-03-17T15:34:59+00:00" + "time": "2020-04-07T15:01:31+00:00" }, { "name": "laravel/ui", @@ -3415,16 +3327,16 @@ }, { "name": "league/commonmark", - "version": "1.3.3", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "5a67afc2572ec6d430526cdc9c637ef124812389" + "reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/5a67afc2572ec6d430526cdc9c637ef124812389", - "reference": "5a67afc2572ec6d430526cdc9c637ef124812389", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/dd3261eb9a322e009fa5d96d19b9ae19708ce04b", + "reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b", "shasum": "" }, "require": { @@ -3485,20 +3397,20 @@ "md", "parser" ], - "time": "2020-04-05T16:01:48+00:00" + "time": "2020-04-13T20:52:18+00:00" }, { "name": "league/flysystem", - "version": "1.0.66", + "version": "1.0.67", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "shasum": "" }, "require": { @@ -3569,7 +3481,7 @@ "sftp", "storage" ], - "time": "2020-03-17T18:58:12+00:00" + "time": "2020-04-16T13:21:26+00:00" }, { "name": "league/fractal", @@ -4289,16 +4201,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.3.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", "shasum": "" }, "require": { @@ -4337,7 +4249,7 @@ "parser", "php" ], - "time": "2019-11-08T13:50:10+00:00" + "time": "2020-04-10T16:34:50+00:00" }, { "name": "opis/closure", @@ -4402,20 +4314,20 @@ }, { "name": "phenx/php-font-lib", - "version": "0.5.1", + "version": "0.5.2", "source": { "type": "git", "url": "https://github.com/PhenX/php-font-lib.git", - "reference": "760148820110a1ae0936e5cc35851e25a938bc97" + "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/760148820110a1ae0936e5cc35851e25a938bc97", - "reference": "760148820110a1ae0936e5cc35851e25a938bc97", + "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8", + "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8", "shasum": "" }, "require-dev": { - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^4.8.35 || ^5 || ^6 || ^7" }, "type": "library", "autoload": { @@ -4435,7 +4347,7 @@ ], "description": "A library to read, parse, export and make subsets of different types of font files.", "homepage": "https://github.com/PhenX/php-font-lib", - "time": "2017-09-13T16:14:37+00:00" + "time": "2020-03-08T15:31:32+00:00" }, { "name": "phenx/php-svg-lib", @@ -5137,23 +5049,22 @@ }, { "name": "psy/psysh", - "version": "v0.10.2", + "version": "v0.10.3", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "573c2362c3cdebe846b4adae4b630eecb350afd8" + "reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/573c2362c3cdebe846b4adae4b630eecb350afd8", - "reference": "573c2362c3cdebe846b4adae4b630eecb350afd8", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2bde2fa03e05dff0aee834598b951d6fc7c6fe02", + "reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", - "jakub-onderka/php-console-highlighter": "0.4.*|0.3.*", "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", "php": "^8.0 || ^7.0 || ^5.5.9", "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10", @@ -5161,7 +5072,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.2", - "hoa/console": "~3.16|~2.15" + "hoa/console": "3.17.*" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -5206,7 +5117,7 @@ "interactive", "shell" ], - "time": "2020-03-21T06:55:27+00:00" + "time": "2020-04-07T06:44:48+00:00" }, { "name": "ralouphie/getallheaders", @@ -7328,16 +7239,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "88f7acc95150bca002a498899f8b52f318e444c2" + "reference": "feb6dad5ae24b1380827aee1629b730080fde500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/88f7acc95150bca002a498899f8b52f318e444c2", - "reference": "88f7acc95150bca002a498899f8b52f318e444c2", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/feb6dad5ae24b1380827aee1629b730080fde500", + "reference": "feb6dad5ae24b1380827aee1629b730080fde500", "shasum": "" }, "require": { @@ -7388,7 +7299,7 @@ "env", "environment" ], - "time": "2020-03-27T23:37:15+00:00" + "time": "2020-04-12T15:20:09+00:00" }, { "name": "voku/portable-ascii", @@ -7441,16 +7352,16 @@ }, { "name": "webmozart/assert", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", + "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", + "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "shasum": "" }, "require": { @@ -7458,7 +7369,7 @@ "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -7485,7 +7396,7 @@ "check", "validate" ], - "time": "2020-02-14T12:15:55+00:00" + "time": "2020-04-18T12:12:48+00:00" } ], "packages-dev": [ diff --git a/config/app.php b/config/app.php index 36e7d7b3a..58edec322 100644 --- a/config/app.php +++ b/config/app.php @@ -137,7 +137,6 @@ return [ /* * Laravel Framework Service Providers... */ - Riverskies\Laravel\MobileDetect\MobileDetectServiceProvider::class, Illuminate\Auth\AuthServiceProvider::class, Illuminate\Broadcasting\BroadcastServiceProvider::class, Illuminate\Bus\BusServiceProvider::class, diff --git a/public/css/argon.css b/public/css/argon.css index 34b56a14d..387841195 100644 --- a/public/css/argon.css +++ b/public/css/argon.css @@ -20692,15 +20692,6 @@ textarea[resize="horizontal"] { padding-right: 1rem; font-size: 0.875rem; font-weight: 500; - color: #fff; -} - -.navbar-vertical .navbar-nav .nav-link:hover:not(.active) { - color: #fff; -} - -.navbar-vertical .navbar-nav .nav-link:focus:not(.active) { - color: #fff; } .navbar-vertical .navbar-nav .nav-link.active { @@ -21501,22 +21492,6 @@ textarea[resize="horizontal"] { height: 78px; } -@media (min-width: 1200px) { - .g-sidenav-show #panel { - margin-left: 250px; - } -} - -@media (max-width: 991.98px) { - .g-sidenav-show.g-sidenav-hidden .sidenav { - max-width: 62px !important; - } -} - -.g-sidenav-show .sidenav { - max-width: 250px !important; -} - .g-sidenav-show .sidenav .navbar-brand, .g-sidenav-show .sidenav .navbar-heading { display: block; @@ -21535,21 +21510,6 @@ textarea[resize="horizontal"] { } } -.scrollbar-inner { - width: 100%; -} - -.scrollbar-inner .sidenav-header { - padding: 0 24px; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; -} - -.g-sidenav-pinned #sidenav-collapse-main { - display: block; -} - .g-sidenav-pinned .sidenav { max-width: 250px !important; } @@ -21559,24 +21519,6 @@ textarea[resize="horizontal"] { display: block; } -@media (min-width: 1200px) { - .g-sidenav-pinned .navbar-vertical.navbar-expand-xs { - max-width: 250px !important; - } -} - -.navbar-vertical.navbar-expand-xs { - position: fixed; - top: 0; - bottom: 0; - display: block; - overflow-y: auto; - width: 100%; - max-width: 62px; - padding-right: 0; - padding-left: 0; -} - .g-sidenav-hidden:not(.g-sidenav-show) .sidenav .navbar-nav > .nav-item > .nav-link:after { content: ''; } diff --git a/public/css/custom.css b/public/css/custom.css index 0ea69d22c..1c5523a0f 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -891,3 +891,77 @@ table .align-items-center td span.badge } /*--Lg Breakpoint Finish--*/ /*--------Responsive Finish--------*/ + +/*--------Menu Fix--------*/ +.navbar-vertical .navbar-nav .nav-link:hover:not(.active) { + color: #fff; +} + +.navbar-vertical .navbar-nav .nav-link:hover:not(.active) { + color: #fff; +} + +.navbar-vertical .navbar-nav .nav-link.active i { + color: #161842 !important; +} +@media (min-width: 1200px) { + .g-sidenav-show #panel { + margin-left: 250px; + } +} + +@media (max-width: 991.98px) { + .g-sidenav-show.g-sidenav-hidden .sidenav { + max-width: 62px !important; + } +} + +.g-sidenav-show .sidenav { + max-width: 250px !important; +} + +.scrollbar-inner { + width: 100%; +} + +.scrollbar-inner .sidenav-header { + padding: 0 24px; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; +} + +.g-sidenav-pinned #sidenav-collapse-main { + display: block; +} + +@media (min-width: 1200px) { + .g-sidenav-pinned .navbar-vertical.navbar-expand-xs { + max-width: 250px !important; + } +} + +@media (min-width: 768px){ + .navbar-vertical .navbar-collapse:before { + content: ''; + display: block; + margin: 0; + } +} + +.navbar-vertical.navbar-expand-xs { + position: fixed; + top: 0; + bottom: 0; + display: block; + overflow-y: auto; + width: 100%; + max-width: 62px; + padding-right: 0; + padding-left: 0; +} + +.nav-item .nav-link { + color: #fff !important; +} + diff --git a/resources/assets/sass/core/navbars/_navbar-vertical.scss b/resources/assets/sass/core/navbars/_navbar-vertical.scss index 6cc91fb53..20e1c7017 100644 --- a/resources/assets/sass/core/navbars/_navbar-vertical.scss +++ b/resources/assets/sass/core/navbars/_navbar-vertical.scss @@ -70,21 +70,6 @@ padding-right: $navbar-padding-x; font-size: $navbar-nav-link-font-size; font-weight: $navbar-nav-link-font-weight; - color: $white; - - &:hover:not(.active) { - color: $white; - } - - &:focus:not(.active) { - color: $white; - } - - // @include media-breakpoint-down(md) { - // &:hover { - // color: $white; - // } - // } &.active { position: relative; @@ -371,24 +356,8 @@ .g-sidenav-show { - #panel { - @include media-breakpoint-up(xl) { - margin-left: 250px; - } - } - - &.g-sidenav-hidden { - @include media-breakpoint-down(md) { - .sidenav { - max-width: $navbar-vertical-width !important; - } - } - } - .sidenav { - max-width: $navbar-vertical-open-width !important; - .navbar-brand, .navbar-heading { display: block; @@ -401,23 +370,7 @@ } } -.scrollbar-inner { - width: 100%; - - .sidenav-header { - padding: 0 24px; - justify-content: space-between; - } -} - - - - .g-sidenav-pinned { - #sidenav-collapse-main { - display: block; - } - .sidenav { max-width: $navbar-vertical-open-width !important; @@ -426,24 +379,6 @@ display: block; } } - - .navbar-vertical.navbar-expand-xs { - @include media-breakpoint-up(xl) { - max-width: $navbar-vertical-open-width !important; - } - } -} - -.navbar-vertical.navbar-expand-xs { - position: fixed; - top: 0; - bottom: 0; - display: block; - overflow-y: auto; - width: 100%; - max-width: 62px; - padding-right: 0; - padding-left: 0; } .g-sidenav-hidden:not(.g-sidenav-show) {