Merge branch 'main' of https://github.com/mit-dormcon/t-rex

mit-dormcon · Aug 14, 2023 · dd0bd0b · dd0bd0b
2 parents d006119 + 067b301
commit dd0bd0b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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": [

diff --git a/static/guide-bw.css b/static/guide-bw.css
@@ -1,10 +1,10 @@
 .page {
-  page-break-after: always;
+  page-break-before: always;
 }
 
 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,9 +102,15 @@ body {
   font-size: 14pt;
 }
 
+.credit {
+  display: none;
+  font-style: italic;
+  text-align: center;
+}
+
 @media print {
   body {
-    font-size: 18pt;
+    font-size: 16pt;
   }
   .day-title,
   .fpop-title,
@@ -118,13 +123,19 @@ body {
   .main-title {
     font-size: 72pt;
   }
+  .main-body {
+    font-size: 24pt;
+  }
   .byline {
     position: absolute;
     left: 0;
     right: 0;
     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 +145,7 @@ body {
   }
   /* may want to style visited links */
 }
+
+@page {
+  size: A3;
+}
diff --git a/templates/credit.html b/templates/credit.html
@@ -0,0 +1 @@
+<p class="credit">Printed by Goodfellow Printing in Iowa City, IA</p>
diff --git a/templates/guide.html b/templates/guide.html
@@ -16,7 +16,7 @@
 
   <body>
     {% include "guide_fm.html" %}
-    <div>
+    <div class="page">
       <span class="day-title">Residence Hall Tours</span>
       {% for event in tours %}{{ event_box(event) }}{% endfor %}
       {%
@@ -79,5 +79,7 @@
         </div>
       {% endif %}
     </div>
+
+    {% include "credit.html" %}
   </body>
 </html>
diff --git a/templates/guide_fm.html b/templates/guide_fm.html
@@ -7,11 +7,13 @@ <h1 class="main-title">DORMCON {{ api.name | upper }}</h1>
       class="qrcode"
       style="margin-top: 0vh; margin-bottom: 5vh"
     /><br />
-    <b> &middot; {{ " &middot; ".join(cover_dorms) }} &middot;</b><br />
-    <p>
-      Find all the events online at
-      <a href="https://dormcon.mit.edu/rex">dormcon.mit.edu/rex</a>.
-    </p>
+    <div class="main-body">
+      <b> &middot; {{ " &middot; ".join(cover_dorms) }} &middot;</b><br />
+      <p>
+        Find all the events online at
+        <a href="https://dormcon.mit.edu/rex">dormcon.mit.edu/rex</a>.
+      </p>
+    </div>
   </div>
   <p class="byline">Made with ❤️ by DormCon Tech+REX Chairs</p>
 </div>