mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

Updated jQuery3 CDN URL. Reduced some scrollbar widths in admin area. Prevent multiple og:title entries.

Browse Source
This commit is contained in:
Cameron 2021-09-23 10:41:51 -07:00
parent 9c2d7ec2d6
commit 94c5761893
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/application.php
View File

@ -4401,9 +4401,9 @@ class eResponse
if(!empty($attr)) if(!empty($attr))
{ {
if($name === 'keywords') // prevent multiple keyword tags. if($name === 'keywords' || $name === 'og:title') // prevent multiple keyword tags.
{ {
$this->_meta['keywords'] = $attr; $this->_meta[$name] = $attr;
} }
else else
{ {

8
e107_handlers/library_manager.php
View File

@ -296,13 +296,13 @@ class core_library
'name' => 'jQuery 3 (CDN)', 'name' => 'jQuery 3 (CDN)',
'vendor_url' => 'https://jquery.com/', 'vendor_url' => 'https://jquery.com/',
'version_arguments' => array( 'version_arguments' => array(
'file' => 'dist/jquery.min.js', 'file' => 'jquery.min.js',
'pattern' => '/jQuery\s+v(\d\.\d\.\d+)/', 'pattern' => '/jQuery\s+v(\d\.\d\.\d+)/',
'lines' => 5, 'lines' => 5,
), ),
'files' => array( 'files' => array(
'js' => array( 'js' => array(
'dist/jquery.min.js' => array( 'jquery.min.js' => array(
'zone' => 1, 'zone' => 1,
'type' => 'url', 'type' => 'url',
), ),
@ -322,8 +322,8 @@ class core_library
), ),
), ),
// Override library path to CDN. // Override library path to CDN.
'library_path' => 'https://cdn.jsdelivr.net/npm/', 'library_path' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery',
'path' => 'jquery@3.6.0', 'path' => '3.6.0',
'version' => '3.6.0', 'version' => '3.6.0',
); );

4
e107_themes/bootstrap3/admin_style.css
View File

@ -1127,7 +1127,7 @@ ul.col-selection > li a { padding: 3px 0 0 5px; }
ul.col-selection > li a label { padding-left:20px; display:block; /*line-height:25px;*/ } ul.col-selection > li a label { padding-left:20px; display:block; /*line-height:25px;*/ }
ul.col-selection ul.nav > li { padding:0 } ul.col-selection ul.nav > li { padding:0 }
ul.scroll-menu { max-height:350px; overflow:auto; } ul.scroll-menu { max-height:350px; overflow:auto; scrollbar-width: thin; }
ul.col-selection li.col-selection-list { padding: 5px; } ul.col-selection li.col-selection-list { padding: 5px; }
ul.col-selection input { opacity:0; } ul.col-selection input { opacity:0; }
ul.col-selection label.active:before { font-family:'Font Awesome 5 Free'; font-weight: 900; margin-left:-20px ; margin-right:6px ; content: '\f00c'; color: #51a351; position:relative; } ul.col-selection label.active:before { font-family:'Font Awesome 5 Free'; font-weight: 900; margin-left:-20px ; margin-right:6px ; content: '\f00c'; color: #51a351; position:relative; }
@ -1807,6 +1807,7 @@ body#admin-menus .admin-left-panel .admin-menu {
display: -webkit-flex; display: -webkit-flex;
flex: 1 100%; flex: 1 100%;
flex-flow: column nowrap; flex-flow: column nowrap;
scrollbar-width: thin;
} }
body#admin-menus #sc-admin-help { body#admin-menus #sc-admin-help {
overflow-y:hidden; overflow-y:hidden;
@ -1814,6 +1815,7 @@ body#admin-menus #sc-admin-help {
body#admin-menus #sc-admin-help .panel-body { body#admin-menus #sc-admin-help .panel-body {
overflow-y:scroll; overflow-y:scroll;
scrollbar-width: thin;
} }
.form-control[disabled] { opacity: 0.5; } .form-control[disabled] { opacity: 0.5; }