diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss index 2bd344b..5d14068 100644 --- a/css/modules/_footnotes.scss +++ b/css/modules/_footnotes.scss @@ -16,7 +16,6 @@ line-height: calc(var(--baseline)*0.8); padding-left: var(--indent); position: relative; - font-weight: 600; &::marker{ display: none; diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 4304e1c..e3181b4 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -5,8 +5,8 @@ margin-top: 36px; margin-bottom: 20mm; - bleed: 6mm; - marks: crop; + // bleed: 6mm; + // marks: crop; } @page:left { margin-left: 18mm; diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 0695543..b4ebe6b 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -44,7 +44,7 @@ blockquote{ margin-top: calc(var(--baseline)*0.5); margin-bottom: calc(var(--baseline)*0.5); font-size: 12px; - color: #343434; + // color: #343434; } @@ -63,6 +63,12 @@ blockquote + ol + p{ border-left: 4px solid #efefef; box-decoration-break: clone; padding-left: calc(var(--indent)*0.5); + + font-weight: 500; + // color: #343434; + strong{ + font-weight: 900; + } } diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 18aac84..1006951 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -1,5 +1,5 @@ :root{ - --font: 'Akkurat Std', sans-serif; + --font: 'Moulin', sans-serif; --font-serif: 'Edgar', sans-serif; --font-title: 'Allium Rounded', sans-serif; --font-sans: 'Allium Rounded', sans-serif; diff --git a/css/style.css b/css/style.css index 78bb725..41c3a93 100644 --- a/css/style.css +++ b/css/style.css @@ -1,6 +1,6 @@ @charset "UTF-8"; :root { - --font: "Akkurat Std", sans-serif; + --font: "Moulin", sans-serif; --font-serif: "Edgar", sans-serif; --font-title: "Allium Rounded", sans-serif; --font-sans: "Allium Rounded", sans-serif; @@ -36,8 +36,6 @@ body { size: 176mm 240mm; margin-top: 36px; margin-bottom: 20mm; - bleed: 6mm; - marks: crop; } @page :left { margin-left: 18mm; @@ -220,7 +218,6 @@ blockquote { margin-top: calc(var(--baseline) * 0.5); margin-bottom: calc(var(--baseline) * 0.5); font-size: 12px; - color: #343434; } .these + ol + p, @@ -234,6 +231,10 @@ blockquote + ol + p { -webkit-box-decoration-break: clone; box-decoration-break: clone; padding-left: calc(var(--indent) * 0.5); + font-weight: 500; +} +.these strong { + font-weight: 900; } ol[type="1"] { @@ -411,7 +412,6 @@ section h1:first-of-type { line-height: calc(var(--baseline) * 0.8); padding-left: var(--indent); position: relative; - font-weight: 600; } .inline-note::marker { display: none; diff --git a/css/style.css.map b/css/style.css.map index 1cd0617..2b8c73b 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/index.html b/index.html index 888a588..c1688ff 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,8 @@ - + +