From 0bffceca8e0788cf57f486b409ca7a4cdf96582e Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 3 Feb 2021 11:57:48 -0800 Subject: [PATCH] Fixed line-height on buttons. PHP warning removal. --- e107_handlers/sitelinks_class.php | 5 +++-- e107_themes/bootstrap3/css/bootstrap-dark.min.css | 2 +- e107_themes/bootstrap3/css/modern-dark.css | 2 +- e107_themes/bootstrap3/css/modern-light.css | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index 971fa6df4..5e0fab6c3 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -670,8 +670,9 @@ class e_navigation */ public static function guessMenuIcon($key) { - - list($mode, $action) = explode('/', $key); + $tmp = explode('/', $key); + $mode = varset($tmp[0]); + $action = varset($tmp[1]); switch($action) { diff --git a/e107_themes/bootstrap3/css/bootstrap-dark.min.css b/e107_themes/bootstrap3/css/bootstrap-dark.min.css index 3c291a2fb..b8bcef066 100644 --- a/e107_themes/bootstrap3/css/bootstrap-dark.min.css +++ b/e107_themes/bootstrap3/css/bootstrap-dark.min.css @@ -746,7 +746,7 @@ select[multiple].input-lg,textarea.input-lg{height:auto} .form-horizontal .form-group-lg .control-label{padding-top:15px;font-size:18px} .form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px} } -.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:8px 12px;font-size:16px;line-height:1.42857143;border-radius:4px;user-select:none} +.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:8px 12px;font-size:16px;line-height:22px;border-radius:4px;user-select:none} .btn,.plupload_button,button.button,input.button{touch-action:manipulation;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none} .btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .btn.focus,.btn:focus,.btn:hover{color:#fff;text-decoration:none} diff --git a/e107_themes/bootstrap3/css/modern-dark.css b/e107_themes/bootstrap3/css/modern-dark.css index 0a0371ca8..337d8fcde 100644 --- a/e107_themes/bootstrap3/css/modern-dark.css +++ b/e107_themes/bootstrap3/css/modern-dark.css @@ -760,7 +760,7 @@ select[multiple].input-lg,textarea.input-lg{height:auto} .form-horizontal .form-group-lg .control-label{padding-top:15px;font-size:18px} .form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px} } -.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:8px 12px;font-size:16px;line-height:1.42857143;border-radius:4px;user-select:none} +.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:8px 12px;font-size:16px;line-height:22px;border-radius:4px;user-select:none} .btn,.plupload_button,button.button,input.button{touch-action:manipulation;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none} .btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .btn.focus,.btn:focus,.btn:hover{color:#fff;text-decoration:none} diff --git a/e107_themes/bootstrap3/css/modern-light.css b/e107_themes/bootstrap3/css/modern-light.css index c84ce56a3..9d9777b9f 100644 --- a/e107_themes/bootstrap3/css/modern-light.css +++ b/e107_themes/bootstrap3/css/modern-light.css @@ -748,7 +748,7 @@ .form-horizontal .form-group-lg .control-label{padding-top:15px;font-size:18px} .form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px} } - .btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:8px 12px;font-size:16px;line-height:1.42857143;border-radius:4px;user-select:none} + .btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:8px 12px;font-size:16px;line-height:22px;border-radius:4px;user-select:none} .btn,.plupload_button,button.button,input.button{touch-action:manipulation;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none} .btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .btn.focus,.btn:focus,.btn:hover{color:#fff;text-decoration:none}