From 75530803960fbb572cc7bfa9e3bf9ce5d67649e2 Mon Sep 17 00:00:00 2001 From: Jeff MacKinnon Date: Wed, 13 Dec 2023 14:23:13 -0400 Subject: [PATCH] General Cleanup --- .gitignore | 8 ++++++-- jmk.yaml | 43 +++++++++++++++++++++++++++------------- jmkengineering.yaml | 37 ++++++++++++++++++++++++++++++++++ static/watermark.png | Bin 0 -> 3997 bytes template-short-memo.rst | 2 +- 5 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 jmkengineering.yaml create mode 100644 static/watermark.png diff --git a/.gitignore b/.gitignore index 8ec5984..1d83976 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ -*.png -*.jpg +!logos/logo.jpg +logos/*.png +logos/*.jpg +logos/*.pdf +Thumbs* + *.pdf \ No newline at end of file diff --git a/jmk.yaml b/jmk.yaml index b58e0ad..0a6daa0 100644 --- a/jmk.yaml +++ b/jmk.yaml @@ -6,6 +6,8 @@ # # 0 - Initial version that is good enough to send to clients + + pageSetup: size: Letter spacing-header: 10mm @@ -19,41 +21,52 @@ fontsAlias: stdFont: calibri headingFont: Helvetica-Bold +linkColor: black + styles: + bodytext: + alignment: TA_LEFT normal: parent: base fontSize: 11 fontName: stdFont - heading: + header: + alignment: TA_CENTER parent: normal + heading: + keepWithNext: true + parent: normal + spaceAfter: 6 + spaceBefore: 12 fontName: headingFont - fontSize: 20 textColor: 17365D heading1: parent: heading - fontSize: 18 + fontSize: 175% + spaceBefore: 10 + spaceAfter: 10 heading2: parent: heading - fontSize: 16 + fontSize: 150% heading3: parent: heading - fontSize: 16 + fontSize: 125% heading4: parent: heading - fontSize: 14 + fontSize: 112% heading5: parent: heading - fontSize: 12 + fontSize: 100% title: parent: heading fontSize: 30 + align: right txtheader: parent: heading - headertable: - borderWidth: 1 + borderWidth: 0 borderColor: red parent: heading align: center @@ -61,16 +74,18 @@ styles: align: center headerlogol: valign: middle + + + + mytable: + parent: table + colWidths: [3cm, 6cm, 3cm] + item-list: -# Added some space after a bulleted list to make things a bit cleaner spaceAfter: 10pt colWidths: -# The defualt is 20, but that only allows single digit numbers - 30pt -# I left this as null - null bullet-list: -# Added some space after a bulleted list to make things a bit cleaner - spaceBefore: 0 spaceAfter: 10pt diff --git a/jmkengineering.yaml b/jmkengineering.yaml new file mode 100644 index 0000000..9e6140e --- /dev/null +++ b/jmkengineering.yaml @@ -0,0 +1,37 @@ +{ + "pageSetup" : { + "size": "Letter", + }, + "fontsAlias" : { + "stdFont": "Calibri", + "headingFont": "Calibri Light" + }, + "styles" : [ + ["normal" , { + "fontSize": 12 + }], + ["heading" , { + "parent": "normal", + "fontName": "headingFont", + "fontSize": 20, + "textColor": "#0000ff" + }], + ["heading1" , { + "parent": "heading", + "fontSize": 18, + }], + ["heading2" , { + "parent": "heading", + "fontSize": 16, + }], + ["heading3" , { + "parent": "heading", + "fontSize": 14, + }], + ["title" , { + "parent": "heading", + "fontSize": 40 + }] + ] + +} diff --git a/static/watermark.png b/static/watermark.png new file mode 100644 index 0000000000000000000000000000000000000000..47c474a2d19a8a1fa5ba74a758deb837a1611672 GIT binary patch literal 3997 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