From 5f90e03e467a19e2514e6fc043746029786f9c70 Mon Sep 17 00:00:00 2001 From: Cameron Kleiman Date: Mon, 7 Aug 2023 23:37:32 -0700 Subject: [PATCH 1/3] Give Bob credit at the end of the booklet --- static/guide-bw.css | 16 ++++++++++++++-- templates/credit.html | 1 + templates/guide.html | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 templates/credit.html diff --git a/static/guide-bw.css b/static/guide-bw.css index f15f9f8..b590e4c 100644 --- a/static/guide-bw.css +++ b/static/guide-bw.css @@ -4,7 +4,7 @@ body { background-color: #ffffff; - font-family: 'Noto Sans', Helvetica, Arial, sans-serif, 'Noto Emoji'; + font-family: "Noto Sans", Helvetica, Arial, sans-serif, "Noto Emoji"; } .main-title { @@ -82,7 +82,6 @@ body { .post { page-break-before: always; - page-break-after: always; display: block; width: auto; margin: 5px 10px; @@ -103,6 +102,12 @@ body { font-size: 14pt; } +.credit { + display: none; + font-style: italic; + text-align: center; +} + @media print { body { font-size: 18pt; @@ -125,6 +130,9 @@ body { text-align: center; bottom: 0; } + .credit { + display: block; + } .event { /* necessary to not have the top border show up on the previous page */ transform: translateY(2px); @@ -134,3 +142,7 @@ body { } /* may want to style visited links */ } + +@page { + size: A3; +} diff --git a/templates/credit.html b/templates/credit.html new file mode 100644 index 0000000..690ddff --- /dev/null +++ b/templates/credit.html @@ -0,0 +1 @@ +

Printed by Goodfellow Printing in Iowa City, IA

diff --git a/templates/guide.html b/templates/guide.html index 016b35d..5fc0246 100644 --- a/templates/guide.html +++ b/templates/guide.html @@ -79,5 +79,7 @@ {% endif %} + + {% include "credit.html" %} From 2e8ad230fad8e9b7cfc7500888dc21e79d70c355 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 04:44:15 +0000 Subject: [PATCH 2/3] Bump prettier and prettier-plugin-jinja-template Bumps [prettier](https://github.com/prettier/prettier) and [prettier-plugin-jinja-template](https://github.com/davidodenwald/prettier-plugin-jinja-template). These dependencies needed to be updated together. Updates `prettier` from 2.8.8 to 3.0.1 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.1) Updates `prettier-plugin-jinja-template` from 0.5.0 to 1.0.0 - [Release notes](https://github.com/davidodenwald/prettier-plugin-jinja-template/releases) - [Commits](https://github.com/davidodenwald/prettier-plugin-jinja-template/compare/v0.5.0...v1.0.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major - dependency-name: prettier-plugin-jinja-template dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 22 +++++++++++----------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ee7ce3..5f7d373 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,32 +5,32 @@ "packages": { "": { "devDependencies": { - "prettier": "^2.8.8", - "prettier-plugin-jinja-template": "^0.5.0" + "prettier": "^3.0.1", + "prettier-plugin-jinja-template": "^1.0.0" } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-plugin-jinja-template": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-jinja-template/-/prettier-plugin-jinja-template-0.5.0.tgz", - "integrity": "sha512-KAmpLVRNw/afeN829FrDwx2aURzcpOnRXaoXld79bMGbabtW8MaFXIODqnzSvArHtgf8c6N0PRsz3tpL4TDvjA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-jinja-template/-/prettier-plugin-jinja-template-1.0.0.tgz", + "integrity": "sha512-vIwu96l9yxCClEFNGHRKEWNmDkJJiWdQ1ZEeaEhFSkjYSBQwElCt8dSpiPV17Bn9u43TIPPDa7cDZdgOWqtImQ==", "dev": true, "peerDependencies": { - "prettier": "^2.0.0" + "prettier": "^3.0.0" } } } diff --git a/package.json b/package.json index 3e41535..b9244d9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "devDependencies": { - "prettier": "^2.8.8", - "prettier-plugin-jinja-template": "^0.5.0" + "prettier": "^3.0.1", + "prettier-plugin-jinja-template": "^1.0.0" }, "prettier": { "overrides": [ From 067b301823d73e8feba6149807db78c2585255c5 Mon Sep 17 00:00:00 2001 From: Cameron Kleiman Date: Sun, 13 Aug 2023 23:28:24 -0700 Subject: [PATCH 3/3] touchups for rex 2023 --- static/guide-bw.css | 7 +++++-- templates/guide.html | 2 +- templates/guide_fm.html | 12 +++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/static/guide-bw.css b/static/guide-bw.css index b590e4c..c367ebd 100644 --- a/static/guide-bw.css +++ b/static/guide-bw.css @@ -1,5 +1,5 @@ .page { - page-break-after: always; + page-break-before: always; } body { @@ -110,7 +110,7 @@ body { @media print { body { - font-size: 18pt; + font-size: 16pt; } .day-title, .fpop-title, @@ -123,6 +123,9 @@ body { .main-title { font-size: 72pt; } + .main-body { + font-size: 24pt; + } .byline { position: absolute; left: 0; diff --git a/templates/guide.html b/templates/guide.html index 5fc0246..3761396 100644 --- a/templates/guide.html +++ b/templates/guide.html @@ -16,7 +16,7 @@ {% include "guide_fm.html" %} -
+
Residence Hall Tours {% for event in tours %}{{ event_box(event) }}{% endfor %} {% diff --git a/templates/guide_fm.html b/templates/guide_fm.html index 12ca5d0..215cc25 100644 --- a/templates/guide_fm.html +++ b/templates/guide_fm.html @@ -7,11 +7,13 @@

DORMCON {{ api.name | upper }}

class="qrcode" style="margin-top: 0vh; margin-bottom: 5vh" />
- · {{ " · ".join(cover_dorms) }} ·
-

- Find all the events online at - dormcon.mit.edu/rex. -

+
+ · {{ " · ".join(cover_dorms) }} ·
+

+ Find all the events online at + dormcon.mit.edu/rex. +

+

Made with ❤️ by DormCon Tech+REX Chairs