diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less index be642f0fe..6180decc6 100644 --- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less +++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less @@ -85,9 +85,4 @@ display : inline-block; width : 100%; } - .blank { - height : 1em; - margin-top : 0; - & + * { margin-top : 0; } - } } \ No newline at end of file diff --git a/client/homebrew/pages/basePages/uiPage/uiPage.less b/client/homebrew/pages/basePages/uiPage/uiPage.less index 913c74a2e..49cb8311d 100644 --- a/client/homebrew/pages/basePages/uiPage/uiPage.less +++ b/client/homebrew/pages/basePages/uiPage/uiPage.less @@ -59,11 +59,6 @@ padding-left : 1.25em; list-style : square; } - .blank { - height : 1em; - margin-top : 0; - & + * { margin-top : 0; } - } } } } \ No newline at end of file diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 181cc55bd..70f4a54a7 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -387,7 +387,7 @@ const forcedParagraphBreaks = { } }, renderer(token) { - return `
`.repeat(token.length).concat('\n'); + return `Term 1
\n`); + expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Term 1
\nTerm 1
\n\nDefinition 1
`); + expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Term 1
\nDefinition 1
`); }); }); diff --git a/tests/markdown/hard-breaks.test.js b/tests/markdown/hard-breaks.test.js index 8af102716..fe646eac9 100644 --- a/tests/markdown/hard-breaks.test.js +++ b/tests/markdown/hard-breaks.test.js @@ -6,37 +6,37 @@ describe('Hard Breaks', ()=>{ test('Single Break', function() { const source = ':\n\n'; const rendered = Markdown.render(source).trim(); - expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(``); + expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Line 1
\n\nLine 2
`); + expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`Line 1
\nLine 2
`); }); test('Ignored inside a code block', function() { diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less index ba975e58a..33ba33ff6 100644 --- a/themes/V3/5ePHB/style.less +++ b/themes/V3/5ePHB/style.less @@ -17,7 +17,6 @@ .useSansSerif() { font-family : 'ScalySansRemake'; font-size : 0.318cm; - line-height : 1.2em; p,dl,ul,ol { line-height : 1.2em; } ul, ol { padding-left : 1em; } em { font-style : italic; } @@ -679,6 +678,7 @@ padding : 2.25cm 1.3cm 2cm 1.3cm; color : #FFFFFF; columns : 1; + line-height : 1.4em; &::after { display : none; } .columnWrapper { width : 7.6cm; } .backCover { @@ -690,7 +690,6 @@ background-repeat : no-repeat; background-size : contain; } - .blank { height : 1.4em; } h1 { margin-bottom : 0.3cm; font-family : 'NodestoCapsCondensed'; diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index 65eeee683..1a22db6a7 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -427,17 +427,6 @@ body { counter-reset : page-numbers 0; } } } -//***************************** -// * BLANK LINE -// *****************************/ -.page { - .blank { - height : 1em; - margin-top : 0; - & + * { margin-top : 0; } - } -} - //***************************** // * WIDE // *****************************/