Compare commits

...

26 Commits

Author SHA1 Message Date
Ludwig Schubert 6f7df48fc2 2.2.19 2017-12-04 16:50:48 -08:00
Ludwig Schubert 71450e9ba8 Fix crash when a citation has no authors in Meta tags transform 2017-12-04 16:50:39 -08:00
Shan Carter 6679b120ab 2.2.18 2017-12-01 15:38:42 -08:00
Shan Carter 8bff98944a merge 2017-12-01 15:38:31 -08:00
Shan Carter b4c8fdc56a No authors bugfix 2017-12-01 15:38:04 -08:00
Ludwig Schubert c75787615e 2.2.17 2017-12-01 15:23:52 -08:00
Shan Carter c2ef8e38c3 merge 2017-12-01 15:22:27 -08:00
Ludwig Schubert bfcff784b1 2.2.14 2017-12-01 15:10:21 -08:00
Ludwig Schubert 000fa088db Special case citations without authors 2017-12-01 15:09:23 -08:00
Shan Carter f221583de8 2.2.16 2017-11-22 16:35:20 -08:00
Shan Carter cddd538f9d merge 2017-11-22 16:35:03 -08:00
Shan Carter 6f95c37c2c Update d-title.css 2017-11-22 16:33:48 -08:00
Shan Carter db3af262f2 Update d-title.css 2017-11-22 16:27:13 -08:00
Shan Carter 184e094ae9 Update d-title.css 2017-11-22 16:26:35 -08:00
Shan Carter 5ede2dd9d0 2.2.15 2017-11-22 14:43:23 -08:00
Shan Carter 2a14b4c811 2.2.14 2017-11-22 14:42:57 -08:00
Shan Carter 350b6c6f67 Update styles-base.css 2017-11-22 14:42:07 -08:00
Shan Carter 49deb31aeb 2.2.13 2017-11-21 14:56:21 -08:00
Shan Carter b5a00b7f43 Fixing wrong/old version number 2017-11-21 14:56:16 -08:00
Shan Carter 0f8f0f5962 Merge 2017-11-21 14:53:38 -08:00
Shan Carter 094f0d4c58 2.2.11 2017-11-21 14:51:44 -08:00
Shan Carter cd4594f320 Fixing NaN !== NaN problem in d-slider.js 2017-11-21 14:51:35 -08:00
Ludwig Schubert be585691c5 2.2.12 2017-11-15 11:50:01 -08:00
Ludwig Schubert b25fd66fd7 Remove stray comment in CSS 2017-11-14 22:52:36 -08:00
Ludwig Schubert 010eed6280 2.2.11 2017-11-14 12:52:42 -08:00
Ludwig Schubert 3a643ab7ad Style fixes; moving away from contain: content to avoid cutting off hover boxes. 2017-11-14 12:52:34 -08:00
18 changed files with 96 additions and 63 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "distill-template", "name": "distill-template",
"version": "2.2.10", "version": "2.2.19",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "distill-template", "name": "distill-template",
"version": "2.2.10", "version": "2.2.19",
"description": "Template for creating Distill articles.", "description": "Template for creating Distill articles.",
"main": "dist/template.v2.js", "main": "dist/template.v2.js",
"bin": { "bin": {
@@ -12,7 +12,7 @@
"url": "https://github.com/distillpub/distill-template/issues" "url": "https://github.com/distillpub/distill-template/issues"
}, },
"scripts": { "scripts": {
"start": "rollup -c rollup.config.dev.js -w", "dev": "rollup -c rollup.config.dev.js -w",
"serve": "python3 -m http.server --bind 127.0.0.1 8888", "serve": "python3 -m http.server --bind 127.0.0.1 8888",
"test": "mocha", "test": "mocha",
"lint": "eslint", "lint": "eslint",
+1 -2
View File
@@ -1,11 +1,10 @@
import { Template } from '../mixins/template'; import { Template } from '../mixins/template';
import { body } from '../helpers/layout';
const T = Template('d-appendix', ` const T = Template('d-appendix', `
<style> <style>
d-appendix { d-appendix {
contain: content; contain: layout style;
font-size: 0.8em; font-size: 0.8em;
line-height: 1.7em; line-height: 1.7em;
margin-top: 60px; margin-top: 60px;
+1 -2
View File
@@ -2,8 +2,7 @@ import { bibliography_cite } from '../helpers/citation';
const styles = ` const styles = `
d-citation-list { d-citation-list {
contain: content; contain: layout style;
overflow: hidden;
} }
d-citation-list .references { d-citation-list .references {
+18 -1
View File
@@ -38,6 +38,21 @@ d-hover-box {
margin-top: 1.9em; margin-top: 1.9em;
} }
ul {
margin: 0;
padding: 0;
list-style-type: none;
}
ul li {
padding: 15px 10px 15px 10px;
border-bottom: 1px solid rgba(0,0,0,0.1)
}
ul li:last-of-type {
border-bottom: none;
}
</style> </style>
<d-hover-box id="hover-box"></d-hover-box> <d-hover-box id="hover-box"></d-hover-box>
@@ -106,7 +121,9 @@ export class Cite extends T(HTMLElement) {
set entries(entries) { set entries(entries) {
if (this.hoverBox) { if (this.hoverBox) {
this.hoverBox.innerHTML = entries.map(hover_cite).join('<br><br>'); this.hoverBox.innerHTML = `<ul>
${entries.map(hover_cite).map(html => `<li>${html}</li>`).join('\n')}
</ul>`;
} }
} }
+1 -2
View File
@@ -4,8 +4,7 @@ const T = Template('d-footnote-list', `
<style> <style>
d-footnote-list { d-footnote-list {
contain: content; contain: layout style;
overflow: hidden;
} }
d-footnote-list > * { d-footnote-list > * {
+2 -2
View File
@@ -20,6 +20,8 @@ const T = Template('d-hover-box', `
.panel { .panel {
position: absolute; position: absolute;
font-size: 1rem;
line-height: 1.5em;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
@@ -27,11 +29,9 @@ const T = Template('d-hover-box', `
background-color: rgb(250, 250, 250); background-color: rgb(250, 250, 250);
box-shadow: 0 0 7px rgba(0, 0, 0, 0.1); box-shadow: 0 0 7px rgba(0, 0, 0, 0.1);
border-radius: 4px; border-radius: 4px;
padding: 10px;
box-sizing: border-box; box-sizing: border-box;
} }
</style> </style>
<div class="container"> <div class="container">
+1 -1
View File
@@ -20,7 +20,7 @@ export function renderTOC(element, headings) {
<style> <style>
d-toc { d-toc {
contain: content; contain: layout style;
display: block; display: block;
} }
+1 -2
View File
@@ -3,8 +3,7 @@ import { serializeFrontmatterToBibtex } from '../helpers/bibtex';
const styles = ` const styles = `
<style> <style>
distill-appendix { distill-appendix {
contain: content; contain: layout style;
overflow: hidden;
} }
distill-appendix .citation { distill-appendix .citation {
+2 -6
View File
@@ -72,18 +72,14 @@ distill-header .nav a {
${logo} ${logo}
Distill Distill
</a> </a>
<div class="nav"> <nav class="nav">
<a href="/about/">About</a> <a href="/about/">About</a>
<a href="/prize/">Prize</a> <a href="/prize/">Prize</a>
<a href="/journal/">Submit</a> <a href="/journal/">Submit</a>
</div> </nav>
</div> </div>
`, false); `, false);
// <div class="nav">
// <a href="https://github.com/distillpub">GitHub</a>
// <!-- https://twitter.com/distillpub -->
// </div>
export class DistillHeader extends T(HTMLElement) { export class DistillHeader extends T(HTMLElement) {
+15 -5
View File
@@ -40,6 +40,7 @@ export function inline_cite_long(keys){
} }
function author_string(ent, template, sep, finalSep){ function author_string(ent, template, sep, finalSep){
if (ent.author == null) { return ''; }
var names = ent.author.split(' and '); var names = ent.author.split(' and ');
let name_strings = names.map(name => { let name_strings = names.map(name => {
name = name.trim(); name = name.trim();
@@ -114,13 +115,22 @@ function doi_string(ent, new_line){
} }
} }
function title_string(ent) {
return '<span class="title">' + ent.title + '</span> ';
}
export function bibliography_cite(ent, fancy){ export function bibliography_cite(ent, fancy){
if (ent){ if (ent){
var cite = '<span class="title">' + ent.title + '</span> '; var cite = title_string(ent);
cite += link_string(ent) + '<br>'; cite += link_string(ent) + '<br>';
cite += author_string(ent, '${L}, ${I}', ', ', ' and '); if (ent.author) {
if (ent.year || ent.date){ cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
cite += ', ' + (ent.year || ent.date) + '. '; if (ent.year || ent.date) {
cite += ', ';
}
}
if (ent.year || ent.date) {
cite += (ent.year || ent.date) + '. ';
} else { } else {
cite += '. '; cite += '. ';
} }
@@ -146,7 +156,7 @@ export function bibliography_cite(ent, fancy){
export function hover_cite(ent){ export function hover_cite(ent){
if (ent){ if (ent){
var cite = ''; var cite = '';
cite += '<b>' + ent.title + '</b>'; cite += '<strong>' + ent.title + '</strong>';
cite += link_string(ent); cite += link_string(ent);
cite += '<br>'; cite += '<br>';
+21 -7
View File
@@ -1,9 +1,9 @@
d-article { d-article {
contain: content; contain: layout style;
overflow-x: hidden;
border-top: 1px solid rgba(0, 0, 0, 0.1); border-top: 1px solid rgba(0, 0, 0, 0.1);
padding-top: 2rem; padding-top: 2rem;
color: rgba(0, 0, 0, 0.8); color: rgba(0, 0, 0, 0.8);
overflow: hidden;
} }
d-article > * { d-article > * {
@@ -169,14 +169,29 @@ d-article span.equation-mimic {
d-article > d-code, d-article > d-code,
d-article section > d-code { d-article section > d-code {
display: block; display: block;
overflow-x: scroll;
} }
d-article > d-math[block], d-article > d-math[block],
d-article section > d-math[block] { d-article section > d-math[block] {
display: block; display: block;
overflow-x: scroll; }
@media (max-width: 768px) {
d-article > d-code,
d-article section > d-code,
d-article > d-math[block],
d-article section > d-math[block] {
overflow-x: scroll;
-ms-overflow-style: none; // IE 10+
overflow: -moz-scrollbars-none; // Firefox
}
d-article > d-code::-webkit-scrollbar,
d-article section > d-code::-webkit-scrollbar,
d-article > d-math[block]::-webkit-scrollbar,
d-article section > d-math[block]::-webkit-scrollbar {
display: none; // Safari and Chrome
}
} }
d-article .citation { d-article .citation {
@@ -190,8 +205,7 @@ d-include {
} }
d-figure { d-figure {
contain: content; contain: layout style;
overflow: hidden;
} }
/* KaTeX */ /* KaTeX */
+2 -1
View File
@@ -1,6 +1,7 @@
d-byline { d-byline {
border-top: 1px solid rgba(0, 0, 0, 0.1);
contain: content; contain: content;
overflow: hidden;
border-top: 1px solid rgba(0, 0, 0, 0.1);
font-size: 0.8rem; font-size: 0.8rem;
line-height: 1.8em; line-height: 1.8em;
padding: 1.5rem 0; padding: 1.5rem 0;
+7 -13
View File
@@ -1,7 +1,7 @@
d-title { d-title {
padding: 2rem 0 1.5rem; padding: 2rem 0 1.5rem;
contain: content; contain: layout style;
overflow: hidden; overflow-x: hidden;
} }
@media(min-width: 768px) { @media(min-width: 768px) {
@@ -14,29 +14,23 @@ d-title h1 {
grid-column: text; grid-column: text;
font-size: 40px; font-size: 40px;
font-weight: 700; font-weight: 700;
line-height: 1.05em; line-height: 1.1em;
margin: 0 0 1rem; margin: 0 0 0.5rem;
} }
@media(min-width: 768px) { @media(min-width: 768px) {
d-title h1 { d-title h1 {
font-size: 60px; font-size: 50px;
} }
} }
d-title p { d-title p {
font-weight: 300; font-weight: 300;
font-size: 1.2rem; font-size: 1.2rem;
line-height: 1.7em; line-height: 1.55em;
grid-column: text; grid-column: text;
} }
@media(min-width: 768px) {
d-title p {
font-size: 1.5rem;
}
}
d-title .status { d-title .status {
margin-top: 0px; margin-top: 0px;
font-size: 12px; font-size: 12px;
@@ -52,4 +46,4 @@ d-title .status span {
border-bottom: 1px solid #80cbc4; border-bottom: 1px solid #80cbc4;
font-size: 11px; font-size: 11px;
text-transform: uppercase; text-transform: uppercase;
} }
+3 -2
View File
@@ -90,7 +90,7 @@ sub {
figure { figure {
position: relative; position: relative;
margin-bottom: 2.5em; margin-bottom: 2.5em;
margin-top: 2.5em; margin-top: 1.5em;
} }
figcaption+figure { figcaption+figure {
@@ -131,7 +131,8 @@ figcaption a {
color: rgba(0, 0, 0, 0.6); color: rgba(0, 0, 0, 0.6);
} }
figcaption b { figcaption b,
figcaption strong, {
font-weight: 600; font-weight: 600;
color: rgba(0, 0, 0, 1.0); color: rgba(0, 0, 0, 1.0);
} }
+1
View File
@@ -95,6 +95,7 @@ export default function(dom, data) {
} }
function author_string(ent, template, sep, finalSep){ function author_string(ent, template, sep, finalSep){
if (ent.author == null) { return ''; }
var names = ent.author.split(' and '); var names = ent.author.split(' and ');
let name_strings = names.map(name => { let name_strings = names.map(name => {
name = name.trim(); name = name.trim();
+15 -13
View File
@@ -124,26 +124,28 @@ function appendHtml(el, html) {
} }
function citation_meta_content(ref){ function citation_meta_content(ref){
// Special test for arxiv
var content = `citation_title=${ref.title};`; var content = `citation_title=${ref.title};`;
ref.author.split(' and ').forEach(name => { if (ref.author && ref.author !== '') {
name = name.trim(); ref.author.split(' and ').forEach(name => {
let last, firsts; name = name.trim();
if (name.indexOf(',') != -1){ let last, firsts;
last = name.split(',')[0].trim(); if (name.indexOf(',') != -1){
firsts = name.split(',')[1].trim(); last = name.split(',')[0].trim();
} else { firsts = name.split(',')[1].trim();
last = name.split(' ').slice(-1)[0].trim(); } else {
firsts = name.split(' ').slice(0,-1).join(' '); last = name.split(' ').slice(-1)[0].trim();
} firsts = name.split(' ').slice(0,-1).join(' ');
content += `citation_author=${firsts} ${last};`; }
}); content += `citation_author=${firsts} ${last};`;
});
}
if ('year' in ref) { if ('year' in ref) {
content += `citation_publication_date=${ref.year};`; content += `citation_publication_date=${ref.year};`;
} }
// Special test for arxiv
let arxiv_id_search = /https?:\/\/arxiv\.org\/pdf\/([0-9]*\.[0-9]*)\.pdf/.exec(ref.url); let arxiv_id_search = /https?:\/\/arxiv\.org\/pdf\/([0-9]*\.[0-9]*)\.pdf/.exec(ref.url);
arxiv_id_search = arxiv_id_search || /https?:\/\/arxiv\.org\/abs\/([0-9]*\.[0-9]*)/.exec(ref.url); arxiv_id_search = arxiv_id_search || /https?:\/\/arxiv\.org\/abs\/([0-9]*\.[0-9]*)/.exec(ref.url);
arxiv_id_search = arxiv_id_search || /arXiv preprint arXiv:([0-9]*\.[0-9]*)/.exec(ref.journal); arxiv_id_search = arxiv_id_search || /arXiv preprint arXiv:([0-9]*\.[0-9]*)/.exec(ref.journal);
+2 -1
View File
@@ -181,6 +181,7 @@ export class Slider extends T(HTMLElement) {
static get observedAttributes() {return ['min', 'max', 'value', 'step', 'ticks', 'origin', 'tickValues', 'tickLabels']; } static get observedAttributes() {return ['min', 'max', 'value', 'step', 'ticks', 'origin', 'tickValues', 'tickLabels']; }
attributeChangedCallback(attr, oldValue, newValue) { attributeChangedCallback(attr, oldValue, newValue) {
if (isNaN(newValue) || newValue === undefined || newValue === null) return;
if (attr == 'min') { if (attr == 'min') {
this.min = +newValue; this.min = +newValue;
this.setAttribute('aria-valuemin', this.min); this.setAttribute('aria-valuemin', this.min);
@@ -194,7 +195,7 @@ export class Slider extends T(HTMLElement) {
} }
if (attr == 'origin') { if (attr == 'origin') {
this.origin = +newValue; this.origin = +newValue;
this.update(this.value); // this.update(this.value);
} }
if (attr == 'step') { if (attr == 'step') {
if (newValue > 0) { if (newValue > 0) {