fix jquery.scrollbar

1.10.x
aragonc 9 years ago
parent 8cf9a90082
commit 5fde02e0e9
  1. 1
      composer.json
  2. 71
      main/inc/lib/javascript/jquery-scrollbar/jquery.scrollbar.css
  3. 2
      main/inc/lib/javascript/jquery-scrollbar/jquery.scrollbar.min.js
  4. 6
      main/inc/lib/template.lib.php

@ -79,6 +79,7 @@
"bower-asset/MathJax": "2.5.*",
"bower-asset/webcamjs": "1.0.*",
"bower-asset/cropper": "1.0.*",
"bower-asset/jquery.scrollbar": "0.2.*",
"clue/graph": "~0.9.0",
"graphp/graphviz": "~0.2.0",
"graphp/algorithms": "~0.8.0",

@ -14,7 +14,7 @@
margin: 0;
max-height: none;
max-width: none !important;
/* overflow: scroll !important; */
overflow: scroll !important;
padding: 0;
position: relative !important;
top: 0;
@ -69,14 +69,6 @@
width: 0;
}
/*************** SIMPLE INNER SCROLLBAR ***************/
.scrollbar-inner > .scroll-element,
@ -145,15 +137,6 @@
.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -12px; }
.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -12px; }
/*************** SIMPLE OUTER SCROLLBAR ***************/
.scrollbar-outer > .scroll-element,
@ -229,14 +212,6 @@
.scrollbar-outer > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -14px; }
/*************** SCROLLBAR MAC OS X ***************/
.scrollbar-macosx > .scroll-element,
@ -284,7 +259,6 @@
opacity: 0.7;
}
.scrollbar-macosx > .scroll-element.scroll-x {
bottom: 0px;
height: 0px;
@ -316,15 +290,6 @@
.scrollbar-macosx > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size { left: -11px; }
.scrollbar-macosx > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size { top: -11px; }
/*************** SCROLLBAR LIGHT ***************/
.scrollbar-light > .scroll-element,
@ -424,15 +389,6 @@
.scrollbar-light > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -19px; }
.scrollbar-light > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -19px; }
/*************** SCROLLBAR RAIL ***************/
.scrollbar-rail > .scroll-element,
@ -522,15 +478,6 @@
.scrollbar-rail > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -25px; }
.scrollbar-rail > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -25px; }
/*************** SCROLLBAR DYNAMIC ***************/
.scrollbar-dynamic > .scroll-element,
@ -682,15 +629,6 @@
width: 20px;
}
/*************** SCROLLBAR GOOGLE CHROME ***************/
.scrollbar-chrome > .scroll-element,
@ -782,10 +720,3 @@
.scrollbar-chrome > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track { left: -19px; }
.scrollbar-chrome > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track { top: -19px; }

@ -9,7 +9,7 @@
* Compressed by http://jscompress.com/
*
* @author Yuriy Khabarov aka Gromo
* @version 0.2.8
* @version 0.2.9
* @url https://github.com/gromo/jquery.scrollbar/
*
*/

@ -519,13 +519,13 @@ class Template
'mediaelement/build/mediaelementplayer.min.css',
'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.css',
'bootstrap/dist/css/bootstrap.min.css',
'jquery.scrollbar/jquery.scrollbar.css',
];
foreach ($bowerCSSFiles as $file) {
$css[] = api_get_path(WEB_PATH).'web/assets/'.$file;
}
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/bootstrap-select/css/bootstrap-select.min.css';
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/jquery-scrollbar/jquery.scrollbar.css';
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chosen/chosen.css';
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/tag/style.css';
@ -626,7 +626,6 @@ class Template
// JS files
$js_files = array(
'chosen/chosen.jquery.min.js',
'jquery-scrollbar/jquery.scrollbar.min.js',
'bootstrap-select/js/bootstrap-select.min.js',
$selectLink
);
@ -663,7 +662,8 @@ class Template
'jquery-timeago/jquery.timeago.js',
'mediaelement/build/mediaelement-and-player.min.js',
'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js',
'imagemap-resizer/js/imageMapResizer.min.js'
'imagemap-resizer/js/imageMapResizer.min.js',
'jquery.scrollbar/jquery.scrollbar.min.js'
];
if (api_get_setting('include_asciimathml_script') == 'true') {

Loading…
Cancel
Save