diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html index 9055bc3240..e5f96b0c22 100644 --- a/phpBB/adm/style/acp_posting_buttons.html +++ b/phpBB/adm/style/acp_posting_buttons.html @@ -8,14 +8,10 @@ // ]]> -{% include 'mentions_templates.html' %} - - - -
data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}" data-user-id="{S_USER_ID}"> +
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index b0f9141d5b..2a5eacfcd7 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1670,103 +1670,6 @@ fieldset.submit-buttons legend { } } -/* Mentions and mention dropdown ----------------------------------------- */ -.mention { - font-weight: bold; -} - -.mention-container { - text-align: left; - background-color: #ffffff; - border-radius: 2px; - box-shadow: - 0 3px 1px -2px rgba(0, 0, 0, 0.2), - 0 2px 2px 0 rgba(0, 0, 0, 0.14), - 0 1px 5px 0 rgba(0, 0, 0, 0.12); - position: absolute; - z-index: 999; - overflow: auto; /* placed here for list to scroll with arrow key press */ - max-height: 200px; - transition: all 0.2s ease; -} - -.rtl .mention-container { - text-align: right; -} - -.mention-list { - margin: 0; - padding: 0; - list-style-type: none; -} - -.mention-media { - color: #757575; - display: inline-flex; - flex-shrink: 0; - justify-content: center; - align-items: center; - margin-right: 8px; - margin-left: 0; -} - -.rtl .mention-media { - margin-right: 0; - margin-left: 16px; -} - -.mention-media-avatar { - width: 40px; - height: 40px; -} - -.mention-item { - font-size: 16px; - font-weight: 400; - line-height: 1.5; - letter-spacing: 0.04em; - border-bottom: 1px solid #dddddd; - color: #212121; - position: relative; - display: flex; - overflow: hidden; - justify-content: flex-start; - align-items: center; - padding: 8px; - cursor: pointer; -} - -.mention-item:hover, -.mention-item.is-active { - text-decoration: none; - background-color: #eeeeee; - color: #2d80d2; -} - -.mention-item:hover .mention-media-avatar, -.mention-item.is-active .mention-media-avatar { - color: #2d80d2; -} - -.mention-name, -.mention-rank { - display: block; -} - -.mention-name { - line-height: 1.25; - margin-right: 20px; /* needed to account for scrollbar bug on Firefox for Windows */ -} - -.mention-rank { - font-size: 14px; - font-weight: 400; - line-height: 1.2871; - letter-spacing: 0.04em; - color: #757575; -} - /* Input field styles ---------------------------------------- */ input.radio, diff --git a/phpBB/adm/style/mentions_templates.html b/phpBB/adm/style/mentions_templates.html deleted file mode 100644 index 23015b03e0..0000000000 --- a/phpBB/adm/style/mentions_templates.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index fda0811007..9a1d4b6a70 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -24,7 +24,7 @@ if (!defined('IN_PHPBB')) */ function adm_page_header($page_title) { - global $config, $user, $template, $auth; + global $config, $user, $template; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; global $phpbb_dispatcher, $phpbb_container; @@ -66,9 +66,6 @@ function adm_page_header($page_title) } } - /** @var \phpbb\controller\helper $controller_helper */ - $controller_helper = $phpbb_container->get('controller.helper'); - $phpbb_version_parts = explode('.', PHPBB_VERSION, 3); $phpbb_major = $phpbb_version_parts[0] . '.' . $phpbb_version_parts[1]; @@ -89,10 +86,6 @@ function adm_page_header($page_title) 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), - 'S_ALLOW_MENTIONS' => ($config['allow_mentions'] && $auth->acl_get('u_mention')) ? true : false, - 'S_MENTION_NAMES_LIMIT' => $config['mention_names_limit'], - 'U_MENTION_URL' => $controller_helper->route('phpbb_mention_controller'), - 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/", 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/",