diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php index f430a2ae15c3de3441e240bfc02a90b79730335c..eef7dfa19edec509187d25c6abc8a0e213dc8009 100644 --- a/inc/Ui/Search.php +++ b/inc/Ui/Search.php @@ -584,18 +584,16 @@ class Search extends Ui if ($cnt !== 0) { $resultHeader[] = $cnt . ' ' . $lang['hits']; if ($num < FT_SNIPPET_NUMBER) { // create snippets for the first number of matches only - $snippet = '<dd>' . ft_snippet($id, $highlight) . '</dd>'; - $lastMod = '<span class="search_results__lastmod">' . $lang['lastmod'] . ' '; + $snippet = '<dd class="snippet">' . ft_snippet($id, $highlight) . '</dd>'; + $lastMod = $lang['lastmod'] . ' '; $lastMod .= '<time datetime="' . date_iso8601($mtime) . '" title="'.dformat($mtime).'">' . dformat($mtime, '%f') . '</time>'; - $lastMod .= '</span>'; } $num++; } - $metaLine = '<div class="search_results__metaLine">'; + $metaLine = '<dd class="lastmod">'; $metaLine .= $lastMod; - $metaLine .= '</div>'; - + $metaLine .= '</dd>'; $eventData = [ 'resultHeader' => $resultHeader, @@ -603,10 +601,8 @@ class Search extends Ui 'page' => $id, ]; trigger_event('SEARCH_RESULT_FULLPAGE', $eventData); - $html .= '<div class="search_fullpage_result">'; $html .= '<dt>' . implode(' ', $eventData['resultHeader']) . '</dt>'; $html .= implode('', $eventData['resultBody']); - $html .= '</div>'; } $html .= '</dl>'; diff --git a/lib/tpl/dokuwiki/css/_search.less b/lib/tpl/dokuwiki/css/_search.less index ad41ac58193453401f58965cacf7c007bbdc0909..f3c3fd8dcb30855a985c73adb18d1449eb10fe28 100644 --- a/lib/tpl/dokuwiki/css/_search.less +++ b/lib/tpl/dokuwiki/css/_search.less @@ -136,8 +136,13 @@ margin-bottom: .2em; } + /* last modified line */ + dd.lastmod { + margin: 0 0 .2em 0; + } + /* search snippet */ - dd { + dd.snippet { color: @ini_text_alt; background-color: inherit; margin: 0 0 1.2em 0;