mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-04 06:40:44 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -107,7 +107,7 @@
|
||||
"nodebb-theme-harmony": "1.2.59",
|
||||
"nodebb-theme-lavender": "7.1.8",
|
||||
"nodebb-theme-peace": "2.2.5",
|
||||
"nodebb-theme-persona": "13.3.21",
|
||||
"nodebb-theme-persona": "13.3.22",
|
||||
"nodebb-widget-essentials": "7.0.16",
|
||||
"nodemailer": "6.9.14",
|
||||
"nprogress": "0.2.0",
|
||||
|
||||
@@ -20,3 +20,20 @@ html[data-dir="rtl"] {
|
||||
}
|
||||
}
|
||||
/*rtl:end:ignore*/
|
||||
|
||||
[component="post/content"], [component="chat/message/body"], [component="composer"] .preview {
|
||||
h1 { font-size: calc(1.125rem + 1vw); }
|
||||
h2 { font-size: calc(1.1rem + 0.8vw); }
|
||||
h3 { font-size: calc(1.075rem + 0.6vw); }
|
||||
h4 { font-size: calc(1.05rem + 0.3vw); }
|
||||
h5 { font-size: 1.125rem; }
|
||||
h6 { font-size: 1rem; }
|
||||
@include media-breakpoint-up(xl) {
|
||||
h1 { font-size: 1.625rem; }
|
||||
h2 { font-size: 1.5rem; }
|
||||
h3 { font-size: 1.375rem; }
|
||||
h4 { font-size: 1.250rem; }
|
||||
h5 { font-size: 1.125rem; }
|
||||
h6 { font-size: 1rem; }
|
||||
}
|
||||
}
|
||||
@@ -297,7 +297,7 @@ define('forum/topic', [
|
||||
destroyed = true;
|
||||
}
|
||||
$(window).one('action:ajaxify.start', destroyTooltip);
|
||||
$('[component="topic"]').on('mouseenter', '[component="post"] [component="post/content"] a, [component="topic/event"] a', async function () {
|
||||
$('[component="topic"]').on('mouseenter', '[component="post/parent"] a, [component="post/content"] a, [component="topic/event"] a', async function () {
|
||||
const link = $(this);
|
||||
destroyed = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user