diff --git a/commons/DOM/scripts.php b/commons/DOM/scripts.php index dae4bd3..fc5d2a0 100644 --- a/commons/DOM/scripts.php +++ b/commons/DOM/scripts.php @@ -16,7 +16,7 @@ if($enable_code_highlight) { '); + echo(''); } if($enable_code_highlight) { echo(''); diff --git a/commons/composer.php b/commons/composer.php index f8f1f3d..74f8fc9 100644 --- a/commons/composer.php +++ b/commons/composer.php @@ -299,6 +299,7 @@ class ComposerContentMetadata { function apply_template(ComposerContent $content_root, string $inner_html) : string { switch($this->template) { case ComposerTemplates::ARTICLE_LEGACY: + // FIXME: Is this even used anymore ?!? $inner_html = '
' . '

' . '  ' . @@ -341,7 +342,7 @@ class ComposerContentMetadata { if(sizeof($this->article->tags) > 0) { foreach($this->article->tags as $tag) { $_template_gpr_tags_dom .= '#' . $tag . ''); + '" class="ml-xs d-inline-block">#' . $tag . ''); } } else { $_template_gpr_tags_dom .= '' . localize("content.error.message.data.no.tags") . ''; @@ -744,7 +745,7 @@ class ComposerElement { case ComposerElementTypes::BUTTON: // Composing the button. - $htmlCode .= ''; break; @@ -769,7 +770,7 @@ class ComposerElement { if(!is_null($this->code)) { foreach($this->code as $code_line) { //$htmlCode .= htmlspecialchars($code_line) . '
'; // Old method (Not compatible with hljs) - $htmlCode .= '' . + $htmlCode .= '' . str_replace(" ", " ", htmlspecialchars($code_line)) . '
'; } @@ -868,6 +869,7 @@ class ComposerElement { case ComposerElementTypes::TABLE: // Composing table. + $htmlCode .= '
'; $htmlCode .= ''; if(!is_null($this->head)) { @@ -899,6 +901,7 @@ class ComposerElement { } $htmlCode .= '
'; + $htmlCode .= "
"; break; case ComposerElementTypes::GRID: @@ -969,21 +972,4 @@ function load_content_by_id(string $content_id) : ?ComposerContent { return load_content_by_file_path($content_file_path); } } - -// Test -if(basename(__FILE__) == basename($_SERVER["SCRIPT_FILENAME"])) { - $content = load_content_by_id("test2"); - - if(!is_null($content)) { - echo "
";
-		print_r(htmlspecialchars($content->get_html()));
-		echo "
"; - - echo "
";
-		print_r($content);
-		echo "
"; - } - - echo("
"); -} ?> \ No newline at end of file diff --git a/clean.bat b/compile-clean.cmd similarity index 79% rename from clean.bat rename to compile-clean.cmd index c24ff41..fb21992 100644 --- a/clean.bat +++ b/compile-clean.cmd @@ -4,12 +4,13 @@ setlocal enabledelayedexpansion :: Going into the script's directory cd /D "%~dp0" -:main + +:clean echo. echo Cleaning up the project echo ----------------------- -:php-clean +:clean-php-minified echo Clearing old minified PHP files... pushd %CD% for /r "%CD%" %%F in (*.min.php) do ( @@ -19,6 +20,7 @@ for /r "%CD%" %%F in (*.min.php) do ( echo ^> Done ^! popd +:clean-end + + :end -:: FIXME: Won't this close the terminal when not called ? -exit /b diff --git a/compile-js-decimal.cmd b/compile-js-decimal.cmd new file mode 100644 index 0000000..74f5375 --- /dev/null +++ b/compile-js-decimal.cmd @@ -0,0 +1,27 @@ +@echo off +setlocal enabledelayedexpansion + +:: Going into the script's directory +cd /D "%~dp0" + + +:js-decimaljs +echo. +echo Handling DecimalJS library +echo -------------------------- + +:js-decimaljs-minify +echo Minifying Decimal.JS +pushd %CD% +cd %~dp0\resources\DecimalJs\10.4.3\ +echo ^> resources\DecimalJs\10.4.3\decimal.mjs +call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs +cd %~dp0\resources\DecimalJsLight\2.5.1\ +echo ^> resources\DecimalJsLight\2.5.1\decimal.mjs +call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs +popd + +:js-decimaljs-end + + +:end diff --git a/compile-js-external.cmd b/compile-js-external.cmd new file mode 100644 index 0000000..24b3fd2 --- /dev/null +++ b/compile-js-external.cmd @@ -0,0 +1,44 @@ +@echo off +setlocal enabledelayedexpansion + +:: Going into the script's directory +cd /D "%~dp0" + + +:js-external +echo. +echo Handling external libraries +echo --------------------------- + +:js-external-decimaljs-minify +echo Minifying Decimal.JS +pushd %CD% +cd %~dp0\resources\DecimalJs\10.4.3\ +echo ^> resources\DecimalJs\10.4.3\decimal.mjs +call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs +cd %~dp0\resources\DecimalJsLight\2.5.1\ +echo ^> resources\DecimalJsLight\2.5.1\decimal.mjs +call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs +popd + +:js-external-highlightjs +echo Handling HighlightJS +pushd %CD% +cd %~dp0\resources\HighlightJS\ +echo ^> Clearing old files +del /Q /S /F highlight.js 2> nul 1> nul +del /Q /S /F highlight.min.js 2> nul 1> nul +echo ^> Installing dependencies +call npm install > nul +echo ^> Building for browsers +node tools/build.js -t browser sql php c cpp vbnet java yaml css scss bash ini python shell dockerfile cmake purebasic csharp 1> nul +echo ^> Moving final files +robocopy %CD%\build %CD% highlight.js highlight.min.js 1> nul +echo ^> Minifying used CSS files +call "%~dp0node_modules\.bin\sass" src/styles/atom-one-dark.css:src/styles/atom-one-dark.min.css -q --style compressed +popd + +:js-external-end + + +:end diff --git a/compile-js-site.cmd b/compile-js-site.cmd new file mode 100644 index 0000000..abdf309 --- /dev/null +++ b/compile-js-site.cmd @@ -0,0 +1,30 @@ +@echo off +setlocal enabledelayedexpansion + +:: Going into the script's directory +cd /D "%~dp0" + + +:js-nibblepoker +echo. +echo Handling the website's libraries +echo -------------------------------- + +:js-nibblepoker-minify +echo Minifying nibblepoker.js +pushd %CD% +cd %~dp0\resources\NibblePoker\js\ +echo ^> resources\NibblePoker\js\nibblepoker.js +call "%~dp0node_modules\.bin\terser" nibblepoker.js -c -m -o nibblepoker.min.js +echo ^> resources\NibblePoker\js\nibblepoker-code.js +call "%~dp0node_modules\.bin\terser" nibblepoker-code.js -c -m -o nibblepoker-code.min.js +echo ^> resources\NibblePoker\js\nibblepoker-contributors.js +call "%~dp0node_modules\.bin\terser" nibblepoker-contributors.js -c -m -o nibblepoker-contributors.min.js +echo ^> resources\NibblePoker\js\nibblepoker-splide.js +call "%~dp0node_modules\.bin\terser" nibblepoker-splide.js -c -m -o nibblepoker-splide.min.js +popd + +:js-nibblepoker-end + + +:end diff --git a/compile-sass.cmd b/compile-sass.cmd new file mode 100644 index 0000000..4ed3651 --- /dev/null +++ b/compile-sass.cmd @@ -0,0 +1,29 @@ +@echo off +setlocal enabledelayedexpansion + +:: Going into the script's directory +cd /D "%~dp0" + + +:sass +echo. +echo Handling the SASS files +echo ----------------------- + +:sass-compile +echo Compiling SASS files... +pushd %CD% +cd %~dp0\resources\NibblePoker\scss\ +call "%~dp0node_modules\.bin\sass" nibblepoker.scss:../css/nibblepoker.css -q +call "%~dp0node_modules\.bin\sass" nibblepoker.scss:../css/nibblepoker.min.css -q --style compressed +popd +pushd %CD% +cd %~dp0\wiki\scss\ +call "%~dp0node_modules\.bin\sass" nibblepoker-wiki.scss:../css/nibblepoker-wiki.css -q +call "%~dp0node_modules\.bin\sass" nibblepoker-wiki.scss:../css/nibblepoker-wiki.min.css -q --style compressed +popd + +:sass-end + + +:end diff --git a/compile-strings.cmd b/compile-strings.cmd new file mode 100644 index 0000000..860ba40 --- /dev/null +++ b/compile-strings.cmd @@ -0,0 +1,21 @@ +@echo off +setlocal enabledelayedexpansion + +:: Going into the script's directory +cd /D "%~dp0" + + +:lang +echo. +echo Handling the languages +echo ---------------------- + +:lang-compile +echo Compiling lang files... +python compile_strings.py ./commons/strings/ ./commons/strings.json +python compile_strings.py ./wiki/strings/ ./wiki/strings.json + +:lang-end + + +:end diff --git a/compile.bat b/compile.bat index c5c2e83..7464d6c 100644 --- a/compile.bat +++ b/compile.bat @@ -4,196 +4,11 @@ setlocal enabledelayedexpansion :: Going into the script's directory cd /D "%~dp0" - -:clean -call "%~dp0clean.bat" -:clean-end - - -:lang -echo. -echo Handling the languages -echo ---------------------- - -:lang-compile -echo Compiling lang files... -python compile_strings.py ./commons/strings/ ./commons/strings.json -python compile_strings.py ./wiki/strings/ ./wiki/strings.json - -:lang-end - - -:sass -echo. -echo Handling the SASS files -echo ----------------------- - -:sass-compile -echo Compiling SASS files... -pushd %CD% -cd %~dp0\resources\NibblePoker\scss\ -call "%~dp0node_modules\.bin\sass" nibblepoker.scss:../css/nibblepoker.css -q -call "%~dp0node_modules\.bin\sass" nibblepoker.scss:../css/nibblepoker.min.css -q --style compressed -popd -pushd %CD% -cd %~dp0\wiki\scss\ -call "%~dp0node_modules\.bin\sass" nibblepoker-wiki.scss:../css/nibblepoker-wiki.css -q -call "%~dp0node_modules\.bin\sass" nibblepoker-wiki.scss:../css/nibblepoker-wiki.min.css -q --style compressed -popd - -:sass-end - - -:libs -echo. -echo Handling the libraries -echo ---------------------- - -:libs-nibblepoker-minify -echo Minifying nibblepoker.js -pushd %CD% -cd %~dp0\resources\NibblePoker\js\ -echo ^> resources\NibblePoker\js\nibblepoker.js -call "%~dp0node_modules\.bin\terser" nibblepoker.js -c -m -o nibblepoker.min.js -echo ^> resources\NibblePoker\js\nibblepoker-code.js -call "%~dp0node_modules\.bin\terser" nibblepoker-code.js -c -m -o nibblepoker-code.min.js -echo ^> resources\NibblePoker\js\nibblepoker-contributors.js -call "%~dp0node_modules\.bin\terser" nibblepoker-contributors.js -c -m -o nibblepoker-contributors.min.js -echo ^> resources\NibblePoker\js\nibblepoker-splide.js -call "%~dp0node_modules\.bin\terser" nibblepoker-splide.js -c -m -o nibblepoker-splide.min.js -popd - -:libs-decimaljs-minify -echo Minifying Decimal.JS -pushd %CD% -cd %~dp0\resources\DecimalJs\10.4.3\ -echo ^> resources\DecimalJs\10.4.3\decimal.mjs -call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs -cd %~dp0\resources\DecimalJsLight\2.5.1\ -echo ^> resources\DecimalJsLight\2.5.1\decimal.mjs -call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs -popd - -:libs-highlightjs -echo Handling HighlightJS -pushd %CD% -cd %~dp0\resources\HighlightJS\ -echo ^> Clearing old files -del /Q /S /F highlight.js 2> nul 1> nul -del /Q /S /F highlight.min.js 2> nul 1> nul -echo ^> Installing dependencies -call npm install > nul -echo ^> Building for browsers -node tools/build.js -t browser sql php c cpp vbnet java yaml css scss bash ini python shell dockerfile cmake purebasic csharp 1> nul -echo ^> Moving final files -robocopy %CD%\build %CD% highlight.js highlight.min.js 1> nul -echo ^> Minifying used CSS files -call "%~dp0node_modules\.bin\sass" src/styles/atom-one-dark.css:src/styles/atom-one-dark.min.css -q --style compressed -popd - -:libs-end - -goto end - -:: THE Formula-wizard minified files don't point to the proper minified JS file !!!! - - -:formula-wizard -echo. -echo Handling the 'Formula Wizard' -echo ----------------------------- - -:formula-wizard-clean -echo Cleaning... -pushd %CD% -cd %~dp0\tools\items\formula-wizard\src\ -del *.js 2>nul -del *.map 2>nul -popd - -:formula-wizard-compile -echo Compiling TypeScript... -pushd %CD% -cd %~dp0\tools\items\formula-wizard\src\ -call "%~dp0node_modules\.bin\tsc" -popd - -:formula-wizard-fix-imports -echo Fixing imports... -pushd %CD% -cd %~dp0\tools\items\formula-wizard\src\ -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "decimal" "decimal.min.mjs" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "lang" "lang.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "formulas" "formulas.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "units" "units.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "ui_catalog" "ui_catalog.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "mvc_context" "mvc_context.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "sets" "sets.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "mvc_formula" "mvc_formula.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "formula_weaver" "formula_weaver.js" -call node "%~dp0fix-import-path.js" "formulas.js;lang.js;main.js;units.js;ui_catalog.js;mvc_context.js;sets.js;mvc_formula.js;utils_templates.js;formula_weaver.js" "utils_templates" "utils_templates.js" -popd - -:formula-wizard-bundle -echo Making the bundle... -pushd %CD% -cd %~dp0\tools\items\formula-wizard\src\ -call "%~dp0node_modules\.bin\rollup" main.js --format cjs --sourcemap --file formula-wizard.js -popd - -:formula-wizard-minify -echo Minifying the files... -pushd %CD% -cd %~dp0\tools\items\formula-wizard\src\ -call "%~dp0node_modules\.bin\terser" main.js -c -m --toplevel -o main.min.js -call "%~dp0node_modules\.bin\terser" lang.js -c -m --toplevel -o lang.min.js -call "%~dp0node_modules\.bin\terser" formulas.js -c -m --toplevel -o formulas.min.js -call "%~dp0node_modules\.bin\terser" units.js -c -m --toplevel -o units.min.js -call "%~dp0node_modules\.bin\terser" ui_catalog.js -c -m --toplevel -o ui_catalog.min.js -call "%~dp0node_modules\.bin\terser" mvc_context.js -c -m --toplevel -o mvc_context.min.js -call "%~dp0node_modules\.bin\terser" sets.js -c -m --toplevel -o sets.min.js -call "%~dp0node_modules\.bin\terser" mvc_formula.js -c -m --toplevel -o mvc_formula.min.js -call "%~dp0node_modules\.bin\terser" utils_templates.js -c -m --toplevel -o utils_templates.min.js -call "%~dp0node_modules\.bin\terser" formula_weaver.js -c -m --toplevel -o formula_weaver.min.js -call "%~dp0node_modules\.bin\terser" formula-wizard.js -c -m --toplevel -o formula-wizard.min.js -popd - -:formula-wizard-end - - -:compile-typescript -echo Compiling TypeScript for ".js" files... -call .\node_modules\.bin\tsc - -:fix-typescript-imports -echo Fixing import paths for ".js" files manually... -node .\fix-import-path.js "tools/items/formula-wizard/code.js" "decimal" "decimal.min.mjs" - -:minify-js -echo Minifying JS manually... -pushd %CD% - -:: rollup, maybe - -cd %~dp0\resources\DecimalJs\10.4.3\ -echo ^> resources\DecimalJs\10.4.3\decimal.mjs -call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs - -cd %~dp0\resources\DecimalJsLight\2.5.1\ -echo ^> resources\DecimalJsLight\2.5.1\decimal.mjs -call "%~dp0node_modules\.bin\terser" decimal.mjs -c -m --toplevel -o decimal.min.mjs - -cd %~dp0\tools\items\formula-wizard\ -echo ^> tools\items\formula-wizard\code.js -call "%~dp0node_modules\.bin\terser" code.js -c passes=9 --module --ecma 2019 --mangle --toplevel -o code.min.js -:: Due to the fact I used interfaces and because terser has its limits, I need to manually minify some properties. -:: It is done this way to avoid having to make some arcane incantations that may break if terser feels like it some day. -:: TODO: Make a post minifier - -cd %~dp0\tools\items\b64-tools\ -echo ^> tools\items\b64-tools\code.js -call "%~dp0node_modules\.bin\terser" code.js -c --module --ecma 2017 --mangle -o code.min.js - -popd +:: Running sub-scripts +call "%~dp0compile-clean.cmd" +call "%~dp0compile-strings.cmd" +call "%~dp0compile-sass.cmd" +call "%~dp0compile-js-site.cmd" +call "%~dp0compile-js-external.cmd" :end diff --git a/compress.bat b/compress.bat index 5611d22..a03d204 100644 --- a/compress.bat +++ b/compress.bat @@ -12,8 +12,8 @@ call "%~dp0compile.bat" :archive echo. -echo Handling the 'Formula Wizard' -echo ----------------------------- +echo Preparing a deployment archive +echo ------------------------------ :archive-env-name echo Preparing name variable... @@ -26,10 +26,12 @@ echo Preparing environment variable... set NP_ZIP_CONTENT= set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "about/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "commons/*.php" "commons/strings.json" "commons/DOM/" "commons/content/" +set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "contact/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "content/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "contributors/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "links/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "privacy/" +set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/FontAwesomePro/5.15.3/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/HighlightJS/highlight.min.js" "resources/HighlightJS/src/styles/atom-one-dark.min.css" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/css/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/images/*.png" @@ -47,7 +49,7 @@ set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/images/*/*/*.jpg" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/images/*/*/*.jpeg" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/images/*/*/*.svg" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/images/*/*/*.webp" -set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/js/*.min.js" +set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/js/*.js" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/sounds/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/Quantum/" set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/SplideJs/dist/" diff --git a/index.php b/index.php index 13d02e9..9e7b8cc 100644 --- a/index.php +++ b/index.php @@ -120,7 +120,7 @@ include 'commons/DOM/sidebar.php';

-

+


diff --git a/resources/NibblePoker/scss/core/text.scss b/resources/NibblePoker/scss/core/text.scss index 309fa96..2d78663 100644 --- a/resources/NibblePoker/scss/core/text.scss +++ b/resources/NibblePoker/scss/core/text.scss @@ -98,4 +98,9 @@ s, .t-strikethrough, .t-strike { text-transform: uppercase; } +.t-nowrap { + white-space: nowrap; + text-wrap: nowrap; +} + // Other default shit diff --git a/resources/NibblePoker/scss/site/base.scss b/resources/NibblePoker/scss/site/base.scss index 9fe1ac2..61e1527 100644 --- a/resources/NibblePoker/scss/site/base.scss +++ b/resources/NibblePoker/scss/site/base.scss @@ -158,10 +158,19 @@ main { /* Site > Base > Main */ -main { - &.expanded { - border-left: 0; - border-radius: 0; + +@media only screen and (max-width: 768px) { + main { + border-left: 0 !important; + border-radius: 0 !important; + } +} +@media only screen and (min-width: 768px) { + main { + &.expanded { + border-left: 0; + border-radius: 0; + } } } diff --git a/resources/NibblePoker/scss/site/scrollbar.scss b/resources/NibblePoker/scss/site/scrollbar.scss index 963820d..755bdc3 100644 --- a/resources/NibblePoker/scss/site/scrollbar.scss +++ b/resources/NibblePoker/scss/site/scrollbar.scss @@ -23,51 +23,51 @@ overflow-x: scroll; } -@media (min-width: 769px) { - *::-webkit-scrollbar { - width: #{$scrollbar-size}; - height: #{$scrollbar-size}; - background-color: transparent; - } - *::-webkit-scrollbar-track:vertical { - border-left: 1px solid #{$color-scrollbar-border}; - } - *::-webkit-scrollbar-track:horizontal { - border-top: 1px solid #{$color-scrollbar-border}; - } - *::-webkit-scrollbar-thumb { - background-color: rgba(255, 255, 255, 0.25); - border: 0.4rem solid transparent; - background-clip: content-box; - border-radius: 1em; - } - *::-webkit-scrollbar-thumb:hover { - background-color: rgba(255, 255, 255, 0.4); - border-color: transparent; - } - *::-webkit-scrollbar-corner { - background-color: transparent; - border-left: 1px solid rgba(0, 0, 0, 0.1); - border-top: 1px solid rgba(0, 0, 0, 0.1); - } - - //* { - // scrollbar-width: thin; - // scrollbar-color: rgba(0, 0, 0, 0.25) #ffffff; - //} - //*::-webkit-scrollbar-track { - // border-color: rgba(255, 255, 255, 0.05); - //} - //*::-webkit-scrollbar-corner { - // background-color: transparent; - // border-color: rgba(255, 255, 255, 0.05); - //} - //* { - // scrollbar-color: rgba(255, 255, 255, 0.25) #25282c; - //} +//@media (min-width: 769px) { +*::-webkit-scrollbar { + width: #{$scrollbar-size}; + height: #{$scrollbar-size}; + background-color: transparent; } -/* -.hide-scrollbar { +*::-webkit-scrollbar-track:vertical { + border-left: 1px solid #{$color-scrollbar-border}; +} +/**::-webkit-scrollbar-track:horizontal { + border-top: 1px solid #{$color-scrollbar-border}; +}*/ +*::-webkit-scrollbar-thumb { + background-color: rgba(255, 255, 255, 0.25); + border: 0.4rem solid transparent; + background-clip: content-box; + border-radius: 1em; +} +*::-webkit-scrollbar-thumb:hover { + background-color: rgba(255, 255, 255, 0.4); + border-color: transparent; +} +*::-webkit-scrollbar-corner { + background-color: transparent; + border-left: 1px solid rgba(0, 0, 0, 0.1); + border-top: 1px solid rgba(0, 0, 0, 0.1); +} + +//* { +// scrollbar-width: thin; +// scrollbar-color: rgba(0, 0, 0, 0.25) #ffffff; +//} +//*::-webkit-scrollbar-track { +// border-color: rgba(255, 255, 255, 0.05); +//} +//*::-webkit-scrollbar-corner { +// background-color: transparent; +// border-color: rgba(255, 255, 255, 0.05); +//} +//* { +// scrollbar-color: rgba(255, 255, 255, 0.25) #25282c; +//} +//} + +/*.hide-scrollbar { scrollbar-width: none !important; -ms-overflow-style: none;