feat(url): merge links with headings

This commit is contained in:
Rafael Bardini 2021-07-18 15:21:43 +02:00
parent 100aa011a6
commit 3fcfdae7ed
10 changed files with 51 additions and 103 deletions

View File

@ -11,13 +11,11 @@
<time datetime="{{.}}">{{formatDate .}}</time> <time datetime="{{.}}">{{formatDate .}}</time>
{{/date}} {{/date}}
</div> </div>
<div class="spaced-list">
{{#awarder}} {{#awarder}}
<div> <span>
Awarded by <strong>{{.}}</strong> Awarded by <strong>{{.}}</strong>
</div> </span>
{{/awarder}} {{/awarder}}
</div>
</header> </header>
{{#summary}} {{#summary}}
{{{markdown .}}} {{{markdown .}}}

View File

@ -6,21 +6,16 @@
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>{{name}}</h4> <h4>{{> link}}</h4>
{{#date}} {{#date}}
<time datetime="{{.}}">{{formatDate .}}</time> <time datetime="{{.}}">{{formatDate .}}</time>
{{/date}} {{/date}}
</div> </div>
<div class="spaced-list">
{{#issuer}} {{#issuer}}
<span> <span>
Issued by <strong>{{.}}</strong> Issued by <strong>{{.}}</strong>
</span> </span>
{{/issuer}} {{/issuer}}
{{#url}}
<a href="{{.}}">{{formatURL .}}</a>
{{/url}}
</div>
</header> </header>
</article> </article>
{{/each}} {{/each}}

View File

@ -6,20 +6,15 @@
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>{{institution}}</h4> <h4>{{> link name=institution}}</h4>
<span> <span>
<time datetime="{{startDate}}">{{formatDate startDate}}</time> <time datetime="{{startDate}}">{{formatDate startDate}}</time>
{{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}} {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
</span> </span>
</div> </div>
<div class="spaced-list">
{{#area}} {{#area}}
<strong>{{.}}</strong> <strong>{{.}}</strong>
{{/area}} {{/area}}
{{#url}}
<a href="{{.}}">{{formatURL .}}</a>
{{/url}}
</div>
</header> </header>
{{#studyType}} {{#studyType}}
{{{markdown .}}} {{{markdown .}}}

1
partials/link.hbs Normal file
View File

@ -0,0 +1 @@
{{#if name}}{{#if url}}<a href="{{url}}">{{name}}</a>{{else}}{{name}}{{/if}}{{else}}{{#url}}<a href="{{.}}">{{formatURL .}}</a>{{/url}}{{/if}}

View File

@ -6,13 +6,12 @@
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>{{name}}</h4> <h4>{{> link}}</h4>
<span> <span>
<time datetime="{{startDate}}">{{formatDate startDate}}</time> <time datetime="{{startDate}}">{{formatDate startDate}}</time>
{{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}} {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
</span> </span>
</div> </div>
<div class="spaced-list">
<span> <span>
{{#if roles}} {{#if roles}}
<strong>{{join roles}}</strong> <strong>{{join roles}}</strong>
@ -21,10 +20,6 @@
at <strong>{{.}}</strong> at <strong>{{.}}</strong>
{{/entity}} {{/entity}}
</span> </span>
{{#url}}
<a href="{{.}}">{{formatURL .}}</a>
{{/url}}
</div>
</header> </header>
{{#description}} {{#description}}
{{{markdown .}}} {{{markdown .}}}

View File

@ -6,21 +6,16 @@
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>{{name}}</h4> <h4>{{> link}}</h4>
{{#releaseDate}} {{#releaseDate}}
<time datetime="{{.}}">{{formatDate .}}</time> <time datetime="{{.}}">{{formatDate .}}</time>
{{/releaseDate}} {{/releaseDate}}
</div> </div>
<div class="spaced-list">
{{#publisher}} {{#publisher}}
<span> <span>
Published by <strong>{{.}}</strong> Published by <strong>{{.}}</strong>
</span> </span>
{{/publisher}} {{/publisher}}
{{#url}}
<a href="{{.}}">{{formatURL .}}</a>
{{/url}}
</div>
</header> </header>
{{#summary}} {{#summary}}
{{{markdown .}}} {{{markdown .}}}

View File

@ -12,14 +12,7 @@
{{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}} {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
</span> </span>
</div> </div>
<div class="spaced-list"> <strong>{{> link name=organization}}</strong>
{{#organization}}
<strong>{{.}}</strong>
{{/organization}}
{{#url}}
<a href="{{.}}">{{formatURL .}}</a>
{{/url}}
</div>
</header> </header>
{{#summary}} {{#summary}}
{{{markdown .}}} {{{markdown .}}}

View File

@ -12,14 +12,7 @@
{{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}} {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
</span> </span>
</div> </div>
<div class="spaced-list"> <strong>{{> link}}</strong>
{{#name}}
<strong>{{.}}</strong>
{{/name}}
{{#url}}
<a href="{{.}}">{{formatURL .}}</a>
{{/url}}
</div>
</header> </header>
{{#summary}} {{#summary}}
{{{markdown .}}} {{{markdown .}}}

View File

@ -194,7 +194,7 @@ blockquote > * + * {
justify-content: space-between; justify-content: space-between;
} }
.spaced-list:first-child::before { .spaced-list::before {
border-bottom: 1px solid var(--color-muted); border-bottom: 1px solid var(--color-muted);
content: ''; content: '';
flex-grow: 1; flex-grow: 1;

View File

@ -210,7 +210,7 @@ blockquote > * + * {
justify-content: space-between; justify-content: space-between;
} }
.spaced-list:first-child::before { .spaced-list::before {
border-bottom: 1px solid var(--color-muted); border-bottom: 1px solid var(--color-muted);
content: ''; content: '';
flex-grow: 1; flex-grow: 1;
@ -318,10 +318,7 @@ blockquote > * + * {
<time datetime="2014-12-01">Dec 2014</time> <time datetime="2014-12-01">Dec 2014</time>
</span> </span>
</div> </div>
<div class="spaced-list"> <strong><a href="http://piedpiper.example.com">Pied Piper</a></strong>
<strong>Pied Piper</strong>
<a href="http://piedpiper.example.com">piedpiper.example.com</a>
</div>
</header> </header>
<p>Pied Piper is a multi-platform technology based on a proprietary universal compression algorithm that has consistently fielded high Weisman Scores that are not merely competitive, but approach the theoretical limit of lossless compression.</p> <p>Pied Piper is a multi-platform technology based on a proprietary universal compression algorithm that has consistently fielded high Weisman Scores that are not merely competitive, but approach the theoretical limit of lossless compression.</p>
<ul> <ul>
@ -344,10 +341,7 @@ blockquote > * + * {
<time datetime="2013-01-01">Jan 2013</time> <time datetime="2013-01-01">Jan 2013</time>
</span> </span>
</div> </div>
<div class="spaced-list"> <strong><a href="http://coderdojo.example.com/">CoderDojo</a></strong>
<strong>CoderDojo</strong>
<a href="http://coderdojo.example.com/">coderdojo.example.com</a>
</div>
</header> </header>
<p>Global movement of free coding clubs for young people.</p> <p>Global movement of free coding clubs for young people.</p>
<ul> <ul>
@ -362,16 +356,13 @@ blockquote > * + * {
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>University of Oklahoma</h4> <h4><a href="https://www.ou.edu/">University of Oklahoma</a></h4>
<span> <span>
<time datetime="2011-06-01">Jun 2011</time> <time datetime="2011-06-01">Jun 2011</time>
<time datetime="2014-01-01">Jan 2014</time> <time datetime="2014-01-01">Jan 2014</time>
</span> </span>
</div> </div>
<div class="spaced-list">
<strong>Information Technology</strong> <strong>Information Technology</strong>
<a href="https://www.ou.edu/">www.ou.edu</a>
</div>
</header> </header>
<p>Bachelor</p> <p>Bachelor</p>
<h5>Courses</h5> <h5>Courses</h5>
@ -388,19 +379,16 @@ blockquote > * + * {
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>Miss Direction</h4> <h4><a href="missdirection.example.com">Miss Direction</a></h4>
<span> <span>
<time datetime="2016-08-24">Aug 2016</time> <time datetime="2016-08-24">Aug 2016</time>
<time datetime="2016-08-24">Aug 2016</time> <time datetime="2016-08-24">Aug 2016</time>
</span> </span>
</div> </div>
<div class="spaced-list">
<span> <span>
<strong>Team lead, Designer</strong> <strong>Team lead, Designer</strong>
at <strong>Smoogle</strong> at <strong>Smoogle</strong>
</span> </span>
<a href="missdirection.example.com">missdirection.example.com</a>
</div>
</header> </header>
<p>A mapping engine that misguides you</p> <p>A mapping engine that misguides you</p>
<ul> <ul>
@ -420,11 +408,9 @@ blockquote > * + * {
<h4>Digital Compression Pioneer Award</h4> <h4>Digital Compression Pioneer Award</h4>
<time datetime="2014-11-01">Nov 2014</time> <time datetime="2014-11-01">Nov 2014</time>
</div> </div>
<div class="spaced-list"> <span>
<div>
Awarded by <strong>Techcrunch</strong> Awarded by <strong>Techcrunch</strong>
</div> </span>
</div>
</header> </header>
<p>There is no spoon.</p> <p>There is no spoon.</p>
</article> </article>
@ -436,15 +422,12 @@ blockquote > * + * {
<article> <article>
<header> <header>
<div class="spaced-list"> <div class="spaced-list">
<h4>Video compression for 3d media</h4> <h4><a href="http://en.wikipedia.org/wiki/Silicon_Valley_(TV_series)">Video compression for 3d media</a></h4>
<time datetime="2014-10-01">Oct 2014</time> <time datetime="2014-10-01">Oct 2014</time>
</div> </div>
<div class="spaced-list">
<span> <span>
Published by <strong>Hooli</strong> Published by <strong>Hooli</strong>
</span> </span>
<a href="http://en.wikipedia.org/wiki/Silicon_Valley_(TV_series)">en.wikipedia.org/wiki/Silicon_Valley_(TV_series)</a>
</div>
</header> </header>
<p>Innovative middle-out compression algorithm that changes the way we store data.</p> <p>Innovative middle-out compression algorithm that changes the way we store data.</p>
</article> </article>