Skip to content

replace perfect-scrollbar with custom css #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

replace perfect-scrollbar with custom css #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28de89b
replace perfect-scrollbar with custom css
userlip Sep 11, 2022
12dd216
rollback sidebar to normal state
userlip Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10,008 changes: 9,975 additions & 33 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"bootstrap": "^5.1.3",
"laravel-mix": "^6.0.49",
"lodash": "^4.17.21",
"perfect-scrollbar": "^1.5.1",
"@fontsource/nunito": "^4.5.4",
"postcss": "^8.4.14",
"postcss-import": "^14.1.0",
Expand Down
13 changes: 13 additions & 0 deletions public/css/app-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6639,6 +6639,8 @@ body.theme-dark #sidebar:not(.active) ~ #main {
margin-left: 0;
}
body.theme-dark .sidebar-wrapper {
scrollbar-color: #435ebe transparent;
scrollbar-width: thin;
width: 300px;
height: 100vh;
position: fixed;
Expand All @@ -6649,6 +6651,17 @@ body.theme-dark .sidebar-wrapper {
bottom: 0;
transition: left 0.5s ease-out;
}
body.theme-dark .sidebar-wrapper::-webkit-scrollbar {
width: 4px;
}
body.theme-dark .sidebar-wrapper::-webkit-scrollbar-thumb {
background-color: #435ebe;
border-radius: 12px;
}
body.theme-dark .sidebar-wrapper::-webkit-scrollbar-track {
background-color: transparent;
border-radius: 12px;
}
body.theme-dark .sidebar-wrapper .sidebar-header {
padding: 2rem 2rem 1rem;
font-size: 2rem;
Expand Down
130 changes: 13 additions & 117 deletions public/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,123 +228,6 @@
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/*
* Container style
*/
.ps {
overflow: hidden !important;
overflow-anchor: none;
-ms-overflow-style: none;
touch-action: auto;
-ms-touch-action: auto;
}

/*
* Scrollbar rail styles
*/
.ps__rail-x {
display: none;
opacity: 0;
transition: background-color .2s linear, opacity .2s linear;
-webkit-transition: background-color .2s linear, opacity .2s linear;
height: 15px;
/* there must be 'bottom' or 'top' for ps__rail-x */
bottom: 0px;
/* please don't change 'position' */
position: absolute;
}

.ps__rail-y {
display: none;
opacity: 0;
transition: background-color .2s linear, opacity .2s linear;
-webkit-transition: background-color .2s linear, opacity .2s linear;
width: 15px;
/* there must be 'right' or 'left' for ps__rail-y */
right: 0;
/* please don't change 'position' */
position: absolute;
}

.ps--active-x > .ps__rail-x,
.ps--active-y > .ps__rail-y {
display: block;
background-color: transparent;
}

.ps:hover > .ps__rail-x,
.ps:hover > .ps__rail-y,
.ps--focus > .ps__rail-x,
.ps--focus > .ps__rail-y,
.ps--scrolling-x > .ps__rail-x,
.ps--scrolling-y > .ps__rail-y {
opacity: 0.6;
}

.ps .ps__rail-x:hover,
.ps .ps__rail-y:hover,
.ps .ps__rail-x:focus,
.ps .ps__rail-y:focus,
.ps .ps__rail-x.ps--clicking,
.ps .ps__rail-y.ps--clicking {
background-color: #eee;
opacity: 0.9;
}

/*
* Scrollbar thumb styles
*/
.ps__thumb-x {
background-color: #aaa;
border-radius: 6px;
transition: background-color .2s linear, height .2s ease-in-out;
-webkit-transition: background-color .2s linear, height .2s ease-in-out;
height: 6px;
/* there must be 'bottom' for ps__thumb-x */
bottom: 2px;
/* please don't change 'position' */
position: absolute;
}

.ps__thumb-y {
background-color: #aaa;
border-radius: 6px;
transition: background-color .2s linear, width .2s ease-in-out;
-webkit-transition: background-color .2s linear, width .2s ease-in-out;
width: 6px;
/* there must be 'right' for ps__thumb-y */
right: 2px;
/* please don't change 'position' */
position: absolute;
}

.ps__rail-x:hover > .ps__thumb-x,
.ps__rail-x:focus > .ps__thumb-x,
.ps__rail-x.ps--clicking .ps__thumb-x {
background-color: #999;
height: 11px;
}

.ps__rail-y:hover > .ps__thumb-y,
.ps__rail-y:focus > .ps__thumb-y,
.ps__rail-y.ps--clicking .ps__thumb-y {
background-color: #999;
width: 11px;
}

/* MS supports */
@supports (-ms-overflow-style: none) {
.ps {
overflow: auto !important;
}
}

@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
.ps {
overflow: auto !important;
}
}

@charset "UTF-8";
/*!
* Bootstrap v5.1.3 (https://getbootstrap.com/)
Expand Down Expand Up @@ -18901,6 +18784,8 @@ body .bi::before, [class^=bi-]::before, [class*=" bi-"]::before {
}

.sidebar-wrapper {
scrollbar-color: #435ebe transparent;
scrollbar-width: thin;
width: 300px;
height: 100vh;
position: fixed;
Expand All @@ -18911,6 +18796,17 @@ body .bi::before, [class^=bi-]::before, [class*=" bi-"]::before {
bottom: 0;
transition: left 0.5s ease-out;
}
.sidebar-wrapper::-webkit-scrollbar {
width: 4px;
}
.sidebar-wrapper::-webkit-scrollbar-thumb {
background-color: #435ebe;
border-radius: 12px;
}
.sidebar-wrapper::-webkit-scrollbar-track {
background-color: transparent;
border-radius: 12px;
}
.sidebar-wrapper .sidebar-header {
padding: 2rem 2rem 1rem;
font-size: 2rem;
Expand Down
22 changes: 13 additions & 9 deletions public/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21374,9 +21374,12 @@ __webpack_require__.r(__webpack_exports__);
/*!****************************************!*\
!*** ./resources/sass/pages/auth.scss ***!
\****************************************/
/***/ (() => {
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin

throw new Error("Module build failed (from ./node_modules/mini-css-extract-plugin/dist/loader.js):\nModuleBuildError: Module build failed (from ./node_modules/css-loader/dist/cjs.js):\nError: Can't resolve '../../images/bg/4853433.png' in '/mnt/c/Users/root/Desktop/laravel-mazer/resources/sass/pages'\n at finishWithoutResolve (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/Resolver.js:309:18)\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/Resolver.js:386:15\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/Resolver.js:435:5\n at eval (eval at create (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:16:1)\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/Resolver.js:435:5\n at eval (eval at create (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:27:1)\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/DescriptionFilePlugin.js:87:43\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/Resolver.js:435:5\n at eval (eval at create (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:15:1)\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/enhanced-resolve/lib/Resolver.js:435:5\n at processResult (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/webpack/lib/NormalModule.js:758:19)\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/webpack/lib/NormalModule.js:860:5\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/loader-runner/lib/LoaderRunner.js:400:11\n at /mnt/c/Users/root/Desktop/laravel-mazer/node_modules/loader-runner/lib/LoaderRunner.js:252:18\n at context.callback (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/loader-runner/lib/LoaderRunner.js:124:13)\n at Object.loader (/mnt/c/Users/root/Desktop/laravel-mazer/node_modules/css-loader/dist/index.js:155:5)\n at processTicksAndRejections (internal/process/task_queues.js:95:5)");

/***/ }),

Expand Down Expand Up @@ -21594,7 +21597,7 @@ process.umask = function() { return 0; };
/***/ ((module) => {

"use strict";
module.exports = JSON.parse('{"_args":[["axios@0.21.4","/mnt/c/Users/root/Desktop/laravel-mazer"]],"_development":true,"_from":"axios@0.21.4","_id":"axios@0.21.4","_inBundle":false,"_integrity":"sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==","_location":"/axios","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"axios@0.21.4","name":"axios","escapedName":"axios","rawSpec":"0.21.4","saveSpec":null,"fetchSpec":"0.21.4"},"_requiredBy":["#DEV:/"],"_resolved":"https://registry.npmjs.org/axios/-/axios-0.21.4.tgz","_spec":"0.21.4","_where":"/mnt/c/Users/root/Desktop/laravel-mazer","author":{"name":"Matt Zabriskie"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"bugs":{"url":"https://github.com/axios/axios/issues"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"dependencies":{"follow-redirects":"^1.14.0"},"description":"Promise based HTTP client for the browser and node.js","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"homepage":"https://axios-http.com","jsdelivr":"dist/axios.min.js","keywords":["xhr","http","ajax","promise","node"],"license":"MIT","main":"index.js","name":"axios","repository":{"type":"git","url":"git+https://github.com/axios/axios.git"},"scripts":{"build":"NODE_ENV=production grunt build","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","examples":"node ./examples/server.js","fix":"eslint --fix lib/**/*.js","postversion":"git push && git push --tags","preversion":"npm test","start":"node ./sandbox/server.js","test":"grunt test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json"},"typings":"./index.d.ts","unpkg":"dist/axios.min.js","version":"0.21.4"}');
module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://axios-http.com","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"jsdelivr":"dist/axios.min.js","unpkg":"dist/axios.min.js","typings":"./index.d.ts","dependencies":{"follow-redirects":"^1.14.0"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}]}');

/***/ })

Expand Down Expand Up @@ -21723,6 +21726,7 @@ module.exports = JSON.parse('{"_args":[["axios@0.21.4","/mnt/c/Users/root/Deskto
/******/ "/js/app": 0,
/******/ "css/app": 0,
/******/ "css/tailwind": 0,
/******/ "css/pages/auth": 0,
/******/ "css/app-dark": 0,
/******/ "css/bootstrap": 0
/******/ };
Expand Down Expand Up @@ -21774,12 +21778,12 @@ module.exports = JSON.parse('{"_args":[["axios@0.21.4","/mnt/c/Users/root/Deskto
/******/ // startup
/******/ // Load entry module and return exports
/******/ // This entry module depends on other loaded chunks and execution need to be delayed
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/js/app.js")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/bootstrap.scss")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/themes/dark/app-dark.scss")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/app.scss")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/pages/auth.scss")))
/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["css/app","css/tailwind","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/css/app.css")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/pages/auth","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/js/app.js")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/pages/auth","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/bootstrap.scss")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/pages/auth","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/themes/dark/app-dark.scss")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/pages/auth","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/app.scss")))
/******/ __webpack_require__.O(undefined, ["css/app","css/tailwind","css/pages/auth","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/sass/pages/auth.scss")))
/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["css/app","css/tailwind","css/pages/auth","css/app-dark","css/bootstrap"], () => (__webpack_require__("./resources/css/app.css")))
/******/ __webpack_exports__ = __webpack_require__.O(__webpack_exports__);
/******/
/******/ })()
Expand Down
11 changes: 0 additions & 11 deletions public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@ document.querySelector('.sidebar-hide').addEventListener('click', () => {

})


// Perfect Scrollbar Init
if(typeof PerfectScrollbar == 'function') {
const container = document.querySelector(".sidebar-wrapper");
const ps = new PerfectScrollbar(container, {
wheelPropagation: false
});
}



document.querySelectorAll('.sidebar-item').forEach(sidebarItem => {
sidebarItem.querySelectorAll('.sidebar-link').forEach(sidebarLink => {
if(sidebarLink.getAttribute('href') == window.location.href) sidebarItem.classList.add('active')
Expand Down
1 change: 1 addition & 0 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/css/tailwind.css": "/css/tailwind.css",
"/css/pages/auth.css": "/css/pages/auth.css",
"/css/app-dark.css": "/css/app-dark.css",
"/css/bootstrap.css": "/css/bootstrap.css"
}
3 changes: 0 additions & 3 deletions resources/sass/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,5 @@ body .bi::before, [class^=bi-]::before, [class*=" bi-"]::before {
// Import fonts
@import "./fonts";

// Perfect Scrollbar
@import "~perfect-scrollbar/css/perfect-scrollbar.css";

// Mazer CSS
@import "./mazer";
15 changes: 15 additions & 0 deletions resources/sass/components/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
}
}
.sidebar-wrapper {

scrollbar-color: #435ebe transparent;
scrollbar-width: thin;
&::-webkit-scrollbar {
width: 4px;
}
&::-webkit-scrollbar-thumb {
background-color: #435ebe;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change the color of the scrollbar to a neutral one (grayish with opacity)?
And I guess it will be better if the hex value is used it as a variable

border-radius: 12px;
}
&::-webkit-scrollbar-track {
background-color: transparent;
border-radius: 12px;
}

width: 300px;
height: 100vh;
position: fixed;
Expand Down
1 change: 0 additions & 1 deletion resources/views/layouts/guest.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">

<!-- Vendors -->
<link rel="stylesheet" href="{{ asset('vendors/perfect-scrollbar/perfect-scrollbar.css') }}">
<link rel="stylesheet" href="{{ asset('vendors/bootstrap-icons/bootstrap-icons.css') }}">

<!-- Styles -->
Expand Down
2 changes: 0 additions & 2 deletions resources/views/layouts/partials/scripts.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<script src="{{ mix('js/app.js') }}"></script>

<script src="{{ asset('/vendors/perfect-scrollbar/perfect-scrollbar.min.js') }}"></script>
<script src="{{ asset('/vendors/tinymce/tinymce.min.js') }}"></script>


<script src="{{ asset('/js/bootstrap.bundle.min.js') }}"></script>

@livewireScripts
Expand Down
2 changes: 0 additions & 2 deletions resources/views/layouts/partials/styles.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">

<!-- Vendors -->
<link rel="stylesheet" href="{{ asset('/vendors/perfect-scrollbar/perfect-scrollbar.css') }}">
<link rel="stylesheet" href="{{ asset('/vendors/bootstrap-icons/bootstrap-icons.css') }}">


<!-- Styles -->
<link rel="stylesheet" href="{{ mix('css/bootstrap.css') }}">
<link rel="stylesheet" href="{{ mix('css/app.css') }}">
Expand Down
Loading