Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-06-06 12:17:12 +02:00
parent 70bc9facf2 84412d9796
commit 0e667b060e
5 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/tohtml.py
+1
View File
@@ -269,6 +269,7 @@ class ToHtml(Tokenizer):
theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}") theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}")
theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}") theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}")
theStyles.append(r"h1, h2, h3, h4 {page-break-after: avoid;}") theStyles.append(r"h1, h2, h3, h4 {page-break-after: avoid;}")
theStyles.append(r"a {color: rgb(66, 113, 174);}")
theStyles.append(r".title {font-size: 2.5em;}") theStyles.append(r".title {font-size: 2.5em;}")
theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}") theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}")
theStyles.append(r".break {text-align: left;}") theStyles.append(r".break {text-align: left;}")
nw/gui/build.py
+1 -2
View File
@@ -982,8 +982,7 @@ class GuiBuildNovelDocView(QTextBrowser):
if not theStyles: if not theStyles:
theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}") theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}")
theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}") theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}")
theStyles.append(r"a {color: rgb(137, 89, 168);}") theStyles.append(r"a {color: rgb(66, 113, 174);}")
theStyles.append(r"mark {background-color: rgb(240, 198, 116);}")
theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}") theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}")
self.qDocument.setDefaultStyleSheet("\n".join(theStyles)) self.qDocument.setDefaultStyleSheet("\n".join(theStyles))
tests/reference/build/1_LoremIpsum.htm
+1
View File
@@ -9,6 +9,7 @@ p {text-align: left;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
h1, h2, h3, h4 {page-break-after: avoid;} h1, h2, h3, h4 {page-break-after: avoid;}
a {color: rgb(66, 113, 174);}
.title {font-size: 2.5em;} .title {font-size: 2.5em;}
.tags {color: rgb(245, 135, 31); font-weight: bold;} .tags {color: rgb(245, 135, 31); font-weight: bold;}
.break {text-align: left;} .break {text-align: left;}
tests/reference/build/2_LoremIpsum.htm
+1
View File
@@ -9,6 +9,7 @@ p {text-align: justify;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
h1, h2, h3, h4 {page-break-after: avoid;} h1, h2, h3, h4 {page-break-after: avoid;}
a {color: rgb(66, 113, 174);}
.title {font-size: 2.5em;} .title {font-size: 2.5em;}
.tags {color: rgb(245, 135, 31); font-weight: bold;} .tags {color: rgb(245, 135, 31); font-weight: bold;}
.break {text-align: left;} .break {text-align: left;}
tests/reference/build/3_LoremIpsum.htm
+1
View File
@@ -9,6 +9,7 @@ p {text-align: justify;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
h1, h2, h3, h4 {page-break-after: avoid;} h1, h2, h3, h4 {page-break-after: avoid;}
a {color: rgb(66, 113, 174);}
.title {font-size: 2.5em;} .title {font-size: 2.5em;}
.tags {color: rgb(245, 135, 31); font-weight: bold;} .tags {color: rgb(245, 135, 31); font-weight: bold;}
.break {text-align: left;} .break {text-align: left;}