diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js index f072b0359..060f4871f 100644 --- a/scripts/buildHomebrew.js +++ b/scripts/buildHomebrew.js @@ -79,6 +79,8 @@ fs.emptyDirSync('./build'); less.render(fs.readFileSync(src).toString(), { compress : !isDev }, function(e, output) { + console.log(src); + console.log(output); fs.outputFile(outputDirectory, output.css); }); })(`./build/themes/V3/${dir}/style.css`); diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index 67c01ac78..baeab089e 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -494,7 +494,14 @@ body { counter-reset : page-numbers 0; } &:nth-child(even) { .pageNumber { left : 30px; } } -<<<<<<< HEAD + + .resetCounting { + counter-set : page-numbers 1; + } + + &:not(:has(.skipCounting)) { + counter-increment : page-numbers; + } } //******************************* @@ -561,15 +568,5 @@ body { counter-reset : page-numbers 0; } .ol-noIndent ol li:not(:last-child) { margin-bottom: 0.5em; } -======= - .resetCounting { - counter-set : page-numbers 1; - } - - &:not(:has(.skipCounting)) { - counter-increment : page-numbers; - } - ->>>>>>> master } \ No newline at end of file