fix(ticket): testing for ticket pages

timmywil · timmywil · commit 154766275267 · 2023-06-07T22:24:12.000-04:00
diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
@@ -33,7 +33,7 @@
   </head>
   <body>
     <div class="banner flex-center">
-      <span>jQuery UI issues have moved to <a href="https://github.com/jquery/jquery-ui/issues">GitHub</a>. This site is now a static archive of the old <a href="https://trac.edgewall.org/">Trac</a> bugs site. Some functions and pages are no longer available.</span>
+      <span>jQuery UI issues have moved to <a href="https://github.com/jquery/jquery-ui/issues">GitHub</a>. This site is now a static archive of the old <a href="https://trac.edgewall.org/">Trac</a> bugs site. <br />Some functions and pages are no longer available.</span>
     </div>
     <div class="container">
       <a href="#skip" class="visually-hidden">Skip to main content</a>
diff --git a/content/ticket.njk b/content/ticket.njk
@@ -56,12 +56,12 @@
 
 <div class="ticket-info">
   <div class="flex-row flex-between-start">
-    <h3>
+    <h2>
       <a href="{{ pagination.url }}" class="ticket-number">#{{ ticket.id }}</a>
       <span class="ticket-status">{{ ticket.status }}</span>
       <span class="ticket-type">{{ ticket.type }}</span>
       <span class="ticket-resolution">({{ ticket.resolution }})</span>
-    </h3>
+    </h2>
 
     <div class="ticket-dates">
       <p>Opened {{ ticket.time | yearsAgo }}</p>
@@ -196,4 +196,4 @@
       </div>
     </div>
   {% endfor %}
-</details>
+</details>
diff --git a/content/wiki/TitleIndex.njk b/content/wiki/TitleIndex.njk
@@ -9,8 +9,8 @@ eleventyImport:
 
 <p>Below is an index of all the wiki pages that were available on the old site.</p>
 
-<div class="flex-column">
+<div class="flex-column items-start">
   {% for wiki in collections.wiki %}
     <a href="{{ wiki.url }}" class="wiki-index-link">{{ wiki.data.title }}</a>
   {% endfor %}
-</div>
+</div>
diff --git a/eleventy.config.tracToHTML.js b/eleventy.config.tracToHTML.js
@@ -27,36 +27,40 @@ module.exports = function tracToHTML(text) {
         )
         return `<pre class="wiki"></pre>`
       })
+      // Linkify http links outside brackets
+      .replace(/(^|\s)(https?:\/\/[^\s]+)/g, function (_match, space, url) {
+        return `${space}<a href="${url}" class="ext-link"><span class="icon"></span>${url}</a>`
+      })
       // Linkify http links in brackets
       .replace(
-        /\[(https?:\/\/[^\s\]]+)(?:\s+([^\]]+))?\]/g,
-        function (_match, url, text) {
-          return `<a href="${url}" class="ext-link"><span class="icon"></span>${
+        /(^|\s)\[(https?:\/\/[^\s\]]+)(?:\s+([^\]]+))?\]/g,
+        function (_match, space, url, text) {
+          return `${space}<a href="${url}" class="ext-link"><span class="icon"></span>${
             text || url
           }</a>`
         }
       )
       // Linkify hash links in brackets
       .replace(
-        /\[(#[^\s\]]+)(?:\s+([^\]]+))?\]/g,
-        function (_match, url, text) {
-          return `<a href="${url}" class="ext-link"><span class="icon"></span>${
+        /(^|\s)\[(#[^\s\]]+)(?:\s+([^\]]+))?\]/g,
+        function (_match, space, url, text) {
+          return `${space}<a href="${url}" class="ext-link"><span class="icon"></span>${
             text || url
           }</a>`
         }
       )
       // Linkify CamelCase links in brackets
       .replace(
-        /\[([A-Z][a-z]+[A-Z][\w#-]+)(?:\s+([^\]]+))?\]/g,
-        function (_match, page, text) {
-          return `<a href="/wiki/${page}">${text || page}</a>`
+        /(^|\s)\[([A-Z][a-z]+[A-Z][\w#-]+)(?:\s+([^\]]+))?\]/g,
+        function (_match, space, page, text) {
+          return `${space}<a href="/wiki/${page}">${text || page}</a>`
         }
       )
       // Linkify trac links
       .replace(
-        /(?:\[trac:([^ ]+) "([^"]+)"\])|(?:\[trac:([^\s\]]+)(?: ([^\]]+))?\])/g,
-        function (_match, quotepage, quotedtext, page, text) {
-          return `<a href="https://trac.edgewall.org/intertrac/${
+        /(^|\s)(?:\[trac:([^ ]+) "([^"]+)"\])|(?:\[trac:([^\s\]]+)(?: ([^\]]+))?\])/g,
+        function (_match, space, quotepage, quotedtext, page, text) {
+          return `${space}<a href="https://trac.edgewall.org/intertrac/${
             quotepage || page
           }" class="ext-link"><span class="icon"></span>${
             quotedtext || text || page
diff --git a/public/css/index.css b/public/css/index.css
@@ -1,12 +1,12 @@
 /* Defaults */
 :root {
-  --font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
+  --font-family: 'Arial', 'Helvetica', 'Verdana', 'sans-serif';
   --font-family-header: var(--font-family);
-  --font-family-alternate: Verdana, Arial, "Bitstream Vera Sans", Helvetica, sans-serif;
-  --font-family-monospace: Monaco, Andale Mono WT, Andale Mono,
-    Lucida Console, Lucida Sans Typewriter, DejaVu Sans Mono,
-    Bitstream Vera Sans Mono, Liberation Mono, Nimbus Mono L, Courier New,
-    Courier, monospace;
+  --font-family-alternate: Verdana, Arial, 'Bitstream Vera Sans', Helvetica,
+    sans-serif;
+  --font-family-monospace: Monaco, Andale Mono WT, Andale Mono, Lucida Console,
+    Lucida Sans Typewriter, DejaVu Sans Mono, Bitstream Vera Sans Mono,
+    Liberation Mono, Nimbus Mono L, Courier New, Courier, monospace;
 }
 
 /* Theme colors */
@@ -120,7 +120,8 @@ body {
   color: var(--text-color-link-active);
 }
 
-th, tr {
+th,
+tr {
   font-family: var(--font-family-alternate);
 }
 .container {
@@ -131,19 +132,35 @@ th, tr {
   overflow: hidden;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: var(--font-family-header);
   font-weight: normal;
   margin: 0;
   padding: 0;
   letter-spacing: 0;
 }
+h1,
+h2,
+h3,
+h4 {
+  letter-spacing: -0.018em;
+}
 
 h1 {
   font-size: 1.25rem;
   font-weight: bold;
 }
 
+h2 {
+  font-size: 1rem;
+  font-weight: bold;
+}
+
 /* https://www.a11yproject.com/posts/how-to-hide-content/ */
 .visually-hidden {
   clip: rect(0 0 0 0);
@@ -258,7 +275,7 @@ pre[class*='language-'] code {
 
 /* Header */
 header {
-	position: relative;
+  position: relative;
   height: 95px;
   display: flex;
   flex-wrap: wrap;
@@ -462,15 +479,16 @@ main a[href]:active {
 /* Footer */
 footer {
   background-color: var(--nav-background-color);
-  background: var(--nav-background-color) linear-gradient(
-    to bottom,
-    var(--footer-background-start-color),
-    var(--footer-background-end-color)
-  );
+  background: var(--nav-background-color)
+    linear-gradient(
+      to bottom,
+      var(--footer-background-start-color),
+      var(--footer-background-end-color)
+    );
   padding: 2em;
   margin-bottom: 2em;
   color: var(--text-color-dark-bg);
-  border: 2px solid var(--main-background-end-color);
+  border: 2px solid transparent;
   border-top: 0;
   border-radius: 0 0 var(--border-radius) var(--border-radius);
 }
@@ -515,6 +533,9 @@ footer a[href]:active {
   justify-content: center;
   align-items: center;
 }
+.items-start {
+  align-items: start;
+}
 
 /* Utility classes */
 .white-box {
@@ -526,7 +547,7 @@ a.ext-link .icon {
   background: url(/img/extlink.png) 0 50% no-repeat;
 }
 
-@media(max-width: 919px) {
+@media (max-width: 919px) {
   #jq-menus {
     position: absolute;
     top: 95px;
@@ -544,8 +565,8 @@ a.ext-link .icon {
   }
 }
 
-@media(min-width: 920px) {
-  html:before{
+@media (min-width: 920px) {
+  html:before {
     top: 60px;
   }
   body {
@@ -587,9 +608,9 @@ a.ext-link .icon {
     border-radius: var(--border-radius);
     margin-top: 2em;
   }
-	#jq-siteLogo {
-		align-self: flex-end;
-	}
+  #jq-siteLogo {
+    align-self: flex-end;
+  }
   main {
     flex-grow: 1;
     min-height: 520px;
diff --git a/public/css/ticket.css b/public/css/ticket.css
@@ -6,6 +6,7 @@
   --ticket-description-title-color: #663;
   --ticket-changes-text-color: #663;
   --ticket-changes-box-shadow: #f2f2f2;
+  --ticket-number-color: #844;
 }
 
 .ticket-info {
@@ -19,28 +20,25 @@
   max-width: 580px;
 }
 .ticket-number {
-  font-size: 1.15rem;
+  font-size: 1.45rem;
   font-weight: bold;
   margin-right: 0.5em;
+  text-decoration: none;
+}
+.ticket-number[href],
+.ticket-number[href]:visited {
+  color: var(--ticket-number-color);
 }
 .ticket-info span {
-  font-size: 0.8125em;
   font-weight: bold;
 }
 
-.ticket-status,
-.ticket-type,
-.ticket-resolution {
-  text-transform: uppercase;
-}
-
 .missing {
   color: var(--text-color-link-disabled);
 }
 
 .ticket-title {
   border-bottom: 1px solid #bbb;
-  margin-top: 1em;
   padding-bottom: 0.25em;
   font-weight: bold;
   font-size: 1.1875rem;
@@ -111,6 +109,9 @@
 details {
   padding: 0.5em 0;
   font-size: 0.8125rem;
+  width: 100%;
+  max-width: 580px;
+  margin: 0 auto;
 }
 summary {
   color: var(--text-color-link);
