From a88ea5ab9d225fe351a41009f6ebb03513200296 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Fri, 24 Jun 2022 18:08:45 +0200 Subject: [PATCH] Revert "Reset to default theme" This reverts commit e861eadcf859a9e9db8b2f400df6893f5fdd21e8. --- themes/learn2/css/custom.css | 155 ++++ themes/learn2/css/featherlight.min.css | 0 themes/learn2/css/nucleus-ie10.css | 0 themes/learn2/css/nucleus-ie9.css | 0 themes/learn2/css/pure-0.5.0/grids-min.css | 0 themes/learn2/images/clippy-white.svg | 3 + themes/learn2/js/featherlight.min.js | 0 themes/learn2/js/html5shiv-printshiv.min.js | 0 themes/learn2/js/jquery.scrollbar.js | 832 ++++++++++++++++++ themes/learn2/js/jquery.scrollbar.min.js | 0 themes/learn2/js/learn.js | 7 +- themes/learn2/js/modernizr.custom.71422.js | 0 themes/learn2/scss.sh | 0 .../scss/configuration/nucleus/_base.scss | 0 .../configuration/nucleus/_breakpoints.scss | 0 .../scss/configuration/nucleus/_core.scss | 0 .../scss/configuration/nucleus/_layout.scss | 0 .../scss/configuration/nucleus/_nav.scss | 0 .../configuration/nucleus/_typography.scss | 0 .../scss/configuration/theme/_base.scss | 0 .../scss/configuration/theme/_bullets.scss | 0 .../scss/configuration/theme/_colors.scss | 0 themes/learn2/scss/nucleus.scss | 0 themes/learn2/scss/nucleus/_core.scss | 0 themes/learn2/scss/nucleus/_flex.scss | 0 themes/learn2/scss/nucleus/_forms.scss | 0 themes/learn2/scss/nucleus/_typography.scss | 0 .../learn2/scss/nucleus/functions/_base.scss | 0 .../scss/nucleus/functions/_direction.scss | 0 .../learn2/scss/nucleus/functions/_range.scss | 0 themes/learn2/scss/nucleus/mixins/_base.scss | 0 .../scss/nucleus/mixins/_breakpoints.scss | 0 .../scss/nucleus/mixins/_utilities.scss | 0 .../scss/nucleus/particles/_align-text.scss | 0 .../scss/nucleus/particles/_visibility.scss | 0 themes/learn2/scss/theme.scss | 0 themes/learn2/scss/theme/_bullets.scss | 0 themes/learn2/scss/theme/_buttons.scss | 0 themes/learn2/scss/theme/_core.scss | 0 themes/learn2/scss/theme/_fonts.scss | 0 themes/learn2/scss/theme/_forms.scss | 0 themes/learn2/scss/theme/_main.scss | 0 themes/learn2/scss/theme/_nav.scss | 0 themes/learn2/scss/theme/_tables.scss | 0 themes/learn2/scss/theme/_typography.scss | 0 themes/learn2/scss/theme/modules/_base.scss | 0 .../learn2/scss/theme/modules/_buttons.scss | 0 .../bourbon/_bourbon-deprecated-upcoming.scss | 0 .../learn2/scss/vendor/bourbon/_bourbon.scss | 0 .../scss/vendor/bourbon/addons/_button.scss | 0 .../scss/vendor/bourbon/addons/_clearfix.scss | 0 .../bourbon/addons/_directional-values.scss | 0 .../scss/vendor/bourbon/addons/_ellipsis.scss | 0 .../vendor/bourbon/addons/_font-family.scss | 0 .../vendor/bourbon/addons/_hide-text.scss | 0 .../bourbon/addons/_html5-input-types.scss | 0 .../scss/vendor/bourbon/addons/_position.scss | 0 .../scss/vendor/bourbon/addons/_prefixer.scss | 0 .../scss/vendor/bourbon/addons/_rem.scss | 0 .../vendor/bourbon/addons/_retina-image.scss | 0 .../scss/vendor/bourbon/addons/_size.scss | 0 .../bourbon/addons/_timing-functions.scss | 0 .../scss/vendor/bourbon/addons/_triangle.scss | 0 .../vendor/bourbon/addons/_word-wrap.scss | 0 .../scss/vendor/bourbon/css3/_animation.scss | 0 .../scss/vendor/bourbon/css3/_appearance.scss | 0 .../bourbon/css3/_backface-visibility.scss | 0 .../bourbon/css3/_background-image.scss | 0 .../scss/vendor/bourbon/css3/_background.scss | 0 .../vendor/bourbon/css3/_border-image.scss | 0 .../vendor/bourbon/css3/_border-radius.scss | 0 .../scss/vendor/bourbon/css3/_box-sizing.scss | 0 .../scss/vendor/bourbon/css3/_calc.scss | 0 .../scss/vendor/bourbon/css3/_columns.scss | 0 .../scss/vendor/bourbon/css3/_filter.scss | 0 .../scss/vendor/bourbon/css3/_flex-box.scss | 0 .../scss/vendor/bourbon/css3/_font-face.scss | 0 .../bourbon/css3/_font-feature-settings.scss | 0 .../bourbon/css3/_hidpi-media-query.scss | 0 .../scss/vendor/bourbon/css3/_hyphens.scss | 0 .../vendor/bourbon/css3/_image-rendering.scss | 0 .../scss/vendor/bourbon/css3/_keyframes.scss | 0 .../vendor/bourbon/css3/_linear-gradient.scss | 0 .../vendor/bourbon/css3/_perspective.scss | 0 .../vendor/bourbon/css3/_placeholder.scss | 0 .../vendor/bourbon/css3/_radial-gradient.scss | 0 .../scss/vendor/bourbon/css3/_transform.scss | 0 .../scss/vendor/bourbon/css3/_transition.scss | 0 .../vendor/bourbon/css3/_user-select.scss | 0 .../vendor/bourbon/functions/_assign.scss | 0 .../bourbon/functions/_color-lightness.scss | 0 .../vendor/bourbon/functions/_flex-grid.scss | 0 .../bourbon/functions/_golden-ratio.scss | 0 .../vendor/bourbon/functions/_grid-width.scss | 0 .../bourbon/functions/_modular-scale.scss | 0 .../vendor/bourbon/functions/_px-to-em.scss | 0 .../vendor/bourbon/functions/_px-to-rem.scss | 0 .../bourbon/functions/_strip-units.scss | 0 .../vendor/bourbon/functions/_tint-shade.scss | 0 .../functions/_transition-property-name.scss | 0 .../vendor/bourbon/functions/_unpack.scss | 0 .../bourbon/helpers/_convert-units.scss | 0 .../helpers/_gradient-positions-parser.scss | 0 .../scss/vendor/bourbon/helpers/_is-num.scss | 0 .../bourbon/helpers/_linear-angle-parser.scss | 0 .../helpers/_linear-gradient-parser.scss | 0 .../helpers/_linear-positions-parser.scss | 0 .../helpers/_linear-side-corner-parser.scss | 0 .../bourbon/helpers/_radial-arg-parser.scss | 0 .../helpers/_radial-gradient-parser.scss | 0 .../helpers/_radial-positions-parser.scss | 0 .../bourbon/helpers/_render-gradients.scss | 0 .../bourbon/helpers/_shape-size-stripper.scss | 0 .../vendor/bourbon/helpers/_str-to-num.scss | 0 .../vendor/bourbon/settings/_prefixer.scss | 0 .../vendor/bourbon/settings/_px-to-em.scss | 0 .../vendor/color-schemer/_color-schemer.scss | 0 .../color-schemer/color-schemer/_cmyk.scss | 0 .../color-schemer/_color-adjustments.scss | 0 .../color-schemer/_color-schemer.scss | 0 .../color-schemer/_colorblind.scss | 0 .../color-schemer/_comparison.scss | 0 .../color-schemer/_equalize.scss | 0 .../color-schemer/_harmonize.scss | 0 .../color-schemer/_interpolation.scss | 0 .../color-schemer/color-schemer/_mix.scss | 0 .../color-schemer/color-schemer/_mixins.scss | 0 .../color-schemer/color-schemer/_ryb.scss | 0 .../color-schemer/_tint-shade.scss | 0 .../learn2/templates/partials/base.html.twig | 3 +- 130 files changed, 997 insertions(+), 3 deletions(-) mode change 100755 => 100644 themes/learn2/css/featherlight.min.css mode change 100755 => 100644 themes/learn2/css/nucleus-ie10.css mode change 100755 => 100644 themes/learn2/css/nucleus-ie9.css mode change 100755 => 100644 themes/learn2/css/pure-0.5.0/grids-min.css create mode 100644 themes/learn2/images/clippy-white.svg mode change 100755 => 100644 themes/learn2/js/featherlight.min.js mode change 100755 => 100644 themes/learn2/js/html5shiv-printshiv.min.js create mode 100644 themes/learn2/js/jquery.scrollbar.js mode change 100755 => 100644 themes/learn2/js/jquery.scrollbar.min.js mode change 100755 => 100644 themes/learn2/js/modernizr.custom.71422.js mode change 100755 => 100644 themes/learn2/scss.sh mode change 100755 => 100644 themes/learn2/scss/configuration/nucleus/_base.scss mode change 100755 => 100644 themes/learn2/scss/configuration/nucleus/_breakpoints.scss mode change 100755 => 100644 themes/learn2/scss/configuration/nucleus/_core.scss mode change 100755 => 100644 themes/learn2/scss/configuration/nucleus/_layout.scss mode change 100755 => 100644 themes/learn2/scss/configuration/nucleus/_nav.scss mode change 100755 => 100644 themes/learn2/scss/configuration/nucleus/_typography.scss mode change 100755 => 100644 themes/learn2/scss/configuration/theme/_base.scss mode change 100755 => 100644 themes/learn2/scss/configuration/theme/_bullets.scss mode change 100755 => 100644 themes/learn2/scss/configuration/theme/_colors.scss mode change 100755 => 100644 themes/learn2/scss/nucleus.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/_core.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/_flex.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/_forms.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/_typography.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/functions/_base.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/functions/_direction.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/functions/_range.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/mixins/_base.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/mixins/_breakpoints.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/mixins/_utilities.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/particles/_align-text.scss mode change 100755 => 100644 themes/learn2/scss/nucleus/particles/_visibility.scss mode change 100755 => 100644 themes/learn2/scss/theme.scss mode change 100755 => 100644 themes/learn2/scss/theme/_bullets.scss mode change 100755 => 100644 themes/learn2/scss/theme/_buttons.scss mode change 100755 => 100644 themes/learn2/scss/theme/_core.scss mode change 100755 => 100644 themes/learn2/scss/theme/_fonts.scss mode change 100755 => 100644 themes/learn2/scss/theme/_forms.scss mode change 100755 => 100644 themes/learn2/scss/theme/_main.scss mode change 100755 => 100644 themes/learn2/scss/theme/_nav.scss mode change 100755 => 100644 themes/learn2/scss/theme/_tables.scss mode change 100755 => 100644 themes/learn2/scss/theme/_typography.scss mode change 100755 => 100644 themes/learn2/scss/theme/modules/_base.scss mode change 100755 => 100644 themes/learn2/scss/theme/modules/_buttons.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/_bourbon.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_button.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_font-family.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_position.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_rem.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_size.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_triangle.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_animation.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_appearance.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_background-image.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_background.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_border-image.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_calc.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_columns.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_filter.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_font-face.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_perspective.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_transform.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_transition.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/css3/_user-select.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_assign.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/functions/_unpack.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss mode change 100755 => 100644 themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/_color-schemer.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss mode change 100755 => 100644 themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss diff --git a/themes/learn2/css/custom.css b/themes/learn2/css/custom.css index a946b20..62dd514 100644 --- a/themes/learn2/css/custom.css +++ b/themes/learn2/css/custom.css @@ -1,3 +1,158 @@ +<<<<<<< HEAD +======= +/* +=============================================================================================================================== +Put your custom CSS in this file. +=============================================================================================================================== +*/ + +/* sidebar big lower portion */ +#sidebar { + /*background-color: #262c31;*/ + /*background-color: #131114;*/ + /*background-color: #34233a;*/ + /*background-color: #2e2333;*/ + background-color: #47314f; +} + +/* sidebar top portion */ +#sidebar #header { + /*background-color: #111314;*/ + /*background-color: #1e1321;*/ + /*background-color: #111111;*/ + background-color: #9c5ea2; +} + +/* search box in sidebar */ +#sidebar #header .searchbox { + /*background: #262c31;*/ + background: #222222; + /*border-color: #530e64;*/ + border-color: #2e2333; + border-radius: 0px; + border-width: 2px; +} + +/* magnifying glass in search box */ +#sidebar #header .searchbox label { + color: rgba(200, 200, 200, 0.8); +} + +/* search box entered text */ +#sidebar #header .searchbox input { + color: #fff; +} + +/* search box placeholder text */ +#sidebar #header .searchbox input::placeholder { + color: rgba(200, 200, 200, 0.8); + opacity: 1; /* something firefox fix */ +} + +/* full content */ +body { + background: #111111; + color: #dddddd; +} + +/* code blocks */ +pre { + background: #222222; + border: 1px solid #555555; +} +pre code { + /*color: #b51c42;*/ + color: #c897d8; + /* this padding fixes indent on first line for codeblocks */ + padding: 0; +} +pre .copy-to-clipboard { + background-color: #111111; + /* + to revert the fix for "copy" button + margin-top: 0; + */ +} +pre .copy-to-clipboard:hover { + background-color: #333333; +} + +/* inline code */ +code { + /*color: #b51c42;*/ + color: #c897d8; + background: #222222; +} +.copy-to-clipboard { + background-color: #111111; + background-image: url(../images/clippy-white.svg); + /* + makes "copy" button fit slightly better imo + FIXME this breaks chromium + margin-top: .2rem; + */ +} +.copy-to-clipboard:hover { + background-color: #333333; +} + +/* Sidebar topics */ +#sidebar ul.topics > li.parent, #sidebar ul.topics > li.active { + /*background: #322535;*/ + /*background: #241e26;*/ + /*background: #252226;*/ + background: #312037; +} + +/* Sidebar currently selected main topic */ +#sidebar ul li.active > a { + background: #111111; + color: #dddddd !important; +} + +/* HACK hide checkmark icons */ +.fa.fa-check.read-icon { + visibility: hidden; +} + +/* outline around search bar when clicked */ +textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="url"]:focus, input[type="color"]:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, select[multiple="multiple"]:focus { + /*box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06), 0 0 5px rgba(164, 124, 178, 0.7);*/ + box-shadow: none; +} + +/* Blockquote */ +blockquote { + border-left: 10px solid #9C5EA2; +} + +/* Hides the sub-menu item if parent not active +.dd-item .dd-item ul li { + display: none; +} + +.dd-item .dd-item.active ul li, +.dd-item.parent > ul > li { + display: block; +} + + Hides the sub-sub-menu menu-item if parent not active +.dd-item.parent > ul > li.dd-item.active > ul > li > ul > li { + display: none; +} + +.dd-item.parent > ul > li.dd-item.active > ul > li { + display: block; +} +*/ + +/* hide scrollbar from jquery.scrollbar. Firefox already adds one anyways */ +/*.scroll-element.scroll-y { + display: none !important; +}*/ + +/* random stuff */ +>>>>>>> parent of e861ead (Reset to default theme) .highlightable { overflow: auto; } diff --git a/themes/learn2/css/featherlight.min.css b/themes/learn2/css/featherlight.min.css old mode 100755 new mode 100644 diff --git a/themes/learn2/css/nucleus-ie10.css b/themes/learn2/css/nucleus-ie10.css old mode 100755 new mode 100644 diff --git a/themes/learn2/css/nucleus-ie9.css b/themes/learn2/css/nucleus-ie9.css old mode 100755 new mode 100644 diff --git a/themes/learn2/css/pure-0.5.0/grids-min.css b/themes/learn2/css/pure-0.5.0/grids-min.css old mode 100755 new mode 100644 diff --git a/themes/learn2/images/clippy-white.svg b/themes/learn2/images/clippy-white.svg new file mode 100644 index 0000000..261667a --- /dev/null +++ b/themes/learn2/images/clippy-white.svg @@ -0,0 +1,3 @@ + + + diff --git a/themes/learn2/js/featherlight.min.js b/themes/learn2/js/featherlight.min.js old mode 100755 new mode 100644 diff --git a/themes/learn2/js/html5shiv-printshiv.min.js b/themes/learn2/js/html5shiv-printshiv.min.js old mode 100755 new mode 100644 diff --git a/themes/learn2/js/jquery.scrollbar.js b/themes/learn2/js/jquery.scrollbar.js new file mode 100644 index 0000000..c46a80d --- /dev/null +++ b/themes/learn2/js/jquery.scrollbar.js @@ -0,0 +1,832 @@ +/** + * jQuery CSS Customizable Scrollbar + * + * Copyright 2015, Yuriy Khabarov + * Dual licensed under the MIT or GPL Version 2 licenses. + * + * If you found bug, please contact me via email <13real008@gmail.com> + * + * @author Yuriy Khabarov aka Gromo + * @version 0.2.11 + * @url https://github.com/gromo/jquery.scrollbar/ + * + */ +; +(function (root, factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + define(['jquery'], factory); + } else if (typeof exports !== 'undefined') { + module.exports = factory(require('jquery')); + } else { + factory(jQuery); + } +}(this, function ($) { + 'use strict'; + + // init flags & variables + var debug = true; + + var browser = { + data: { + index: 0, + name: 'scrollbar' + }, + firefox: /firefox/i.test(navigator.userAgent), + macosx: /mac/i.test(navigator.platform), + msedge: /edge\/\d+/i.test(navigator.userAgent), + msie: /(msie|trident)/i.test(navigator.userAgent), + mobile: /android|webos|iphone|ipad|ipod|blackberry/i.test(navigator.userAgent), + overlay: null, + scroll: null, + scrolls: [], + webkit: /webkit/i.test(navigator.userAgent) && !/edge\/\d+/i.test(navigator.userAgent) + }; + + browser.scrolls.add = function (instance) { + this.remove(instance).push(instance); + }; + browser.scrolls.remove = function (instance) { + while ($.inArray(instance, this) >= 0) { + this.splice($.inArray(instance, this), 1); + } + return this; + }; + + var defaults = { + autoScrollSize: true, // automatically calculate scrollsize + autoUpdate: true, // update scrollbar if content/container size changed + debug: true, // debug mode + disableBodyScroll: false, // disable body scroll if mouse over container + duration: 200, // scroll animate duration in ms + ignoreMobile: false, // ignore mobile devices + ignoreOverlay: false, // ignore browsers with overlay scrollbars (mobile, MacOS) + isRtl: false, // is RTL + scrollStep: 30, // scroll step for scrollbar arrows + showArrows: false, // add class to show arrows + stepScrolling: true, // when scrolling to scrollbar mousedown position + + scrollx: null, // horizontal scroll element + scrolly: null, // vertical scroll element + + onDestroy: null, // callback function on destroy, + onFallback: null, // callback function if scrollbar is not initialized + onInit: null, // callback function on first initialization + onScroll: null, // callback function on content scrolling + onUpdate: null // callback function on init/resize (before scrollbar size calculation) + }; + + + var BaseScrollbar = function (container) { + + if (!browser.scroll) { + browser.overlay = isScrollOverlaysContent(); + browser.scroll = getBrowserScrollSize(); + updateScrollbars(); + + $(window).resize(function () { + var forceUpdate = false; + if (browser.scroll && (browser.scroll.height || browser.scroll.width)) { + var scroll = getBrowserScrollSize(); + if (scroll.height !== browser.scroll.height || scroll.width !== browser.scroll.width) { + browser.scroll = scroll; + forceUpdate = true; // handle page zoom + } + } + updateScrollbars(forceUpdate); + }); + } + + this.container = container; + this.namespace = '.scrollbar_' + browser.data.index++; + this.options = $.extend({}, defaults, window.jQueryScrollbarOptions || {}); + this.scrollTo = null; + this.scrollx = {}; + this.scrolly = {}; + + container.data(browser.data.name, this); + browser.scrolls.add(this); + }; + + BaseScrollbar.prototype = { + destroy: function () { + + if (!this.wrapper) { + return; + } + + this.container.removeData(browser.data.name); + browser.scrolls.remove(this); + + // init variables + var scrollLeft = this.container.scrollLeft(); + var scrollTop = this.container.scrollTop(); + + this.container.insertBefore(this.wrapper).css({ + "height": "", + "margin": "", + "max-height": "" + }) + .removeClass('scroll-content scroll-scrollx_visible scroll-scrolly_visible') + .off(this.namespace) + .scrollLeft(scrollLeft) + .scrollTop(scrollTop); + + this.scrollx.scroll.removeClass('scroll-scrollx_visible').find('div').addBack().off(this.namespace); + this.scrolly.scroll.removeClass('scroll-scrolly_visible').find('div').addBack().off(this.namespace); + + this.wrapper.remove(); + + $(document).add('body').off(this.namespace); + + if ($.isFunction(this.options.onDestroy)) { + this.options.onDestroy.apply(this, [this.container]); + } + }, + init: function (options) { + + // init variables + var S = this, + c = this.container, + cw = this.containerWrapper || c, + namespace = this.namespace, + o = $.extend(this.options, options || {}), + s = {x: this.scrollx, y: this.scrolly}, + w = this.wrapper, + cssOptions = {}; + + var initScroll = { + scrollLeft: c.scrollLeft(), + scrollTop: c.scrollTop() + }; + + // do not init if in ignorable browser + if ((browser.mobile && o.ignoreMobile) + || (browser.overlay && o.ignoreOverlay) + || (browser.macosx && !browser.webkit) // still required to ignore nonWebKit browsers on Mac + ) { + if ($.isFunction(o.onFallback)) { + o.onFallback.apply(this, [c]); + } + return false; + } + + // init scroll container + if (!w) { + this.wrapper = w = $('
').addClass('scroll-wrapper').addClass(c.attr('class')) + .css('position', c.css('position') === 'absolute' ? 'absolute' : 'relative') + .insertBefore(c).append(c); + + if (o.isRtl) { + w.addClass('scroll--rtl'); + } + + if (c.is('textarea')) { + this.containerWrapper = cw = $('
').insertBefore(c).append(c); + w.addClass('scroll-textarea'); + } + + cssOptions = { + "height": "auto", + "margin-bottom": browser.scroll.height * -1 + 'px', + "max-height": "" + }; + cssOptions[o.isRtl ? 'margin-left' : 'margin-right'] = browser.scroll.width * -1 + 'px'; + + cw.addClass('scroll-content').css(cssOptions); + + c.on('scroll' + namespace, function (event) { + var scrollLeft = c.scrollLeft(); + var scrollTop = c.scrollTop(); + if (o.isRtl) { + // webkit 0:100 + // ie/edge 100:0 + // firefox -100:0 + switch (true) { + case browser.firefox: + scrollLeft = Math.abs(scrollLeft); + case browser.msedge || browser.msie: + scrollLeft = c[0].scrollWidth - c[0].clientWidth - scrollLeft; + break; + } + } + if ($.isFunction(o.onScroll)) { + o.onScroll.call(S, { + maxScroll: s.y.maxScrollOffset, + scroll: scrollTop, + size: s.y.size, + visible: s.y.visible + }, { + maxScroll: s.x.maxScrollOffset, + scroll: scrollLeft, + size: s.x.size, + visible: s.x.visible + }); + } + s.x.isVisible && s.x.scroll.bar.css('left', scrollLeft * s.x.kx + 'px'); + s.y.isVisible && s.y.scroll.bar.css('top', scrollTop * s.y.kx + 'px'); + }); + + /* prevent native scrollbars to be visible on #anchor click */ + w.on('scroll' + namespace, function () { + w.scrollTop(0).scrollLeft(0); + }); + + if (o.disableBodyScroll) { + var handleMouseScroll = function (event) { + isVerticalScroll(event) ? + s.y.isVisible && s.y.mousewheel(event) : + s.x.isVisible && s.x.mousewheel(event); + }; + w.on('MozMousePixelScroll' + namespace, handleMouseScroll); + w.on('mousewheel' + namespace, handleMouseScroll); + + if (browser.mobile) { + w.on('touchstart' + namespace, function (event) { + var touch = event.originalEvent.touches && event.originalEvent.touches[0] || event; + var originalTouch = { + pageX: touch.pageX, + pageY: touch.pageY + }; + var originalScroll = { + left: c.scrollLeft(), + top: c.scrollTop() + }; + $(document).on('touchmove' + namespace, function (event) { + var touch = event.originalEvent.targetTouches && event.originalEvent.targetTouches[0] || event; + c.scrollLeft(originalScroll.left + originalTouch.pageX - touch.pageX); + c.scrollTop(originalScroll.top + originalTouch.pageY - touch.pageY); + event.preventDefault(); + }); + $(document).on('touchend' + namespace, function () { + $(document).off(namespace); + }); + }); + } + } + if ($.isFunction(o.onInit)) { + o.onInit.apply(this, [c]); + } + } else { + cssOptions = { + "height": "auto", + "margin-bottom": browser.scroll.height * -1 + 'px', + "max-height": "" + }; + cssOptions[o.isRtl ? 'margin-left' : 'margin-right'] = browser.scroll.width * -1 + 'px'; + cw.css(cssOptions); + } + + // init scrollbars & recalculate sizes + $.each(s, function (d, scrollx) { + + var scrollCallback = null; + var scrollForward = 1; + var scrollOffset = (d === 'x') ? 'scrollLeft' : 'scrollTop'; + var scrollStep = o.scrollStep; + var scrollTo = function () { + var currentOffset = c[scrollOffset](); + c[scrollOffset](currentOffset + scrollStep); + if (scrollForward == 1 && (currentOffset + scrollStep) >= scrollToValue) + currentOffset = c[scrollOffset](); + if (scrollForward == -1 && (currentOffset + scrollStep) <= scrollToValue) + currentOffset = c[scrollOffset](); + if (c[scrollOffset]() == currentOffset && scrollCallback) { + scrollCallback(); + } + } + var scrollToValue = 0; + + if (!scrollx.scroll) { + + scrollx.scroll = S._getScroll(o['scroll' + d]).addClass('scroll-' + d); + + if (o.showArrows) { + scrollx.scroll.addClass('scroll-element_arrows_visible'); + } + + scrollx.mousewheel = function (event) { + + if (!scrollx.isVisible || (d === 'x' && isVerticalScroll(event))) { + return true; + } + if (d === 'y' && !isVerticalScroll(event)) { + s.x.mousewheel(event); + return true; + } + + var delta = event.originalEvent.wheelDelta * -1 || event.originalEvent.detail; + var maxScrollValue = scrollx.size - scrollx.visible - scrollx.offset; + + // fix new mozilla + if (!delta) { + if (d === 'x' && !!event.originalEvent.deltaX) { + delta = event.originalEvent.deltaX * 40; + } else if (d === 'y' && !!event.originalEvent.deltaY) { + delta = event.originalEvent.deltaY * 40; + } + } + + if ((delta > 0 && scrollToValue < maxScrollValue) || (delta < 0 && scrollToValue > 0)) { + scrollToValue = scrollToValue + delta; + if (scrollToValue < 0) + scrollToValue = 0; + if (scrollToValue > maxScrollValue) + scrollToValue = maxScrollValue; + + S.scrollTo = S.scrollTo || {}; + S.scrollTo[scrollOffset] = scrollToValue; + setTimeout(function () { + if (S.scrollTo) { + c.stop().animate(S.scrollTo, 240, 'linear', function () { + scrollToValue = c[scrollOffset](); + }); + S.scrollTo = null; + } + }, 1); + } + + event.preventDefault(); + return false; + }; + + scrollx.scroll + .on('MozMousePixelScroll' + namespace, scrollx.mousewheel) + .on('mousewheel' + namespace, scrollx.mousewheel) + .on('mouseenter' + namespace, function () { + scrollToValue = c[scrollOffset](); + }); + + // handle arrows & scroll inner mousedown event + scrollx.scroll.find('.scroll-arrow, .scroll-element_track') + .on('mousedown' + namespace, function (event) { + + if (event.which != 1) // lmb + return true; + + scrollForward = 1; + + var data = { + eventOffset: event[(d === 'x') ? 'pageX' : 'pageY'], + maxScrollValue: scrollx.size - scrollx.visible - scrollx.offset, + scrollbarOffset: scrollx.scroll.bar.offset()[(d === 'x') ? 'left' : 'top'], + scrollbarSize: scrollx.scroll.bar[(d === 'x') ? 'outerWidth' : 'outerHeight']() + }; + var timeout = 0, timer = 0; + + if ($(this).hasClass('scroll-arrow')) { + scrollForward = $(this).hasClass("scroll-arrow_more") ? 1 : -1; + scrollStep = o.scrollStep * scrollForward; + scrollToValue = scrollForward > 0 ? data.maxScrollValue : 0; + if (o.isRtl) { + switch(true){ + case browser.firefox: + scrollToValue = scrollForward > 0 ? 0: data.maxScrollValue * -1; + break; + case browser.msie || browser.msedge: + break; + } + } + } else { + scrollForward = (data.eventOffset > (data.scrollbarOffset + data.scrollbarSize) ? 1 + : (data.eventOffset < data.scrollbarOffset ? -1 : 0)); + if(d === 'x' && o.isRtl && (browser.msie || browser.msedge)) + scrollForward = scrollForward * -1; + scrollStep = Math.round(scrollx.visible * 0.75) * scrollForward; + scrollToValue = (data.eventOffset - data.scrollbarOffset - + (o.stepScrolling ? (scrollForward == 1 ? data.scrollbarSize : 0) + : Math.round(data.scrollbarSize / 2))); + scrollToValue = c[scrollOffset]() + (scrollToValue / scrollx.kx); + } + + S.scrollTo = S.scrollTo || {}; + S.scrollTo[scrollOffset] = o.stepScrolling ? c[scrollOffset]() + scrollStep : scrollToValue; + + if (o.stepScrolling) { + scrollCallback = function () { + scrollToValue = c[scrollOffset](); + clearInterval(timer); + clearTimeout(timeout); + timeout = 0; + timer = 0; + }; + timeout = setTimeout(function () { + timer = setInterval(scrollTo, 40); + }, o.duration + 100); + } + + setTimeout(function () { + if (S.scrollTo) { + c.animate(S.scrollTo, o.duration); + S.scrollTo = null; + } + }, 1); + + return S._handleMouseDown(scrollCallback, event); + }); + + // handle scrollbar drag'n'drop + scrollx.scroll.bar.on('mousedown' + namespace, function (event) { + + if (event.which != 1) // lmb + return true; + + var eventPosition = event[(d === 'x') ? 'pageX' : 'pageY']; + var initOffset = c[scrollOffset](); + + scrollx.scroll.addClass('scroll-draggable'); + + $(document).on('mousemove' + namespace, function (event) { + var diff = parseInt((event[(d === 'x') ? 'pageX' : 'pageY'] - eventPosition) / scrollx.kx, 10); + if (d === 'x' && o.isRtl && (browser.msie || browser.msedge)) + diff = diff * -1; + c[scrollOffset](initOffset + diff); + }); + + return S._handleMouseDown(function () { + scrollx.scroll.removeClass('scroll-draggable'); + scrollToValue = c[scrollOffset](); + }, event); + }); + } + }); + + // remove classes & reset applied styles + $.each(s, function (d, scrollx) { + var scrollClass = 'scroll-scroll' + d + '_visible'; + var scrolly = (d == "x") ? s.y : s.x; + + scrollx.scroll.removeClass(scrollClass); + scrolly.scroll.removeClass(scrollClass); + cw.removeClass(scrollClass); + }); + + // calculate init sizes + $.each(s, function (d, scrollx) { + $.extend(scrollx, (d == "x") ? { + offset: parseInt(c.css('left'), 10) || 0, + size: c.prop('scrollWidth'), + visible: w.width() + } : { + offset: parseInt(c.css('top'), 10) || 0, + size: c.prop('scrollHeight'), + visible: w.height() + }); + }); + + // update scrollbar visibility/dimensions + this._updateScroll('x', this.scrollx); + this._updateScroll('y', this.scrolly); + + if ($.isFunction(o.onUpdate)) { + o.onUpdate.apply(this, [c]); + } + + // calculate scroll size + $.each(s, function (d, scrollx) { + + var cssOffset = (d === 'x') ? 'left' : 'top'; + var cssFullSize = (d === 'x') ? 'outerWidth' : 'outerHeight'; + var cssSize = (d === 'x') ? 'width' : 'height'; + var offset = parseInt(c.css(cssOffset), 10) || 0; + + var AreaSize = scrollx.size; + var AreaVisible = scrollx.visible + offset; + + var scrollSize = scrollx.scroll.size[cssFullSize]() + (parseInt(scrollx.scroll.size.css(cssOffset), 10) || 0); + + if (o.autoScrollSize) { + scrollx.scrollbarSize = parseInt(scrollSize * AreaVisible / AreaSize, 10); + scrollx.scroll.bar.css(cssSize, scrollx.scrollbarSize + 'px'); + } + + scrollx.scrollbarSize = scrollx.scroll.bar[cssFullSize](); + scrollx.kx = ((scrollSize - scrollx.scrollbarSize) / (AreaSize - AreaVisible)) || 1; + scrollx.maxScrollOffset = AreaSize - AreaVisible; + }); + + c.scrollLeft(initScroll.scrollLeft).scrollTop(initScroll.scrollTop).trigger('scroll'); + }, + /** + * Get scrollx/scrolly object + * + * @param {Mixed} scroll + * @returns {jQuery} scroll object + */ + _getScroll: function (scroll) { + var types = { + advanced: [ + '
', + '
', + '
', + '
', + '
', + '
', // required! used for scrollbar size calculation ! + '
', + '
', // used for handling scrollbar click + '
', + '
', + '
', + '
', // required + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
' + ].join(''), + simple: [ + '
', + '
', + '
', // required! used for scrollbar size calculation ! + '
', // used for handling scrollbar click + '
', // required + '
', + '
' + ].join('') + }; + if (types[scroll]) { + scroll = types[scroll]; + } + if (!scroll) { + scroll = types['simple']; + } + if (typeof (scroll) == 'string') { + scroll = $(scroll).appendTo(this.wrapper); + } else { + scroll = $(scroll); + } + $.extend(scroll, { + bar: scroll.find('.scroll-bar'), + size: scroll.find('.scroll-element_size'), + track: scroll.find('.scroll-element_track') + }); + return scroll; + }, + _handleMouseDown: function (callback, event) { + + var namespace = this.namespace; + + $(document).on('blur' + namespace, function () { + $(document).add('body').off(namespace); + callback && callback(); + }); + $(document).on('dragstart' + namespace, function (event) { + event.preventDefault(); + return false; + }); + $(document).on('mouseup' + namespace, function () { + $(document).add('body').off(namespace); + callback && callback(); + }); + $('body').on('selectstart' + namespace, function (event) { + event.preventDefault(); + return false; + }); + + event && event.preventDefault(); + return false; + }, + _updateScroll: function (d, scrollx) { + + var container = this.container, + containerWrapper = this.containerWrapper || container, + scrollClass = 'scroll-scroll' + d + '_visible', + scrolly = (d === 'x') ? this.scrolly : this.scrollx, + offset = parseInt(this.container.css((d === 'x') ? 'left' : 'top'), 10) || 0, + wrapper = this.wrapper; + + var AreaSize = scrollx.size; + var AreaVisible = scrollx.visible + offset; + + scrollx.isVisible = (AreaSize - AreaVisible) > 1; // bug in IE9/11 with 1px diff + if (scrollx.isVisible) { + scrollx.scroll.addClass(scrollClass); + scrolly.scroll.addClass(scrollClass); + containerWrapper.addClass(scrollClass); + } else { + scrollx.scroll.removeClass(scrollClass); + scrolly.scroll.removeClass(scrollClass); + containerWrapper.removeClass(scrollClass); + } + + if (d === 'y') { + if (container.is('textarea') || AreaSize < AreaVisible) { + containerWrapper.css({ + "height": (AreaVisible + browser.scroll.height) + 'px', + "max-height": "none" + }); + } else { + containerWrapper.css({ + //"height": "auto", // do not reset height value: issue with height:100%! + "max-height": (AreaVisible + browser.scroll.height) + 'px' + }); + } + } + + if (scrollx.size != container.prop('scrollWidth') + || scrolly.size != container.prop('scrollHeight') + || scrollx.visible != wrapper.width() + || scrolly.visible != wrapper.height() + || scrollx.offset != (parseInt(container.css('left'), 10) || 0) + || scrolly.offset != (parseInt(container.css('top'), 10) || 0) + ) { + $.extend(this.scrollx, { + offset: parseInt(container.css('left'), 10) || 0, + size: container.prop('scrollWidth'), + visible: wrapper.width() + }); + $.extend(this.scrolly, { + offset: parseInt(container.css('top'), 10) || 0, + size: this.container.prop('scrollHeight'), + visible: wrapper.height() + }); + this._updateScroll(d === 'x' ? 'y' : 'x', scrolly); + } + } + }; + + var CustomScrollbar = BaseScrollbar; + + /* + * Extend jQuery as plugin + * + * @param {Mixed} command to execute + * @param {Mixed} arguments as Array + * @return {jQuery} + */ + $.fn.scrollbar = function (command, args) { + if (typeof command !== 'string') { + args = command; + command = 'init'; + } + if (typeof args === 'undefined') { + args = []; + } + if (!$.isArray(args)) { + args = [args]; + } + this.not('body, .scroll-wrapper').each(function () { + var element = $(this), + instance = element.data(browser.data.name); + if (instance || command === 'init') { + if (!instance) { + instance = new CustomScrollbar(element); + } + if (instance[command]) { + instance[command].apply(instance, args); + } + } + }); + return this; + }; + + /** + * Connect default options to global object + */ + $.fn.scrollbar.options = defaults; + + + /** + * Check if scroll content/container size is changed + */ + + var updateScrollbars = (function () { + var timer = 0, + timerCounter = 0; + + return function (force) { + var i, container, options, scroll, wrapper, scrollx, scrolly; + for (i = 0; i < browser.scrolls.length; i++) { + scroll = browser.scrolls[i]; + container = scroll.container; + options = scroll.options; + wrapper = scroll.wrapper; + scrollx = scroll.scrollx; + scrolly = scroll.scrolly; + if (force || (options.autoUpdate && wrapper && wrapper.is(':visible') && + (container.prop('scrollWidth') != scrollx.size || container.prop('scrollHeight') != scrolly.size || wrapper.width() != scrollx.visible || wrapper.height() != scrolly.visible))) { + scroll.init(); + + if (options.debug) { + window.console && console.log({ + scrollHeight: container.prop('scrollHeight') + ':' + scroll.scrolly.size, + scrollWidth: container.prop('scrollWidth') + ':' + scroll.scrollx.size, + visibleHeight: wrapper.height() + ':' + scroll.scrolly.visible, + visibleWidth: wrapper.width() + ':' + scroll.scrollx.visible + }, true); + timerCounter++; + } + } + } + if (debug && timerCounter > 10) { + window.console && console.log('Scroll updates exceed 10'); + updateScrollbars = function () {}; + } else { + clearTimeout(timer); + timer = setTimeout(updateScrollbars, 300); + } + }; + })(); + + /* ADDITIONAL FUNCTIONS */ + /** + * Get native browser scrollbar size (height/width) + * + * @param {Boolean} actual size or CSS size, default - CSS size + * @returns {Object} with height, width + */ + function getBrowserScrollSize(actualSize) { + + if (browser.webkit && !actualSize) { + return { + height: 0, + width: 0 + }; + } + + if (!browser.data.outer) { + var css = { + "border": "none", + "box-sizing": "content-box", + "height": "200px", + "margin": "0", + "padding": "0", + "width": "200px" + }; + browser.data.inner = $("
").css($.extend({}, css)); + browser.data.outer = $("
").css($.extend({ + "left": "-1000px", + "overflow": "scroll", + "position": "absolute", + "top": "-1000px" + }, css)).append(browser.data.inner).appendTo("body"); + } + + browser.data.outer.scrollLeft(1000).scrollTop(1000); + + return { + height: Math.ceil((browser.data.outer.offset().top - browser.data.inner.offset().top) || 0), + width: Math.ceil((browser.data.outer.offset().left - browser.data.inner.offset().left) || 0) + }; + } + + /** + * Check if native browser scrollbars overlay content + * + * @returns {Boolean} + */ + function isScrollOverlaysContent() { + var scrollSize = getBrowserScrollSize(true); + return !(scrollSize.height || scrollSize.width); + } + + function isVerticalScroll(event) { + var e = event.originalEvent; + if (e.axis && e.axis === e.HORIZONTAL_AXIS) + return false; + if (e.wheelDeltaX) + return false; + return true; + } + + + /** + * Extend AngularJS as UI directive + * and expose a provider for override default config + * + */ + if (window.angular) { + (function (angular) { + angular.module('jQueryScrollbar', []) + .provider('jQueryScrollbar', function () { + var defaultOptions = defaults; + return { + setOptions: function (options) { + angular.extend(defaultOptions, options); + }, + $get: function () { + return { + options: angular.copy(defaultOptions) + }; + } + }; + }) + .directive('jqueryScrollbar', ['jQueryScrollbar', '$parse', function (jQueryScrollbar, $parse) { + return { + restrict: "AC", + link: function (scope, element, attrs) { + var model = $parse(attrs.jqueryScrollbar), + options = model(scope); + element.scrollbar(options || jQueryScrollbar.options) + .on('$destroy', function () { + element.scrollbar('destroy'); + }); + } + }; + }]); + })(window.angular); + } +})); diff --git a/themes/learn2/js/jquery.scrollbar.min.js b/themes/learn2/js/jquery.scrollbar.min.js old mode 100755 new mode 100644 diff --git a/themes/learn2/js/learn.js b/themes/learn2/js/learn.js index 73bd860..1a918a8 100644 --- a/themes/learn2/js/learn.js +++ b/themes/learn2/js/learn.js @@ -1,4 +1,3 @@ -// Scrollbar Width function function getScrollBarWidth() { var inner = document.createElement('p'); inner.style.width = "100%"; @@ -83,6 +82,7 @@ $(window).resize(function() { jQuery(document).ready(function() { var sidebarStatus = searchStatus = 'open'; + jQuery('.scrollbar-inner').scrollbar(); // set the menu height setMenuHeight(); @@ -94,7 +94,7 @@ jQuery(document).ready(function() { return false; }); - jQuery('.scrollbar-inner').scrollbar(); + //jQuery('.scrollbar-inner').scrollbar(); jQuery('[data-sidebar-toggle]').on('click', function() { jQuery(document.body).toggleClass('sidebar-hidden'); @@ -179,6 +179,9 @@ jQuery(document).ready(function() { var text, clip = new Clipboard('.copy-to-clipboard', { text: function(trigger) { text = $(trigger).prev('code').text(); + // NOTE custom stuff to strip # or $ from the beginning of my inline command blocks + return text.replace(/^[\$\s\#\$]{1,4}/gm, ''); + // original code return text.replace(/^\$\s/gm, ''); } }); diff --git a/themes/learn2/js/modernizr.custom.71422.js b/themes/learn2/js/modernizr.custom.71422.js old mode 100755 new mode 100644 diff --git a/themes/learn2/scss.sh b/themes/learn2/scss.sh old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/nucleus/_base.scss b/themes/learn2/scss/configuration/nucleus/_base.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/nucleus/_breakpoints.scss b/themes/learn2/scss/configuration/nucleus/_breakpoints.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/nucleus/_core.scss b/themes/learn2/scss/configuration/nucleus/_core.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/nucleus/_layout.scss b/themes/learn2/scss/configuration/nucleus/_layout.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/nucleus/_nav.scss b/themes/learn2/scss/configuration/nucleus/_nav.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/nucleus/_typography.scss b/themes/learn2/scss/configuration/nucleus/_typography.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/theme/_base.scss b/themes/learn2/scss/configuration/theme/_base.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/theme/_bullets.scss b/themes/learn2/scss/configuration/theme/_bullets.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/configuration/theme/_colors.scss b/themes/learn2/scss/configuration/theme/_colors.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus.scss b/themes/learn2/scss/nucleus.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/_core.scss b/themes/learn2/scss/nucleus/_core.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/_flex.scss b/themes/learn2/scss/nucleus/_flex.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/_forms.scss b/themes/learn2/scss/nucleus/_forms.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/_typography.scss b/themes/learn2/scss/nucleus/_typography.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/functions/_base.scss b/themes/learn2/scss/nucleus/functions/_base.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/functions/_direction.scss b/themes/learn2/scss/nucleus/functions/_direction.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/functions/_range.scss b/themes/learn2/scss/nucleus/functions/_range.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/mixins/_base.scss b/themes/learn2/scss/nucleus/mixins/_base.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/mixins/_breakpoints.scss b/themes/learn2/scss/nucleus/mixins/_breakpoints.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/mixins/_utilities.scss b/themes/learn2/scss/nucleus/mixins/_utilities.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/particles/_align-text.scss b/themes/learn2/scss/nucleus/particles/_align-text.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/nucleus/particles/_visibility.scss b/themes/learn2/scss/nucleus/particles/_visibility.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme.scss b/themes/learn2/scss/theme.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_bullets.scss b/themes/learn2/scss/theme/_bullets.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_buttons.scss b/themes/learn2/scss/theme/_buttons.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_core.scss b/themes/learn2/scss/theme/_core.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_fonts.scss b/themes/learn2/scss/theme/_fonts.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_forms.scss b/themes/learn2/scss/theme/_forms.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_main.scss b/themes/learn2/scss/theme/_main.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_nav.scss b/themes/learn2/scss/theme/_nav.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_tables.scss b/themes/learn2/scss/theme/_tables.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/_typography.scss b/themes/learn2/scss/theme/_typography.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/modules/_base.scss b/themes/learn2/scss/theme/modules/_base.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/theme/modules/_buttons.scss b/themes/learn2/scss/theme/modules/_buttons.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss b/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/_bourbon.scss b/themes/learn2/scss/vendor/bourbon/_bourbon.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_button.scss b/themes/learn2/scss/vendor/bourbon/addons/_button.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss b/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss b/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss b/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss b/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss b/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss b/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_position.scss b/themes/learn2/scss/vendor/bourbon/addons/_position.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss b/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_rem.scss b/themes/learn2/scss/vendor/bourbon/addons/_rem.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss b/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_size.scss b/themes/learn2/scss/vendor/bourbon/addons/_size.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss b/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss b/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss b/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_animation.scss b/themes/learn2/scss/vendor/bourbon/css3/_animation.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss b/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss b/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss b/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_background.scss b/themes/learn2/scss/vendor/bourbon/css3/_background.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss b/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss b/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss b/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_calc.scss b/themes/learn2/scss/vendor/bourbon/css3/_calc.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_columns.scss b/themes/learn2/scss/vendor/bourbon/css3/_columns.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_filter.scss b/themes/learn2/scss/vendor/bourbon/css3/_filter.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss b/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss b/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss b/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss b/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss b/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss b/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss b/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss b/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss b/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss b/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss b/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_transform.scss b/themes/learn2/scss/vendor/bourbon/css3/_transform.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_transition.scss b/themes/learn2/scss/vendor/bourbon/css3/_transition.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss b/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_assign.scss b/themes/learn2/scss/vendor/bourbon/functions/_assign.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss b/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss b/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss b/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss b/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss b/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss b/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss b/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss b/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss b/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss b/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss b/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss b/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss b/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss b/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss b/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss b/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss b/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss b/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss b/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss b/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss b/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss old mode 100755 new mode 100644 diff --git a/themes/learn2/templates/partials/base.html.twig b/themes/learn2/templates/partials/base.html.twig index 05c6183..1257c7b 100644 --- a/themes/learn2/templates/partials/base.html.twig +++ b/themes/learn2/templates/partials/base.html.twig @@ -31,7 +31,8 @@ {% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %} {% do assets.addJs('theme://js/featherlight.min.js') %} {% do assets.addJs('theme://js/clipboard.min.js') %} - {% do assets.addJs('theme://js/jquery.scrollbar.min.js') %} +{# {% do assets.addJs('theme://js/jquery.scrollbar.min.js') %} #} + {% do assets.addJs('theme://js/jquery.scrollbar.js') %} {% do assets.addJs('theme://js/learn.js') %} {% endblock %}