diff --git a/.lefthook.yml b/.lefthook.yml index d5e4b64..b6692ee 100644 --- a/.lefthook.yml +++ b/.lefthook.yml @@ -9,5 +9,5 @@ pre-commit: commands: prettier: glob: '*.{css,dita*,json,md,xml,xsl,yml}' - run: prettier --write {staged_files} + run: npx prettier --write {staged_files} stage_fixed: true diff --git a/brite/cfg/fo/attrs/bootstrap.xsl b/brite/cfg/fo/attrs/bootstrap.xsl index b65df70..3e3e943 100644 --- a/brite/cfg/fo/attrs/bootstrap.xsl +++ b/brite/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #415b16 - #ffffff + #585c5e #000 #fff @@ -79,27 +79,26 @@ #000 - - #e9ecef - #fcfcfd - #495057 - #e9ecef - #000 - #e9ecef - #000 - - #000 - - - #000000 - #ced4da - #495057 - #000 - #fff - #000 - #fff - - #fff + + #f5a4c9 + + #fff + + #fff + #fdecf4 + #624150 + + #222 + + #000000 + #ced4da + #495057 + #000 + #fff + #000 + #fff + + #fff #ffffff diff --git a/brite/cfg/fo/attrs/prismjs.xsl b/brite/cfg/fo/attrs/prismjs.xsl index 8ce65cc..8cae6da 100644 --- a/brite/cfg/fo/attrs/prismjs.xsl +++ b/brite/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #666666 - - #adb5bd - #666a70 - #458c60 - #8c6d00 - #127382 - #a34343 - #127382 - #6c9824 + #212529 + #585c5e + #585c5e + #585c5e + #c53d80 + #57b17a + #519ed6 + #ce5555 + #d2803e + #ce5555 + #d6a700 + + normal diff --git a/brite/cfg/fo/xsl/custom.xsl b/brite/cfg/fo/xsl/custom.xsl index 90ef61f..e4161d8 100644 --- a/brite/cfg/fo/xsl/custom.xsl +++ b/brite/cfg/fo/xsl/custom.xsl @@ -13,7 +13,6 @@ - solid #000000 @@ -57,7 +56,6 @@ - diff --git a/cerulean/cfg/fo/attrs/bootstrap.xsl b/cerulean/cfg/fo/attrs/bootstrap.xsl index 8d9c167..877e062 100644 --- a/cerulean/cfg/fo/attrs/bootstrap.xsl +++ b/cerulean/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #000 - #e9ecef + #767c81 #000 #e9ecef @@ -79,30 +79,30 @@ #f4d2d3 #495057 - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #495057 - - - #343a40 - - #fff - #343a40 - #fff - #ced4da - #141619 - #343a40 - #fff + + #c760e7 + + #fff + + #fff + #f3dffa + #4f265c + + #222 + + #343a40 + + #fff + #343a40 + #fff + #ced4da + #141619 + #343a40 + #fff #ffffff #495057 #dee2e6 + #e9ecef 6pt diff --git a/cerulean/cfg/fo/attrs/prismjs.xsl b/cerulean/cfg/fo/attrs/prismjs.xsl index 1d01b76..eb039fb 100644 --- a/cerulean/cfg/fo/attrs/prismjs.xsl +++ b/cerulean/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #5d5e60 - - #adb5bd - #5a6167 - #679733 - #d05c00 - #1a71a1 - #c71c22 - #033c73 - #19aa80 + #495057 + #767b80 + #767b80 + #767b80 + #c33476 + #618d30 + #033261 + #a7181d + #d56a11 + #a7181d + #ba4800 + + normal diff --git a/cerulean/cfg/fo/xsl/custom.xsl b/cerulean/cfg/fo/xsl/custom.xsl index 3f14c53..e052abe 100644 --- a/cerulean/cfg/fo/xsl/custom.xsl +++ b/cerulean/cfg/fo/xsl/custom.xsl @@ -6,10 +6,9 @@ > - solid - + diff --git a/cosmo/cfg/fo/attrs/bootstrap.xsl b/cosmo/cfg/fo/attrs/bootstrap.xsl index 07263bc..3447729 100644 --- a/cosmo/cfg/fo/attrs/bootstrap.xsl +++ b/cosmo/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #373a3c - #373a3c + #696b6d #fff #373a3c @@ -79,27 +79,26 @@ #ffccd7 #373a3c - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #373a3c - - - #373a3c - - #fff - #373a3c - #fff - #ced4da - #141619 - #373a3c - #fff + + #ff40e3 + + #fff + + #fff + #ffd8f9 + #66195a + + #222 + + #373a3c + + #fff + #373a3c + #fff + #ced4da + #141619 + #373a3c + #fff #ffffff #373a3c #dee2e6 diff --git a/cosmo/cfg/fo/attrs/prismjs.xsl b/cosmo/cfg/fo/attrs/prismjs.xsl index 39e7c25..495f8a2 100644 --- a/cosmo/cfg/fo/attrs/prismjs.xsl +++ b/cosmo/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #161718 - - #adb5bd - #495057 - #2f8c12 - #c5670b - #1b599f - #b20028 - #6b3b83 - #189474 + #373a3c + #626466 + #626466 + #626466 + #c33476 + #359914 + #216cbf + #d60030 + #ca9142 + #d60030 + #d66214 + + normal diff --git a/cyborg/cfg/fo/attrs/bootstrap.xsl b/cyborg/cfg/fo/attrs/bootstrap.xsl index 567b713..b482951 100644 --- a/cyborg/cfg/fo/attrs/bootstrap.xsl +++ b/cyborg/cfg/fo/attrs/bootstrap.xsl @@ -19,8 +19,8 @@ #fff #2a9fd6 #fff - #2a9fd6 - #ffffff + #d4ecf7 + #114056 #2a9fd6 #fff @@ -28,10 +28,10 @@ #555555 #fff - #555 + #fff - #555555 - #ffffff + #dddddd + #222222 #555555 #fff @@ -41,8 +41,8 @@ #fff #77b300 #fff - #77b300 - #ffffff + #e4f0cc + #304800 #77b300 #fff @@ -52,8 +52,8 @@ #fff #93c #fff - #9933cc - #ffffff + #ebd6f5 + #3d1452 #9933cc #fff @@ -63,8 +63,8 @@ #fff #f80 #fff - #ff8800 - #ffffff + #ffe7cc + #663600 #ff8800 #fff @@ -74,36 +74,37 @@ #fff #c00 #fff - #cc0000 - #ffffff + #f5cccc + #520000 #cc0000 #fff - - #f8f9fa - - #fff - #222 - #fff - #fefefe - #141619 - #222 - #fff - - - #222222 - - #000 - #adafae - #000 - #ced4da - #141619 - #adafae - #000 + + #cc4fd6 + + #fff + + #fff + #261227 + #cc4fd6 + + #222 + + #222222 + + #000 + #adafae + #000 + #2b2b2b + #cccccc + #adafae + #000 #1a1a1a #ffffff #222222 #adafae + #060606 + #555555 6pt diff --git a/cyborg/cfg/fo/attrs/dita-ot.xsl b/cyborg/cfg/fo/attrs/dita-ot.xsl index 32c066e..a295967 100644 --- a/cyborg/cfg/fo/attrs/dita-ot.xsl +++ b/cyborg/cfg/fo/attrs/dita-ot.xsl @@ -160,9 +160,9 @@ - - - + + + @@ -190,8 +190,8 @@ - - - + + + diff --git a/cyborg/cfg/fo/attrs/prismjs.xsl b/cyborg/cfg/fo/attrs/prismjs.xsl index 3c2b031..fd0c2ad 100644 --- a/cyborg/cfg/fo/attrs/prismjs.xsl +++ b/cyborg/cfg/fo/attrs/prismjs.xsl @@ -6,16 +6,18 @@ > - #ffffff - #222222 - #888 - #ced4da - #92d928 - #e69e3e - #52b8e8 - #e66060 - #c192db - #6ed1b4 - 0pt + #adafae + #868887 + #868887 + #868887 + #ed65a3 + #92c233 + #55b2de + #d63333 + #fd9843 + #d63333 + #ffa033 + + normal diff --git a/cyborg/cfg/fo/xsl/tables.xsl b/cyborg/cfg/fo/xsl/tables.xsl index 4524aa1..d9c43af 100644 --- a/cyborg/cfg/fo/xsl/tables.xsl +++ b/cyborg/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -60,7 +80,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -130,9 +150,9 @@ - + - + diff --git a/darkly/cfg/fo/attrs/bootstrap.xsl b/darkly/cfg/fo/attrs/bootstrap.xsl index 90634a9..93ed016 100644 --- a/darkly/cfg/fo/attrs/bootstrap.xsl +++ b/darkly/cfg/fo/attrs/bootstrap.xsl @@ -9,7 +9,10 @@ sans-serif monospace - + #00bc8c @@ -19,8 +22,8 @@ #fff #375a7f #fff - #375a7f - #ffffff + #d7dee5 + #162433 #375a7f #fff @@ -28,10 +31,10 @@ #444444 #fff - #444 + #fff - #444444 - #ffffff + #dadada + #1b1b1b #444444 #fff @@ -41,8 +44,8 @@ #fff #00bc8c #fff - #00bc8c - #ffffff + #ccf2e8 + #004b38 #00bc8c #fff @@ -52,8 +55,8 @@ #fff #3498db #fff - #3498db - #ffffff + #d6eaf8 + #153d58 #3498db #fff @@ -63,8 +66,8 @@ #fff #f39c12 #fff - #f39c12 - #ffffff + #fdebd0 + #613e07 #f39c12 #fff @@ -74,35 +77,36 @@ #fff #e74c3c #fff - #e74c3c - #ffffff + #fadbd8 + #5c1e18 #e74c3c #fff - - #adb5bd - - #fff - #adb5bd - #fff - #fefefe - #141619 - #adb5bd - #fff - - - #303030 - - #fff - #303030 - #fff - #ced4da - #141619 - #303030 - #fff + + #e75380 + + #fff + + #fff + #422a31 + #ec7599 + + #222 + + #303030 + + #fff + #303030 + #fff + #3a3a3a + #e0e0e0 + #303030 + #fff #ffffff #222222 #dee2e6 + #222222 + #444444 6pt diff --git a/darkly/cfg/fo/attrs/prismjs.xsl b/darkly/cfg/fo/attrs/prismjs.xsl index 3f3f8c9..2e55c72 100644 --- a/darkly/cfg/fo/attrs/prismjs.xsl +++ b/darkly/cfg/fo/attrs/prismjs.xsl @@ -6,16 +6,18 @@ > - #dee2e6 - #222 - #adb5bd - #888 - #18a481 - #db741e - #6c8ab8 - #ce756e - #3d8bbd - #22b58b - 0pt + #ffffff + #c9c9c9 + #c9c9c9 + #c9c9c9 + #ed65a3 + #33c9a3 + #5f7b99 + #ec7063 + #fd9843 + #ec7063 + #f5b041 + + normal diff --git a/default/cfg/fo/attrs/custom.xsl b/default/cfg/fo/attrs/custom.xsl index eb16f49..4f775e5 100644 --- a/default/cfg/fo/attrs/custom.xsl +++ b/default/cfg/fo/attrs/custom.xsl @@ -5,22 +5,12 @@ version="2.0" > + + sans-serif monospace - - #2b2f32 - - #adb5bd - #6c757d - #198754 - #fd7e14 - #0d6efd - #dc3545 - #0dcaf0 - #20c997 - diff --git a/default/cfg/fo/attrs/prismjs.xsl b/default/cfg/fo/attrs/prismjs.xsl new file mode 100644 index 0000000..1df433a --- /dev/null +++ b/default/cfg/fo/attrs/prismjs.xsl @@ -0,0 +1,23 @@ + + + + + #2b2f32 + #5e6164 + #5e6164 + #5e6164 + #bd225f + #00954c + #0071d5 + #c1223a + #d65700 + #c1223a + #d6a900 + + normal + + diff --git a/flatly/cfg/fo/attrs/bootstrap.xsl b/flatly/cfg/fo/attrs/bootstrap.xsl index c1576ee..9971309 100644 --- a/flatly/cfg/fo/attrs/bootstrap.xsl +++ b/flatly/cfg/fo/attrs/bootstrap.xsl @@ -19,19 +19,19 @@ #fff #2c3e50 #fff - #2c3e50 - #ffffff + #dfe2e5 + #2c3e50 #2c3e50 #fff - #95a5a6 + #585c5e #fff #95a5a6 #fff - #95a5a6 - #ffffff + #eff2f2 + #616b6c #95a5a6 #fff @@ -41,8 +41,8 @@ #fff #18bc9c #fff - #18bc9c - #ffffff + #dcf5f0 + #107a65 #18bc9c #fff @@ -52,8 +52,8 @@ #fff #3498db #fff - #3498db - #ffffff + #e1f0fa + #246a99 #3498db #fff @@ -63,8 +63,8 @@ #fff #f39c12 #fff - #f39c12 - #ffffff + #fdf0db + #925e0b #f39c12 #fff @@ -74,32 +74,31 @@ #fff #e74c3c #fff - #e74c3c - #ffffff + #fbe4e2 + #b93d30 #e74c3c #fff - - #ecf0f1 - - #000 - #ecf0f1 - #000 - #fefefe - #141619 - #ecf0f1 - #000 - - - #7b8a8b - - #fff - #7b8a8b - #fff - #ced4da - #141619 - #7b8a8b - #fff + + #e745af + + #fff + + #fff + #fbe3f3 + #ad3483 + + #222 + + #7b8a8b + + #fff + #7b8a8b + #fff + #ebedee + #5c6868 + #7b8a8b + #fff #ffffff #212529 #dee2e6 diff --git a/flatly/cfg/fo/attrs/prismjs.xsl b/flatly/cfg/fo/attrs/prismjs.xsl index 8024b40..cdf73d0 100644 --- a/flatly/cfg/fo/attrs/prismjs.xsl +++ b/flatly/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #dee2e6 - #212529 - #b4bcc2 - #95a5a6 - #26a48a - #db822a - #5d86a9 - #d86c62 - #458fba - #2bb189 + #212529 + #54585b + #54585b + #54585b + #c33476 + #149e83 + #253443 + #c24032 + #d56a11 + #c24032 + #cc830f + + normal diff --git a/journal/cfg/fo/attrs/bootstrap.xsl b/journal/cfg/fo/attrs/bootstrap.xsl index 50e0392..6077a9a 100644 --- a/journal/cfg/fo/attrs/bootstrap.xsl +++ b/journal/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #000 - #aaaaaa + #595959 #fff #aaa @@ -79,27 +79,26 @@ #fde4cc #222 - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #222 - - - #222222 - - #fff - #222 - #fff - #ced4da - #141619 - #222 - #fff + + #f5719b + + #fff + + #fff + #fde2eb + #622d3e + + #222 + + #222222 + + #fff + #222 + #fff + #ced4da + #141619 + #222 + #fff #ffffff #222222 #dee2e6 diff --git a/journal/cfg/fo/attrs/prismjs.xsl b/journal/cfg/fo/attrs/prismjs.xsl index dfb21ed..41267e2 100644 --- a/journal/cfg/fo/attrs/prismjs.xsl +++ b/journal/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #444444 - - #adb5bd - #777 - #1b8e3d - #dc6e05 - #b04340 - #a69a19 - #336699 - #1c9c7f + #212529 + #55585b + #55585b + #55585b + #c33476 + #1d9640 + #c55754 + #ce6600 + #d56a11 + #ce6600 + #cec11f + + normal diff --git a/litera/cfg/fo/attrs/bootstrap.xsl b/litera/cfg/fo/attrs/bootstrap.xsl index c75c94b..7593a0e 100644 --- a/litera/cfg/fo/attrs/bootstrap.xsl +++ b/litera/cfg/fo/attrs/bootstrap.xsl @@ -19,19 +19,19 @@ #fff #4582ec #fff - #4582ec - #ffffff + #e3ecfc + #3768bd #4582ec #fff - #adb5bd + #676b70 #fff #adb5bd #fff - #adb5bd - #ffffff + #e8e9ea + #62666a #adb5bd #fff @@ -41,8 +41,8 @@ #fff #02b875 #fff - #02b875 - #ffffff + #d9f4ea + #01784c #02b875 #fff @@ -52,8 +52,8 @@ #fff #17a2b8 #fff - #17a2b8 - #ffffff + #dcf1f4 + #107181 #17a2b8 #fff @@ -63,8 +63,8 @@ #fff #f0ad4e #fff - #f0ad4e - #ffffff + #fdf3e4 + #90682f #f0ad4e #fff @@ -74,32 +74,31 @@ #fff #d9534f #fff - #d9534f - #ffffff + #f9e5e5 + #ae423f #d9534f #fff - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #000 - - - #343a40 - - #fff - #343a40 - #fff - #343a40 - #ffffff - #343a40 - #fff + + #d96aec + + #fff + + #fff + #f9e9fc + #984aa5 + + #222 + + #343a40 + + #fff + #343a40 + #fff + #e1e1e2 + #343a40 + #343a40 + #fff #ffffff #343a40 #dddddd diff --git a/litera/cfg/fo/attrs/prismjs.xsl b/litera/cfg/fo/attrs/prismjs.xsl index 5c3add4..814c952 100644 --- a/litera/cfg/fo/attrs/prismjs.xsl +++ b/litera/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #2f3133 - - #adb5bd - #585e63 - #059f65 - #db882c - #3972d4 - #be4541 - #148ea2 - #18af82 + #343a40 + #64686d + #64686d + #64686d + #c33476 + #029b62 + #3a6dc6 + #b64642 + #d56a11 + #b64642 + #ca9142 + + normal diff --git a/lumen/cfg/fo/attrs/bootstrap.xsl b/lumen/cfg/fo/attrs/bootstrap.xsl index d16e5ee..1aa6c84 100644 --- a/lumen/cfg/fo/attrs/bootstrap.xsl +++ b/lumen/cfg/fo/attrs/bootstrap.xsl @@ -19,14 +19,14 @@ #fff #158cba #fff - #158cba + #d0e8f1 #137ea7 - #ffffff + #08384a #158cba #fff - #f0f0f0 + #595959 #000 #f0f0f0 @@ -43,9 +43,9 @@ #fff #28b62c #fff - #28b62c + #d4f0d5 #24a428 - #ffffff + #104912 #28b62c #fff @@ -55,9 +55,9 @@ #fff #75caeb #fff - #75caeb + #e3f4fb #69b6d4 - #ffffff + #2f515e #75caeb #fff @@ -67,9 +67,9 @@ #fff #ff851b #fff - #ff851b + #ffe7d1 #e67818 - #ffffff + #66350b #ff851b #fff @@ -79,35 +79,34 @@ #fff #ff4136 #fff - #ff4136 + #ffd9d7 #e63b31 - #ffffff + #661a16 #ff4136 #fff - - #f6f6f6 - - #000 - #f6f6f6 - #000 - #f6f6f6 - #dddddd - #222222 - #f6f6f6 - #222 - - - #555555 - - #fff - #555 - #fff - #555555 - #4d4d4d - #ffffff - #555 - #fff + + #ff66ba + + #fff + + #fff + #ffe0f1 + #e65ca7 + #66284a + + #222 + + #555555 + + #fff + #555 + #fff + #dddddd + #4d4d4d + #222222 + #555 + #fff #ffffff #222222 #dee2e6 diff --git a/lumen/cfg/fo/attrs/prismjs.xsl b/lumen/cfg/fo/attrs/prismjs.xsl index 502377e..2c3e7cd 100644 --- a/lumen/cfg/fo/attrs/prismjs.xsl +++ b/lumen/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #606060 - - #adb5bd - #777777 - #19a143 - #e17312 - #1378b6 - #e53a37 - #1378b6 - #18af82 + #212529 + #585b5e + #585b5e + #585b5e + #c33476 + #229925 + #12769c + #d6372d + #d56a11 + #d6372d + #d67017 + + normal diff --git a/lumen/cfg/fo/xsl/custom.xsl b/lumen/cfg/fo/xsl/custom.xsl index c36aa99..71cea6a 100644 --- a/lumen/cfg/fo/xsl/custom.xsl +++ b/lumen/cfg/fo/xsl/custom.xsl @@ -7,13 +7,12 @@ - solid - 0pt + 1pt 0.75pt 3pt 0.75pt - + @@ -39,8 +38,9 @@ - - + + info warning danger - light - dark + accent + inverse secondary @@ -83,8 +83,8 @@ - - + + @@ -109,8 +109,7 @@ - - + diff --git a/lux/cfg/fo/attrs/bootstrap.xsl b/lux/cfg/fo/attrs/bootstrap.xsl index baf263d..d569bed 100644 --- a/lux/cfg/fo/attrs/bootstrap.xsl +++ b/lux/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #55595c - #ffffff + #808285 #000 #fff @@ -79,27 +79,26 @@ #f7dddc #55595c - - #f0f1f2 - - #000 - #f0f1f2 - #000 - #fefefe - #141619 - #f0f1f2 - #55595c - - - #343a40 - - #fff - #343a40 - #fff - #ced4da - #141619 - #343a40 - #fff + + #d936e5 + + #fff + + #fff + #f7d6f9 + #56155b + + #222 + + #343a40 + + #fff + #343a40 + #fff + #ced4da + #141619 + #343a40 + #fff #ffffff #55595c #e0e1e2 diff --git a/lux/cfg/fo/attrs/prismjs.xsl b/lux/cfg/fo/attrs/prismjs.xsl index bb9da77..6d8c663 100644 --- a/lux/cfg/fo/attrs/prismjs.xsl +++ b/lux/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #666666 - - #adb5bd - #777b7e - #3e9e60 - #d7882c - #007bff - #b74744 - #1a80ab - #189474 + #55595c + #808285 + #808285 + #808285 + #c33476 + #3fa061 + #0067d6 + #b64642 + #d56a11 + #b64642 + #ca9142 + + normal diff --git a/lux/cfg/fo/xsl/tables.xsl b/lux/cfg/fo/xsl/tables.xsl index 23b7319..21e140c 100644 --- a/lux/cfg/fo/xsl/tables.xsl +++ b/lux/cfg/fo/xsl/tables.xsl @@ -41,11 +41,11 @@ - + - - + + - + - + @@ -125,7 +125,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -197,9 +197,9 @@ 2pt - + - + - + - + diff --git a/materia/cfg/fo/attrs/bootstrap.xsl b/materia/cfg/fo/attrs/bootstrap.xsl index 83a2533..1a13531 100644 --- a/materia/cfg/fo/attrs/bootstrap.xsl +++ b/materia/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #444 - #ffffff + #737373 #000 #fff @@ -79,31 +79,31 @@ #fad2d3 #444 - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #444 - - - #222222 - - #fff - #222 - #fff - #ced4da - #141619 - #222 - #fff + + #e559f3 + + #fff + + #fff + #f9ddfc + #5b2361 + + #222 + + #222222 + + #fff + #222 + #fff + #ced4da + #141619 + #222 + #fff #ffffff #444444 #dee2e6 - 2pt + #ffffff + 6pt 30pt diff --git a/materia/cfg/fo/attrs/prismjs.xsl b/materia/cfg/fo/attrs/prismjs.xsl index 78609d6..10a7547 100644 --- a/materia/cfg/fo/attrs/prismjs.xsl +++ b/materia/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #666666 - - #bbb - #666 - #3f9142 - #e27d05 - #1b7bc8 - #c1171d - #9c27b0 - #189474 + #444444 + #737373 + #737373 + #737373 + #c33476 + #409343 + #1c7ecc + #c0181d + #d56a11 + #c0181d + #d68000 + + normal diff --git a/materia/cfg/fo/xsl/custom.xsl b/materia/cfg/fo/xsl/custom.xsl index 3f14c53..e052abe 100644 --- a/materia/cfg/fo/xsl/custom.xsl +++ b/materia/cfg/fo/xsl/custom.xsl @@ -6,10 +6,9 @@ > - solid - + diff --git a/minty/cfg/fo/attrs/bootstrap.xsl b/minty/cfg/fo/attrs/bootstrap.xsl index a69c146..6d29ced 100644 --- a/minty/cfg/fo/attrs/bootstrap.xsl +++ b/minty/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #fff - #f3969a + #a6a6a6 #fff #f3969a @@ -79,27 +79,26 @@ #ff7851 #fff - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #888 - - - #343a40 - - #fff - #343a40 - #fff - #ced4da - #141619 - #343a40 - #fff + + #ff9dad + + #fff + + #fff + #ffebee + #663e45 + + #222 + + #343a40 + + #fff + #343a40 + #fff + #ced4da + #141619 + #343a40 + #fff #ffffff #888888 #eceeef diff --git a/minty/cfg/fo/attrs/dita-ot.xsl b/minty/cfg/fo/attrs/dita-ot.xsl index 8a463b3..c99c8ad 100644 --- a/minty/cfg/fo/attrs/dita-ot.xsl +++ b/minty/cfg/fo/attrs/dita-ot.xsl @@ -52,9 +52,9 @@ - - - + + + @@ -82,8 +82,8 @@ - - - + + + diff --git a/minty/cfg/fo/attrs/prismjs.xsl b/minty/cfg/fo/attrs/prismjs.xsl index 2c39caf..c135e87 100644 --- a/minty/cfg/fo/attrs/prismjs.xsl +++ b/minty/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #613c3e - - #adb5bd - #888 - #43a07b - #e49a38 - #3689d0 - #de544c - #58abc7 - #48ab8d + #888888 + #a5a2a2 + #a5a2a2 + #a5a2a2 + #c33476 + #48ab84 + #0067d6 + #d66544 + #d56a11 + #d66544 + #d6ad57 + + normal diff --git a/minty/cfg/fo/xsl/tables.xsl b/minty/cfg/fo/xsl/tables.xsl index 3b34103..b0ad668 100644 --- a/minty/cfg/fo/xsl/tables.xsl +++ b/minty/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -60,7 +80,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -130,9 +150,9 @@ - + - + diff --git a/morph/cfg/fo/attrs/bootstrap.xsl b/morph/cfg/fo/attrs/bootstrap.xsl index 1255611..487356d 100644 --- a/morph/cfg/fo/attrs/bootstrap.xsl +++ b/morph/cfg/fo/attrs/bootstrap.xsl @@ -19,19 +19,19 @@ #fff #378dfc #fff - #378dfc - #ffffff + #e1eeff + #296abd #d7e8fe #7b8ab8 - #d9e3f1 + #9ca7ca #000 #d9e3f1 #000 #d9e3f1 - #ffffff + #212529 #f7f9fc #7b8ab8 @@ -41,8 +41,8 @@ #fff #43cc29 #fff - #43cc29 - #ffffff + #e3f7df + #287a19 #d9f5d4 #7b8ab8 @@ -52,8 +52,8 @@ #fff #5b62f4 #fff - #5b62f4 - #ffffff + #e6e7fd + #5258dc #dee0fd #7b8ab8 @@ -63,8 +63,8 @@ #fff #ffc107 #fff - #ffc107 - #ffffff + #fff6da + #8c6a04 #fff3cd #7b8ab8 @@ -74,32 +74,31 @@ #fff #e52527 #fff - #e52527 - #ffffff + #fbdedf + #c31f21 #fad3d4 #7b8ab8 - - #f0f5fa - - #000 - #f0f5fa - #000 - #fefefe - #141619 - #f0f5fa - #7b8ab8 - - - #212529 - - #fff - #212529 - #fff - #ced4da - #141619 - #212529 - #fff + + #e559fc + + #fff + + #fff + #fbe6ff + #a03eb0 + + #222 + + #212529 + + #fff + #212529 + #fff + #dededf + #212529 + #212529 + #fff #c9d7e9 #ffffff #7b8ab8 diff --git a/morph/cfg/fo/attrs/dita-ot.xsl b/morph/cfg/fo/attrs/dita-ot.xsl index b46c4be..bec3097 100644 --- a/morph/cfg/fo/attrs/dita-ot.xsl +++ b/morph/cfg/fo/attrs/dita-ot.xsl @@ -160,8 +160,8 @@ - - + + #000000 @@ -190,9 +190,9 @@ - - - + + + diff --git a/morph/cfg/fo/attrs/prismjs.xsl b/morph/cfg/fo/attrs/prismjs.xsl index ef2b9ba..f3a4f3d 100644 --- a/morph/cfg/fo/attrs/prismjs.xsl +++ b/morph/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #575b60 - - #adb5bd - #626a75 - #36a421 - #e2720d - #2c73cd - #c1171d - #0caccb - #20c997 + #7b8ab8 + #92a0c6 + #92a0c6 + #92a0c6 + #b42b6f + #38ab22 + #2e76d4 + #c01f21 + #d56a11 + #c01f21 + #d6a206 + + normal diff --git a/morph/cfg/fo/xsl/tables.xsl b/morph/cfg/fo/xsl/tables.xsl index 41f1e51..1644663 100644 --- a/morph/cfg/fo/xsl/tables.xsl +++ b/morph/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -61,7 +81,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -131,9 +151,9 @@ - + - + diff --git a/none/cfg/fo/attrs/custom.xsl b/none/cfg/fo/attrs/custom.xsl index 3927369..65b6860 100644 --- a/none/cfg/fo/attrs/custom.xsl +++ b/none/cfg/fo/attrs/custom.xsl @@ -9,18 +9,6 @@ sans-serif monospace - - #000000 - - #999999 - #6c757d - #ee9900 - #f08d49 - #669900 - #e2777a - #67cdcc - #0077aa - diff --git a/none/cfg/fo/font-mappings.xml b/none/cfg/fo/font-mappings.xml new file mode 100644 index 0000000..8e7373c --- /dev/null +++ b/none/cfg/fo/font-mappings.xml @@ -0,0 +1,30 @@ + + + + Serif + Sans + Monospaced + Sans + Monospaced + + + + Roboto, Noto Sans, Liberation Sans, Arial Unicode MS, Tahoma, Batang, SimSun + + + + + + Roboto, Arial Unicode MS, Tahoma, Batang, SimSun + + + + + + Liberation Mono, Arial Unicode MS, Tahoma, Batang, SimSun + + + + diff --git a/pulse/cfg/fo/attrs/bootstrap.xsl b/pulse/cfg/fo/attrs/bootstrap.xsl index 179c540..c16c155 100644 --- a/pulse/cfg/fo/attrs/bootstrap.xsl +++ b/pulse/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #444 - #a991d4 + #737373 #fff #a991d4 @@ -79,30 +79,30 @@ #fed7d7 #444 - - #f9f8fc - - #000 - #f9f8fc - #000 - #fefefe - #141619 - #f9f8fc - #444 - - - #17141f - - #fff - #17141f - #fff - #ced4da - #141619 - #17141f - #fff + + #fc3596 + + #fff + + #fff + #fed6ea + #64153c + + #222 + + #17141f + + #fff + #17141f + #fff + #ced4da + #141619 + #17141f + #fff #ffffff #444444 #ededed + #a991d4 0 diff --git a/pulse/cfg/fo/attrs/prismjs.xsl b/pulse/cfg/fo/attrs/prismjs.xsl index 2f0beb8..0e3e643 100644 --- a/pulse/cfg/fo/attrs/prismjs.xsl +++ b/pulse/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #443a55 - - #adb5bd - #666a70 - #119745 - #d98213 - #2c4ea5 - #dd3530 - #008dc8 - #189474 + #444444 + #706e71 + #706e71 + #706e71 + #c33476 + #109b47 + #0067d6 + #d43030 + #d56a11 + #d43030 + #c98918 + + normal diff --git a/pulse/cfg/fo/xsl/custom.xsl b/pulse/cfg/fo/xsl/custom.xsl index 3f14c53..e052abe 100644 --- a/pulse/cfg/fo/xsl/custom.xsl +++ b/pulse/cfg/fo/xsl/custom.xsl @@ -6,10 +6,9 @@ > - solid - + diff --git a/quartz/cfg/fo/attrs/bootstrap.xsl b/quartz/cfg/fo/attrs/bootstrap.xsl index d3b7d4a..6d7425c 100644 --- a/quartz/cfg/fo/attrs/bootstrap.xsl +++ b/quartz/cfg/fo/attrs/bootstrap.xsl @@ -19,19 +19,19 @@ #fff #e83283 #fff - #fad6e6 - #5d1434 + #7567bd + #ffffff #e83283 #fff - #dddddd + #514f57 #000 rgba(255, 255, 255, 0.4) #000 - #f8f8f8 - #666666 + #686ebc + #ffffff rgba(255, 255, 255, 0.4) #fff @@ -41,8 +41,8 @@ #fff #41d7a7 #fff - #d9f7ed - #1a5643 + #6478c0 + #ffffff #41d7a7 #fff @@ -52,8 +52,8 @@ #fff #39cbfb #fff - #d7f5fe - #175164 + #6376c9 + #ffffff #39cbfb #fff @@ -63,8 +63,8 @@ #fff #ffc107 #fff - #fff3cd - #664d03 + #7775b0 + #ffffff #ffc107 #fff @@ -74,38 +74,38 @@ #fff #fd7e14 #fff - #ffe5d0 - #653208 + #776fb2 + #ffffff #fd7e14 #fff - - #e9e9e8 - - #000 - #e9e9e8 - #000 - #fefefe - #141619 - #e9e9e8 - #000 - - - #212529 - - #fff - #212529 - #fff - #ced4da - #141619 - #212529 - #fff + + #fd5883 + + #fff + + #fff + #776bbd + #ffffff + + #222 + + #212529 + + #fff + #212529 + #fff + #212529 + #ffffff + #212529 + #fff #5a5fac #ffffff #17141f rgba(255, 255, 255, 0.2) - - 4pt + #686dc3 + #6c757d + 6pt 30pt diff --git a/quartz/cfg/fo/attrs/dita-ot.xsl b/quartz/cfg/fo/attrs/dita-ot.xsl index 3bf43f5..6138271 100644 --- a/quartz/cfg/fo/attrs/dita-ot.xsl +++ b/quartz/cfg/fo/attrs/dita-ot.xsl @@ -161,9 +161,9 @@ - - - + + + @@ -191,9 +191,9 @@ - - - + + + diff --git a/quartz/cfg/fo/attrs/prismjs.xsl b/quartz/cfg/fo/attrs/prismjs.xsl index 25ec128..b12e292 100644 --- a/quartz/cfg/fo/attrs/prismjs.xsl +++ b/quartz/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #242424 - - #adb5bd - #6c757d - #257a60 - #007fb4 - #3a8fd9 - #e83283 - #39cbfb - #a6245d + #ffffff + #dadbed + #dadbed + #dadbed + #ed5b9c + #67dfb9 + #61a5e1 + #fd5d8c + #fd9843 + #fd5d8c + #ffcd39 + + normal diff --git a/quartz/cfg/fo/xsl/custom.xsl b/quartz/cfg/fo/xsl/custom.xsl index 0ff7a04..5df7944 100644 --- a/quartz/cfg/fo/xsl/custom.xsl +++ b/quartz/cfg/fo/xsl/custom.xsl @@ -9,10 +9,9 @@ - solid - + diff --git a/quartz/cfg/fo/xsl/tables.xsl b/quartz/cfg/fo/xsl/tables.xsl index 82ce632..a2c8792 100644 --- a/quartz/cfg/fo/xsl/tables.xsl +++ b/quartz/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -61,7 +81,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -131,9 +151,9 @@ - + - + diff --git a/sandstone/cfg/fo/attrs/bootstrap.xsl b/sandstone/cfg/fo/attrs/bootstrap.xsl index 338066e..eab0e9c 100644 --- a/sandstone/cfg/fo/attrs/bootstrap.xsl +++ b/sandstone/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #3e3f3a - #8e8c84 + #6e6f6b #fff #8e8c84 @@ -79,30 +79,30 @@ #f7dddc #3e3f3a - - #f8f5f0 - - #000 - #f8f5f0 - #000 - #fefefe - #141619 - #f8f5f0 - #3e3f3a - - - #3e3f3a - - #fff - #3e3f3a - #fff - #ced4da - #141619 - #3e3f3a - #fff + + #d95888 + + #fff + + #fff + #f7dde7 + #562336 + + #222 + + #3e3f3a + + #fff + #3e3f3a + #fff + #ced4da + #141619 + #3e3f3a + #fff #ffffff #3e3f3a #dfd7ca + #8e8c84 6pt diff --git a/sandstone/cfg/fo/attrs/prismjs.xsl b/sandstone/cfg/fo/attrs/prismjs.xsl index 6e65cbc..bb1b32b 100644 --- a/sandstone/cfg/fo/attrs/prismjs.xsl +++ b/sandstone/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #393835 - - #98978b - #62615c - #506b29 - #c4620a - #325d88 - #953a37 - #165d7a - #189474 + #3e3f3a + #6a6b67 + #6a6b67 + #6a6b67 + #c33476 + #7ba53f + #2a4e72 + #b64642 + #cd6832 + #b64642 + #d6a206 + + normal diff --git a/sandstone/cfg/fo/xsl/custom.xsl b/sandstone/cfg/fo/xsl/custom.xsl index 3f14c53..e052abe 100644 --- a/sandstone/cfg/fo/xsl/custom.xsl +++ b/sandstone/cfg/fo/xsl/custom.xsl @@ -6,10 +6,9 @@ > - solid - + diff --git a/simplex/cfg/fo/attrs/bootstrap.xsl b/simplex/cfg/fo/attrs/bootstrap.xsl index fc9b867..f81c734 100644 --- a/simplex/cfg/fo/attrs/bootstrap.xsl +++ b/simplex/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #212529 - #ffffff + #585c5e #000 #fff @@ -79,31 +79,30 @@ #ebdaec #212529 - - #ffffff - - #000 - #fff - #000 - #fefefe - #141619 - #fff - #212529 - - - #373a3c - - #fff - #373a3c - #fff - #ced4da - #141619 - #373a3c - #fff + + #9b35f0 + + #fff + + #fff + #ebd6fc + #3e1560 + + #222 + + #373a3c + + #fff + #373a3c + #fff + #ced4da + #141619 + #373a3c + #fff #fcfcfc #212529 #ccc - 4pt + 6pt 30pt diff --git a/simplex/cfg/fo/attrs/dita-ot.xsl b/simplex/cfg/fo/attrs/dita-ot.xsl index b407c27..a70b198 100644 --- a/simplex/cfg/fo/attrs/dita-ot.xsl +++ b/simplex/cfg/fo/attrs/dita-ot.xsl @@ -52,9 +52,9 @@ - - - + + + @@ -82,8 +82,8 @@ - - - + + + diff --git a/simplex/cfg/fo/attrs/prismjs.xsl b/simplex/cfg/fo/attrs/prismjs.xsl index 33e9738..9137862 100644 --- a/simplex/cfg/fo/attrs/prismjs.xsl +++ b/simplex/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #666666 - - #adb5bd - #777 - #469408 - #905714 - #007bff - #d9230f - #029acf - #189474 + #212529 + #585b5e + #585b5e + #585b5e + #c33476 + #3b7c07 + #0067d6 + #b61d0d + #b66e1a + #b61d0d + #d6a206 + + normal diff --git a/simplex/cfg/fo/xsl/tables.xsl b/simplex/cfg/fo/xsl/tables.xsl index 34457d6..fab5d46 100644 --- a/simplex/cfg/fo/xsl/tables.xsl +++ b/simplex/cfg/fo/xsl/tables.xsl @@ -15,7 +15,7 @@ @@ -34,9 +34,9 @@ - + - + @@ -81,7 +81,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -144,9 +144,9 @@ - + - + diff --git a/sketchy/cfg/fo/attrs/bootstrap.xsl b/sketchy/cfg/fo/attrs/bootstrap.xsl index e94b632..ea4b9f4 100644 --- a/sketchy/cfg/fo/attrs/bootstrap.xsl +++ b/sketchy/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #212529 - #555555 + #585c5e #fff #555 @@ -79,27 +79,26 @@ #f8d7da #212529 - - #ffffff - - #000 - #fff - #000 - #fefefe - #141619 - #fff - #212529 - - - #555555 - - #fff - #555 - #fff - #ced4da - #141619 - #555 - #fff + + #dc34cc + + #fff + + #fff + #f8d6f4 + #581451 + + #222 + + #555555 + + #fff + #555 + #fff + #ced4da + #141619 + #555 + #fff #ffffff #212529 #333333 diff --git a/sketchy/cfg/fo/attrs/prismjs.xsl b/sketchy/cfg/fo/attrs/prismjs.xsl index 7b444cf..e9aec26 100644 --- a/sketchy/cfg/fo/attrs/prismjs.xsl +++ b/sketchy/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #222222 - - #aaa - #666a70 - #1e7832 - #c4620a - #0050a6 - #dc3545 - #107282 - #189474 + #212529 + #525558 + #525558 + #525558 + #c33476 + #228c3a + #0067d6 + #b92d3a + #d56a11 + #b92d3a + #d6a206 + + normal diff --git a/sketchy/cfg/fo/xsl/custom.xsl b/sketchy/cfg/fo/xsl/custom.xsl index 69d4f41..0ba4ead 100644 --- a/sketchy/cfg/fo/xsl/custom.xsl +++ b/sketchy/cfg/fo/xsl/custom.xsl @@ -7,7 +7,6 @@ > - diff --git a/slate/cfg/fo/attrs/bootstrap.xsl b/slate/cfg/fo/attrs/bootstrap.xsl index c0f0f4a..51026c6 100644 --- a/slate/cfg/fo/attrs/bootstrap.xsl +++ b/slate/cfg/fo/attrs/bootstrap.xsl @@ -19,8 +19,8 @@ #fff #3a3f44 #fff - #3a3f44 - #ffffff + #515960 + #17191b #3a3f44 #fff @@ -28,10 +28,10 @@ #7a8288 #fff - #7a8288 + #fff - #7a8288 - #ffffff + #e4e6e7 + #313436 #7a8288 #fff @@ -41,8 +41,8 @@ #fff #62c462 #fff - #62c462 - #ffffff + #e0f3e0 + #274e27 #62c462 #fff @@ -52,8 +52,8 @@ #fff #5bc0de #fff - #5bc0de - #ffffff + #def2f8 + #244d59 #5bc0de #fff @@ -63,8 +63,8 @@ #fff #f89406 #fff - #f89406 - #ffffff + #feeacd + #633b02 #f89406 #fff @@ -74,36 +74,37 @@ #fff #ee5f5b #fff - #ee5f5b - #ffffff + #fcdfde + #5f2624 #ee5f5b #fff - - #e9ecef - - #000 - #e9ecef - #000 - #fefefe - #141619 - #e9ecef - #000 - - - #272b30 - - #fff - #272b30 - #fff - #ced4da - #141619 - #272b30 - #fff + + #ee4fbb + + #fff + + #fff + #473146 + #f27bcc + + #222 + + #272b30 + + #fff + #272b30 + #fff + #3f434a + #d8dadc + #272b30 + #fff #3e444c #ffffff #272b30 #272b30 + #272b30 + #7a8288 6pt diff --git a/slate/cfg/fo/attrs/dita-ot.xsl b/slate/cfg/fo/attrs/dita-ot.xsl index fd9ec96..242af59 100644 --- a/slate/cfg/fo/attrs/dita-ot.xsl +++ b/slate/cfg/fo/attrs/dita-ot.xsl @@ -160,9 +160,9 @@ - - - + + + @@ -190,8 +190,8 @@ - - - + + + diff --git a/slate/cfg/fo/attrs/prismjs.xsl b/slate/cfg/fo/attrs/prismjs.xsl index 19400e3..ad14e25 100644 --- a/slate/cfg/fo/attrs/prismjs.xsl +++ b/slate/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #313436 - #e4e6e7 - #999 - #7a8288 - #62c462 - #fd7e14 - #007bff - #ee5f5b - #5bc0de - #20c997 + #aaaaaa + #8c8e8f + #8c8e8f + #8c8e8f + #ed65a3 + #81d081 + #3395ff + #f17f7c + #fd9843 + #f17f7c + #f9a938 + + normal diff --git a/slate/cfg/fo/xsl/tables.xsl b/slate/cfg/fo/xsl/tables.xsl index 9eacff2..4b0feb3 100644 --- a/slate/cfg/fo/xsl/tables.xsl +++ b/slate/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -60,7 +80,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -130,9 +150,9 @@ - + - + diff --git a/solar/cfg/fo/attrs/bootstrap.xsl b/solar/cfg/fo/attrs/bootstrap.xsl index 89cba5b..d8101c2 100644 --- a/solar/cfg/fo/attrs/bootstrap.xsl +++ b/solar/cfg/fo/attrs/bootstrap.xsl @@ -8,9 +8,6 @@ sans-serif monospace - - - #2aa198 @@ -19,8 +16,8 @@ #fff #b58900 #fff - #f9f2d5 - #654a00 + #f0e7cc + #483700 #b58900 #fff @@ -30,8 +27,8 @@ #fff #839496 #fff - #eff1f1 - #414a4b + #e6eaea + #343b3c #839496 #fff @@ -41,8 +38,8 @@ #fff #2aa198 #fff - #d7ecea - #15514c + #d4ecea + #11403d #2aa198 #fff @@ -53,7 +50,7 @@ #268bd2 #fff #d4e8f6 - #134669 + #0f3854 #268bd2 #fff @@ -63,8 +60,8 @@ #fff #cb4b16 #fff - #f7e5d9 - #66260b + #f5dbd0 + #511e09 #cb4b16 #fff @@ -74,35 +71,36 @@ #fff #d33682 #fff - #f6e2ec - #6a1b41 + #f6d7e6 + #541634 #d33682 #fff - - #fdf6e3 - - #000 - #fdf6e3 - #000 - #fefefe - #141619 - #fdf6e3 - #000 - - - #073642 - - #fff - #073642 - #fff - #ced4da - #141619 - #073642 - #fff + + #6c71c4 + + #fff + + #fff + #e2e3f3 + #2b2d4e + + #222 + + #073642 + + #fff + #073642 + #fff + #ced4da + #495057 + #073642 + #fff #ffffff #073642 #dee2e6 + #002b36 + #839496 6pt diff --git a/solar/cfg/fo/attrs/prismjs.xsl b/solar/cfg/fo/attrs/prismjs.xsl index 95d920e..270ba47 100644 --- a/solar/cfg/fo/attrs/prismjs.xsl +++ b/solar/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,22 @@ > - #343b3c - #fdf6e3 - #767676 + #eee8d5 + #657b83 + #93a1a1 #586e75 - #1f7c75 - #bf2a72 - #2178b8 - #cb4b16 - #926e00 - #6c7a00 + #93a1a1 + #dc322f + #2aa198 + #859900 + #d33682 + #cb4b16 + #dc322f + #6c71c4 + + normal + + + #d1ccbb diff --git a/solar/cfg/fo/xsl/tables.xsl b/solar/cfg/fo/xsl/tables.xsl index e94cb93..d05d3b2 100644 --- a/solar/cfg/fo/xsl/tables.xsl +++ b/solar/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -60,7 +80,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -130,9 +150,9 @@ - + - + diff --git a/spacelab/cfg/fo/attrs/bootstrap.xsl b/spacelab/cfg/fo/attrs/bootstrap.xsl index d7b65cc..6242e83 100644 --- a/spacelab/cfg/fo/attrs/bootstrap.xsl +++ b/spacelab/cfg/fo/attrs/bootstrap.xsl @@ -79,30 +79,30 @@ #f5cccc #777 - - #eeeeee - - #000 - #eee - #000 - #fefefe - #141619 - #eee - #777 - - - #333333 - - #fff - #333 - #fff - #ced4da - #141619 - #333 - #fff + + #cd389b + + #fff + + #fff + #f5d7eb + #52163e + + #222 + + #333333 + + #fff + #333 + #fff + #ced4da + #141619 + #333 + #fff #ffffff #777777 #dee2e6 + #999999 6pt diff --git a/spacelab/cfg/fo/attrs/dita-ot.xsl b/spacelab/cfg/fo/attrs/dita-ot.xsl index 9095327..cadc560 100644 --- a/spacelab/cfg/fo/attrs/dita-ot.xsl +++ b/spacelab/cfg/fo/attrs/dita-ot.xsl @@ -67,13 +67,13 @@ - - - + + + - - - + + + @@ -101,12 +101,12 @@ #000000 - - + + #000000 - - + + #000000 diff --git a/spacelab/cfg/fo/attrs/prismjs.xsl b/spacelab/cfg/fo/attrs/prismjs.xsl index e6fb3e2..fc54719 100644 --- a/spacelab/cfg/fo/attrs/prismjs.xsl +++ b/spacelab/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #3d3d3d - - #999 - #777 - #287816 - #c4620a - #446e9b - #cd0200 - #2368a5 - #189474 + #777777 + #959595 + #959595 + #959595 + #c33476 + #32981c + #395c82 + #ac0200 + #d56a11 + #ac0200 + #b26200 + + normal diff --git a/spacelab/cfg/fo/xsl/custom.xsl b/spacelab/cfg/fo/xsl/custom.xsl index fdf385f..d379b37 100644 --- a/spacelab/cfg/fo/xsl/custom.xsl +++ b/spacelab/cfg/fo/xsl/custom.xsl @@ -8,10 +8,9 @@ - solid - + diff --git a/spacelab/cfg/fo/xsl/tables.xsl b/spacelab/cfg/fo/xsl/tables.xsl index 29fbab8..b5f9597 100644 --- a/spacelab/cfg/fo/xsl/tables.xsl +++ b/spacelab/cfg/fo/xsl/tables.xsl @@ -15,7 +15,7 @@ @@ -34,9 +34,9 @@ - + - + @@ -81,7 +81,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -144,9 +144,9 @@ - + - + diff --git a/superhero/cfg/fo/attrs/bootstrap.xsl b/superhero/cfg/fo/attrs/bootstrap.xsl index c5d06ef..1253cbd 100644 --- a/superhero/cfg/fo/attrs/bootstrap.xsl +++ b/superhero/cfg/fo/attrs/bootstrap.xsl @@ -19,8 +19,8 @@ #fff #df6919 #fff - #faece3 - #6a320c + #f9e1d1 + #592a0a #df6919 #fff @@ -28,10 +28,10 @@ #4e5d6c #fff - #4e5d6c + #fff - #eaedf0 - #272e36 + #dcdfe2 + #1f252b #4e5d6c #fff @@ -41,8 +41,8 @@ #fff #5cb85c #fff - #eef7ee - #2e5c2e + #def1de + #254a25 #5cb85c #fff @@ -52,8 +52,8 @@ #fff #5bc0de #fff - #eef8fb - #2d606f + #def2f8 + #244d59 #5bc0de #fff @@ -63,8 +63,8 @@ #fff #ffc107 #fff - #fff9e6 - #806104 + #fff3cd + #664d03 #ffc107 #fff @@ -74,35 +74,36 @@ #fff #d9534f #fff - #faeeed - #6d2a28 + #f7dddc + #572120 #d9534f #fff - - #abb6c2 - - #fff - #abb6c2 - #fff - #fefefe - #141619 - #abb6c2 - #fff - - - #20374c - - #fff - #20374c - #fff - #ced4da - #141619 - #20374c - #fff + + #d95ee6 + + #fff + + #fff + #2f2e53 + #dd6ee8 + + #222 + + #20374c + + #fff + #20374c + #fff + #28405a + #eeeeee + #20374c + #fff #ffffff #20374c #ced4da + #0f2537 + #4e5d6c 0pt diff --git a/superhero/cfg/fo/attrs/prismjs.xsl b/superhero/cfg/fo/attrs/prismjs.xsl index 5e53046..89fa763 100644 --- a/superhero/cfg/fo/attrs/prismjs.xsl +++ b/superhero/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #1f252b - #dcdfe2 - #868e96 - #4e5d6c - #3d7a3d - #c4620a - #32679a - #903734 - #3c8094 - #954611 + #ebebeb + #b6bcc0 + #b6bcc0 + #b6bcc0 + #ed65a3 + #7dc67d + #70afed + #e17572 + #e58747 + #e17572 + #ffcd39 + + normal diff --git a/superhero/cfg/fo/xsl/tables.xsl b/superhero/cfg/fo/xsl/tables.xsl index 781ac1f..13ca6c3 100644 --- a/superhero/cfg/fo/xsl/tables.xsl +++ b/superhero/cfg/fo/xsl/tables.xsl @@ -8,14 +8,34 @@ version="2.0" > + + + + + + + + + + + + + + + + + - + - + @@ -60,7 +80,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -130,9 +150,9 @@ - + - + diff --git a/united/cfg/fo/attrs/bootstrap.xsl b/united/cfg/fo/attrs/bootstrap.xsl index 0ed5dce..0b0e26a 100644 --- a/united/cfg/fo/attrs/bootstrap.xsl +++ b/united/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #333 - #aea79f + #666666 #fff #aea79f @@ -79,30 +79,30 @@ #f9d7d5 #333 - - #e9ecef - - #000 - #e9ecef - #000 - #fefefe - #141619 - #e9ecef - #333 - - - #772953 - - #fff - #772953 - #fff - #ced4da - #141619 - #772953 - #fff + + #df46df + + #fff + + #fff + #f8daf8 + #591c59 + + #222 + + #772953 + + #fff + #772953 + #fff + #ced4da + #141619 + #772953 + #fff #ffffff #333333 #dee2e6 + #aea79f 6pt diff --git a/united/cfg/fo/attrs/prismjs.xsl b/united/cfg/fo/attrs/prismjs.xsl index 52e23be..5f2c5dc 100644 --- a/united/cfg/fo/attrs/prismjs.xsl +++ b/united/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #464340 - - #aea79f - #666a70 - #257a31 - #e95420 - #0050a6 - #df382c - #107282 - #189474 + #333333 + #636362 + #636362 + #636362 + #c33476 + #2f973e + #0067d6 + #bb2f25 + #c4471b + #bb2f25 + #c99a34 + + normal diff --git a/united/cfg/fo/xsl/custom.xsl b/united/cfg/fo/xsl/custom.xsl index fdf385f..d379b37 100644 --- a/united/cfg/fo/xsl/custom.xsl +++ b/united/cfg/fo/xsl/custom.xsl @@ -8,10 +8,9 @@ - solid - + diff --git a/united/cfg/fo/xsl/tables.xsl b/united/cfg/fo/xsl/tables.xsl index 497302c..364ea6b 100644 --- a/united/cfg/fo/xsl/tables.xsl +++ b/united/cfg/fo/xsl/tables.xsl @@ -15,7 +15,7 @@ @@ -34,9 +34,9 @@ - + - + @@ -81,7 +81,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -144,9 +144,9 @@ - + - + diff --git a/vapor/cfg/fo/attrs/bootstrap.xsl b/vapor/cfg/fo/attrs/bootstrap.xsl index 1cea930..0ab8d56 100644 --- a/vapor/cfg/fo/attrs/bootstrap.xsl +++ b/vapor/cfg/fo/attrs/bootstrap.xsl @@ -28,7 +28,7 @@ #ea39b8 #fff - #ea39b8 + #fff #fbd7f1 #5e174a @@ -79,32 +79,33 @@ #e44c55 #fff - - #44d9e8 - - #fff - #44d9e8 - #fff - #fefefe - #141619 - #44d9e8 - #fff - - - #170229 - - #fff - #170229 - #fff - #ced4da - #141619 - #170229 - #fff + + #e447c1 + + #fff + + #fff + #321044 + #e447c1 + + #222 + + #170229 + + #fff + #170229 + #fff + #2d2440 + #d9d3e0 + #170229 + #fff #ffffff #170229 #dee2e6 - 0pt - 0 + #ea39b8 + #1a0933 + 1pt + 6pt 30pt diff --git a/vapor/cfg/fo/attrs/dita-ot.xsl b/vapor/cfg/fo/attrs/dita-ot.xsl index 384aa78..c8401ab 100644 --- a/vapor/cfg/fo/attrs/dita-ot.xsl +++ b/vapor/cfg/fo/attrs/dita-ot.xsl @@ -86,13 +86,13 @@ - - - + + + - - - + + + @@ -114,11 +114,11 @@ - - + + - - + + diff --git a/vapor/cfg/fo/attrs/prismjs.xsl b/vapor/cfg/fo/attrs/prismjs.xsl index ed2f920..f732e63 100644 --- a/vapor/cfg/fo/attrs/prismjs.xsl +++ b/vapor/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #5e174a - #fbd7f1 - #9ba5af - #69727a - #0cb94e - #efac17 - #0a9af3 - #e23e48 - #04c1aa - #3d7d9c + #32fbe2 + #34c0bb + #34c0bb + #34c0bb + #ee61c6 + #63f59a + #49b5f8 + #e97077 + #f4c55c + #e97077 + #ffcd39 + + normal diff --git a/vapor/cfg/fo/xsl/custom.xsl b/vapor/cfg/fo/xsl/custom.xsl index fdf385f..3847817 100644 --- a/vapor/cfg/fo/xsl/custom.xsl +++ b/vapor/cfg/fo/xsl/custom.xsl @@ -8,13 +8,310 @@ - solid - + + + + + + + + + + + + + + + + + + + + secondary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10pt + + always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + solid + + + + + solid + + + + + + 12pt + + + 10pt + 10pt + + + + + + + + + + + + + + + + + + + + always + + + + + + + + + + + + + bi-lightbulb + bi-shield-check + bi-clipboard-check + bi-slash-circle + bi-exclamation-circle-fill + bi-exclamation-triangle + bi-exclamation-triangle + bi-exclamation-triangle + bi-exclamation-triangle + bi-exclamation-triangle + bi-info-circle-fill + bi-pencil + bi-info-circle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + diff --git a/vapor/cfg/fo/xsl/tables.xsl b/vapor/cfg/fo/xsl/tables.xsl index 058d04e..51727a1 100644 --- a/vapor/cfg/fo/xsl/tables.xsl +++ b/vapor/cfg/fo/xsl/tables.xsl @@ -15,7 +15,7 @@ @@ -34,9 +34,9 @@ - + - + @@ -81,7 +81,7 @@ select="parent::*[contains(@class, ' topic/row ')]/parent::*[contains(@class, ' topic/tfoot ')]" /> - + @@ -144,9 +144,9 @@ - + - + diff --git a/yeti/cfg/fo/attrs/bootstrap.xsl b/yeti/cfg/fo/attrs/bootstrap.xsl index 39a59ab..02013a1 100644 --- a/yeti/cfg/fo/attrs/bootstrap.xsl +++ b/yeti/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #fff - #eeeeee + #595959 #000 #eee @@ -79,30 +79,30 @@ #f04124 #fff - - #eeeeee - - #000 - #eee - #000 - #fefefe - #141619 - #eee - #222 - - - #333333 - - #fff - #333 - #fff - #ced4da - #141619 - #333 - #fff + + #f066ba + + #fff + + #fff + #fce0f1 + #60284a + + #222 + + #333333 + + #fff + #333 + #fff + #ced4da + #141619 + #333 + #fff #ffffff #222222 #dee2e6 + #eeeeee 0pt diff --git a/yeti/cfg/fo/attrs/prismjs.xsl b/yeti/cfg/fo/attrs/prismjs.xsl index 45f7d79..1c84b93 100644 --- a/yeti/cfg/fo/attrs/prismjs.xsl +++ b/yeti/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #5f5f5f - - #adb5bd - #888 - #2d7347 - #c4620a - #008cba - #f04124 - #3c8094 - #189474 + #212529 + #585b5e + #585b5e + #585b5e + #c33476 + #389059 + #00769c + #ca371e + #d56a11 + #ca371e + #c47902 + + normal diff --git a/yeti/cfg/fo/xsl/custom.xsl b/yeti/cfg/fo/xsl/custom.xsl index 3f14c53..e052abe 100644 --- a/yeti/cfg/fo/xsl/custom.xsl +++ b/yeti/cfg/fo/xsl/custom.xsl @@ -6,10 +6,9 @@ > - solid - + diff --git a/zephyr/cfg/fo/attrs/bootstrap.xsl b/zephyr/cfg/fo/attrs/bootstrap.xsl index 9ee62fe..0e92715 100644 --- a/zephyr/cfg/fo/attrs/bootstrap.xsl +++ b/zephyr/cfg/fo/attrs/bootstrap.xsl @@ -25,7 +25,7 @@ #495057 - #ffffff + #767c81 #000 #fff @@ -79,30 +79,30 @@ #f8d4d5 #495057 - - #f8f9fa - - #000 - #f8f9fa - #000 - #fefefe - #141619 - #f8f9fa - #495057 - - - #212529 - - #fff - #212529 - #fff - #ced4da - #141619 - #212529 - #fff + + #da41e6 + + #fff + + #fff + #f7d9fa + #571a5c + + #222 + + #212529 + + #fff + #212529 + #fff + #ced4da + #141619 + #212529 + #fff #ffffff #495057 #dee2e6 + #ffffff 6pt diff --git a/zephyr/cfg/fo/attrs/prismjs.xsl b/zephyr/cfg/fo/attrs/prismjs.xsl index 6bde532..9f1255a 100644 --- a/zephyr/cfg/fo/attrs/prismjs.xsl +++ b/zephyr/cfg/fo/attrs/prismjs.xsl @@ -6,15 +6,18 @@ > - #666666 - - #adb5bd - #6c757d - #1f7755 - #a54e3f - #3459e6 - #da292e - #287bb5 - #189474 + #495057 + #767c81 + #767c81 + #767c81 + #b42b6f + #27966c + #2c4bc1 + #b72227 + #d06350 + #b72227 + #cd9f51 + + normal diff --git a/zephyr/cfg/fo/xsl/custom.xsl b/zephyr/cfg/fo/xsl/custom.xsl index 3f14c53..e052abe 100644 --- a/zephyr/cfg/fo/xsl/custom.xsl +++ b/zephyr/cfg/fo/xsl/custom.xsl @@ -6,10 +6,9 @@ > - solid - +