From 6c31f719c8b6475d03b7b655c899a4cff3f5b3ed Mon Sep 17 00:00:00 2001 From: "ugur@nomadinteractive.co" Date: Sat, 18 Apr 2020 19:48:08 +0300 Subject: [PATCH] fix: menu problem solved --- .env.example | 34 ---------- composer.json | 3 +- composer.lock | 60 ++++++++++++++++- config/app.php | 1 + package-lock.json | 6 +- public/css/argon.css | 58 ++++++++++++++++ .../sass/core/navbars/_navbar-vertical.scss | 67 +++++++++++++++++++ resources/views/layouts/admin.blade.php | 6 +- resources/views/partials/admin/menu.blade.php | 4 +- .../views/partials/portal/menu.blade.php | 2 +- 10 files changed, 198 insertions(+), 43 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index 016748105..000000000 --- a/.env.example +++ /dev/null @@ -1,34 +0,0 @@ -APP_NAME=Akaunting -APP_ENV=production -APP_LOCALE=en-GB -APP_INSTALLED=false -APP_KEY= -APP_DEBUG=true -APP_SCHEDULE_TIME="09:00" - -DB_CONNECTION=mysql -DB_HOST=localhost -DB_PORT=3306 -DB_DATABASE= -DB_USERNAME= -DB_PASSWORD= -DB_PREFIX= - -BROADCAST_DRIVER=log -CACHE_DRIVER=file -SESSION_DRIVER=file -QUEUE_CONNECTION=sync -LOG_CHANNEL=stack - -MAIL_MAILER=mail -MAIL_HOST=localhost -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_NAME=null -MAIL_FROM_ADDRESS=null - -FIREWALL_ENABLED=false - -MODEL_CACHE_ENABLED=false diff --git a/composer.json b/composer.json index 127e8d2cf..fb6a4890e 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,8 @@ "barryvdh/laravel-ide-helper": "2.6.*", "bkwld/cloner": "3.6.*", "consoletvs/charts": "6.5.*", - "doctrine/dbal": "2.9.*", "dingo/api": "3.0.*", + "doctrine/dbal": "2.9.*", "fideloper/proxy": "^4.2", "fruitcake/laravel-cors": "^1.0", "genealabs/laravel-model-caching": "0.8.*", @@ -45,6 +45,7 @@ "misterphilip/maintenance-mode": "2.0.*", "monooso/unobserve": "^2.0", "plank/laravel-mediable": "4.2.*", + "riverskies/laravel-mobile-detect": "^1.3", "santigarcor/laratrust": "5.2.*", "simshaun/recurr": "4.0.*", "staudenmeir/belongs-to-through": "^2.10", diff --git a/composer.lock b/composer.lock index b9c560ffc..fb02c16bf 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "a9bca450afee6890670d54addfe5a073", + "content-hash": "91309f3a56105719c200deb6d0b2079e", "packages": [ { "name": "akaunting/firewall", @@ -5390,6 +5390,64 @@ ], "time": "2020-03-29T20:13:32+00:00" }, + { + "name": "riverskies/laravel-mobile-detect", + "version": "1.3", + "source": { + "type": "git", + "url": "https://github.com/riverskies/laravel-mobile-detect.git", + "reference": "0ddb27d31a4a1148875424426b9feda6598f2f14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/riverskies/laravel-mobile-detect/zipball/0ddb27d31a4a1148875424426b9feda6598f2f14", + "reference": "0ddb27d31a4a1148875424426b9feda6598f2f14", + "shasum": "" + }, + "require": { + "mobiledetect/mobiledetectlib": "^2.8" + }, + "require-dev": { + "laravel/laravel": "5.5.*", + "philo/laravel-blade": "^3.1", + "phpspec/prophecy-phpunit": "^1.1", + "phpunit/phpunit": "^6.3" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Riverskies\\Laravel\\MobileDetect\\MobileDetectServiceProvider" + ], + "aliases": { + "MobileDetect": "Riverskies\\Laravel\\MobileDetect\\Facades\\MobileDetect" + } + } + }, + "autoload": { + "psr-4": { + "Riverskies\\Laravel\\MobileDetect\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barnabas Kecskes", + "email": "barnabas@riverskies.com" + } + ], + "description": "Instant mobile detection access directly from within Blade templates.", + "keywords": [ + "blade", + "detection", + "laravel", + "mobile" + ], + "time": "2017-09-02T08:11:53+00:00" + }, { "name": "sabberworm/php-css-parser", "version": "8.3.0", diff --git a/config/app.php b/config/app.php index 58edec322..36e7d7b3a 100644 --- a/config/app.php +++ b/config/app.php @@ -137,6 +137,7 @@ 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/package-lock.json b/package-lock.json index 045e6a3d7..336d17cc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13299,9 +13299,9 @@ "dev": true }, "vue2-transitions": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vue2-transitions/-/vue2-transitions-0.2.3.tgz", - "integrity": "sha512-Ou5x74AOQbM8JjZV8pIssFFqavvj53QzrEEUr5QnElUYb1ZizPwaUJo0ZqmLPqjwPae7ON4SG8U2cSTI4tHKLg==" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/vue2-transitions/-/vue2-transitions-0.3.0.tgz", + "integrity": "sha512-m1ad8K8kufqiEhj5gXHkkqOioI5sW0FaMbRiO0Tv2WFfGbO2eIKrfkFiO3HPQtMJboimaLCN4p/zL81clLbG4w==" }, "watchpack": { "version": "1.6.0", diff --git a/public/css/argon.css b/public/css/argon.css index 387841195..34b56a14d 100644 --- a/public/css/argon.css +++ b/public/css/argon.css @@ -20692,6 +20692,15 @@ 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 { @@ -21492,6 +21501,22 @@ 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; @@ -21510,6 +21535,21 @@ 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; } @@ -21519,6 +21559,24 @@ 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/resources/assets/sass/core/navbars/_navbar-vertical.scss b/resources/assets/sass/core/navbars/_navbar-vertical.scss index 63219761b..6cc91fb53 100644 --- a/resources/assets/sass/core/navbars/_navbar-vertical.scss +++ b/resources/assets/sass/core/navbars/_navbar-vertical.scss @@ -70,6 +70,21 @@ 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; @@ -355,7 +370,25 @@ // Sidenav states .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; @@ -368,7 +401,23 @@ } } +.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; @@ -377,6 +426,24 @@ 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) { diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index ca10a00cf..c5050f01e 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -2,7 +2,11 @@ @include('partials.admin.head') - + @mobile + + @elsemobile + + @endmobile @stack('body_start') @include('partials.admin.menu') diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php index 276b84952..2bcacf44f 100644 --- a/resources/views/partials/admin/menu.blade.php +++ b/resources/views/partials/admin/menu.blade.php @@ -1,7 +1,7 @@ @stack('menu_start') -