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..588c773 100644
--- a/css/modules/_layout.scss
+++ b/css/modules/_layout.scss
@@ -5,12 +5,12 @@
margin-top: 36px;
margin-bottom: 20mm;
- bleed: 6mm;
- marks: crop;
+ // bleed: 6mm;
+ // marks: crop;
}
@page:left {
- margin-left: 18mm;
- margin-right: 26mm;
+ margin-left: 14mm;
+ margin-right: 24mm;
@bottom-left {
content: counter(page);
font-family: var(--font-title);
@@ -24,8 +24,8 @@
// }
}
@page:right {
- margin-left: 26mm;
- margin-right: 18mm;
+ margin-left: 24mm;
+ margin-right: 14mm;
@bottom-right {
content: counter(page);
font-family: var(--font-title);
@@ -44,7 +44,7 @@
transform: rotate(90deg);
text-align: left;
position: relative;
- left: 14mm;
+ left: 11mm;
padding-left: 5px;
}
@@ -90,5 +90,7 @@
#section__content{
break-before: right;
-
-}
\ No newline at end of file
+ margin-left: 24mm;
+}
+
+
\ No newline at end of file
diff --git a/css/modules/_text.scss b/css/modules/_text.scss
index 0695543..550d452 100644
--- a/css/modules/_text.scss
+++ b/css/modules/_text.scss
@@ -39,13 +39,10 @@ ol[type="1"] + p{
blockquote{
font-family: var(--font-serif);
padding-left: calc(var(--indent)*1);
- padding-right: calc(var(--indent)*1);
- // font-size: var(--fs-small);
+ padding-right: calc(var(--indent)*1);
margin-top: calc(var(--baseline)*0.5);
margin-bottom: calc(var(--baseline)*0.5);
- font-size: 12px;
- color: #343434;
-
+ font-size: 13px;
}
@@ -63,6 +60,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;
+ }
}
@@ -94,9 +97,9 @@ ol[type="1"]{
li::before{
font-size: var(--fs-small);
content: "¶";
- color: #d7d7d7;
+ color: #bebebe;
position: relative;
- top: -1px;
+ top: -2px;
}
diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss
index 3d8fa16..db33c98 100644
--- a/css/modules/_titles.scss
+++ b/css/modules/_titles.scss
@@ -1,6 +1,5 @@
#section__content{
- margin-left: 28mm;
h1, h2, h3 {
&::before{
diff --git a/css/modules/_var.scss b/css/modules/_var.scss
index 18aac84..c768265 100644
--- a/css/modules/_var.scss
+++ b/css/modules/_var.scss
@@ -1,12 +1,12 @@
: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;
- --font-size: 11px;
- --fs-small: 8.5px;
+ --font-size: 12px;
+ --fs-small: 9.5px;
--fs-num: 14px;
- --baseline: 16px;
+ --baseline: 18px;
--indent: 26px;
}
diff --git a/css/style.css b/css/style.css
index 78bb725..845573f 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,13 +1,13 @@
@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;
- --font-size: 11px;
- --fs-small: 8.5px;
+ --font-size: 12px;
+ --fs-small: 9.5px;
--fs-num: 14px;
- --baseline: 16px;
+ --baseline: 18px;
--indent: 26px;
}
@@ -36,12 +36,10 @@ body {
size: 176mm 240mm;
margin-top: 36px;
margin-bottom: 20mm;
- bleed: 6mm;
- marks: crop;
}
@page :left {
- margin-left: 18mm;
- margin-right: 26mm;
+ margin-left: 14mm;
+ margin-right: 24mm;
@bottom-left {
content: counter(page);
font-family: var(--font-title);
@@ -50,8 +48,8 @@ body {
}
}
@page :right {
- margin-left: 26mm;
- margin-right: 18mm;
+ margin-left: 24mm;
+ margin-right: 14mm;
@bottom-right {
content: counter(page);
font-family: var(--font-title);
@@ -69,7 +67,7 @@ body {
transform: rotate(90deg);
text-align: left;
position: relative;
- left: 14mm;
+ left: 11mm;
padding-left: 5px;
}
}
@@ -177,6 +175,7 @@ body {
#section__content {
-moz-column-break-before: right;
break-before: right;
+ margin-left: 24mm;
}
sup {
@@ -219,8 +218,7 @@ blockquote {
padding-right: calc(var(--indent) * 1);
margin-top: calc(var(--baseline) * 0.5);
margin-bottom: calc(var(--baseline) * 0.5);
- font-size: 12px;
- color: #343434;
+ font-size: 13px;
}
.these + ol + p,
@@ -234,6 +232,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"] {
@@ -254,14 +256,11 @@ ol[type="1"]::after {
ol[type="1"] li::before {
font-size: var(--fs-small);
content: "¶";
- color: #d7d7d7;
+ color: #bebebe;
position: relative;
- top: -1px;
+ top: -2px;
}
-#section__content {
- margin-left: 28mm;
-}
#section__content h1::before, #section__content h2::before, #section__content h3::before {
content: attr(data-counter);
}
@@ -411,7 +410,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..5873723 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":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,iCAAA;EACA,0CAAA;EACA,yCAAA;EACA,iBAAA;EACA,iBAAA;EACA,cAAA;EACA,gBAAA;EAEA,cAAA;ADCJ;;AEXA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFcJ;;AEZA;EACI,mBAAA;AFeJ;;AEZA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFaJ;;AG/BA;EACI;IACI,iBAAA;IAEA,gBAAA;IACA,mBAAA;EHiCN;EG5BE;IACI,iBAAA;IACA,kBAAA;IACA;MACI,sBAAA;MACA,8BAAA;MACA,gBAAA;MACA,wBAAA;IH8BR;EACF;EGvBE;IACI,iBAAA;IACA,kBAAA;IACA;MACI,sBAAA;MACA,8BAAA;MACA,gBAAA;MACC,wBAAA;IHyBT;IGvBI;MACI,+BAAA;MACA,8BAAA;MACA,mBAAA;MAEA,0BAAA;MACA,iCAAA;MACA,oBAAA;MACA,WAAA;MACA,wBAAA;MACA,gBAAA;MACA,kBAAA;MACA,UAAA;MACA,iBAAA;IHwBR;EACF;EGrBE;IACI;MAAmB,aAAA;IHwBvB;IGvBI;MAAY,aAAA;IH0BhB;IGzBI;MAAc,aAAA;IH4BlB;IG3BI;MAAa,aAAA;IH8BjB;IG7BI;MAAoB,aAAA;IHgCxB;IG/BI;MAAY,aAAA;IHkChB;IGjCI;MAAe,aAAA;IHoCnB;IGnCI;MAAe,aAAA;IHsCnB;IGrCI;MAAa,aAAA;IHwCjB;IGvCI;MAAgB,aAAA;IH0CpB;IGzCI;MAAgB,aAAA;IH4CpB;IG3CI;MAAsB,aAAA;IH8C1B;IG7CI;MAAe,aAAA;IHgDnB;IG/CI;MAAiB,aAAA;IHkDrB;IGjDI;MAAgB,aAAA;IHoDpB;IGnDI;MAAuB,aAAA;IHsD3B;EACF;EGrDE;IACI;MAAmB,aAAA;IHwDvB;IGvDI;MAAY,aAAA;IH0DhB;IGzDI;MAAc,aAAA;IH4DlB;IG3DI;MAAa,aAAA;IH8DjB;IG7DI;MAAoB,aAAA;IHgExB;IG/DI;MAAY,aAAA;IHkEhB;IGjEI;MAAe,aAAA;IHoEnB;IGnEI;MAAe,aAAA;IHsEnB;IGrEI;MAAa,aAAA;IHwEjB;IGvEI;MAAgB,aAAA;IH0EpB;IGzEI;MAAgB,aAAA;IH4EpB;IG3EI;MAAsB,aAAA;IH8E1B;IG7EI;MAAe,aAAA;IHgFnB;IG/EI;MAAiB,aAAA;IHkFrB;IGjFI;MAAgB,aAAA;IHoFpB;IGnFI;MAAuB,aAAA;IHsF3B;EACF;AACF;AGnFA;EACI,+BAAA;OAAA,mBAAA;EACA,iBAAA;AHqFJ;;AIjLA;EACI,cAAA;AJoLJ;;AIjLA;EACI,YAAA;EACA,uBAAA;AJoLJ;;AIjLA;EACI,mBAAA;EACA,qBAAA;AJoLJ;;AIjLA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;AJoLJ;;AIjLA;EACI,qBAAA;UAAA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;AJoLJ;;AI9KA;;EAEI,sCAAA;AJiLJ;;AI5KA;EACI,8BAAA;EACA,qCAAA;EACA,sCAAA;EACA,uCAAA;EACA,0CAAA;EACA,eAAA;AJ+KJ;;AI3KA;;EAEI,gBAAA;AJ8KJ;;AIzKA;EAGI,wCAAA;EACA,8BAAA;EACA,mCAAA;UAAA,2BAAA;EACA,uCAAA;EAEA,gBAAA;AJyKJ;AIvKI;EACI,gBAAA;AJyKR;;AIpKA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;EAEA,kBAAA;EACA,SAAA;EAEA,aAAA;EACA,WAAA;AJqKJ;AInKI;EACI,oBAAA;EAGA,0BAAA;EACA,WAAA;AJmKR;AI1JI;EACI,0BAAA;EACA,YAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;AJ4JR;;AK7PQ;EACI,2BAAA;ALgQZ;AK3PQ;EACI,gCAAA;AL6PZ;AKxPI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ALyPR;AKxPQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;AL0PZ;AKtPK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ALuPR;AKtPQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ALwPZ;AKlPI;;;;;;EAMI,cAAA;ALoPR;AK3OI;EACI,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,wCAAA;EACA,kBAAA;EACA,2CAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;AL6OR;AK5OQ;EACI,kBAAA;EACA,OAAA;AL8OZ;AKrOI;EACI,8BAAA;EACA,gBAAA;EACA,eAAA;EACA,sCAAA;EAGA,sCAAA;EACA,kBAAA;EACA,2CAAA;EACA,4CAAA;EACQ,qCAAA;ALqOhB;AKpOQ;EAEI,kBAAA;EACA,OAAA;ALqOZ;AKjOI;EACI,8BAAA;EACA,gBAAA;EACA,iBAAA;EACA,sCAAA;EACA,sCAAA;EACA,kBAAA;EACA,2CAAA;EACA,4CAAA;EACA,8CAAA;UAAA,sCAAA;EACA,0BAAA;EAEI,qCAAA;ALkOZ;AKzNK;EACG,8BAAA;EACA,gBAAA;EACA,iBAAA;EACA,sCAAA;EACA,qCAAA;EAEA,kBAAA;EACA,2CAAA;EACA,4CAAA;AL0NR;AKvNI;EACO,8BAAA;EACH,gBAAA;EACK,iBAAA;EACJ,uCAAA;EACA,4CAAA;EACA,WAAA;ALyNT;;AKjNA;EACQ,aAAA;ALoNR;;AKjNG;EACK,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,wCAAA;EAEA,kBAAA;EACA,2CAAA;EACA,yCAAA;EACA,qCAAA;EACA,kBAAA;ALmNR;AKhNQ;EASK,kBAAA;EACA,OAAA;EACA,sCAAA;AL0Mb;;AKpMI;EACI,0BAAA;ALuMR;;AMhYA;EACI;IACE,aAAA;IACA,qBAAA;ENmYJ;AACF;AMhYE;EACI,sCAAA;ANkYN;;AM/XA;EACE,eAAA;EACA,qBAAA;EACA,0BAAA;EACA,wCAAA;EACA,2BAAA;EACA,kBAAA;ANkYF;AMhYE;EACE,aAAA;EACA,WAAA;ANkYJ;;AM3XA;EACI,oCAAA;EACA,kBAAA;EACA,SAAA;AN8XJ;;AM1XA;EACE,wBAAA;EACA,0BAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;EACA,wCAAA;AN6XF;;AMzXA;EACI,wCAAA;AN4XJ;;AO1aA;EACI,aAAA;EACA,UAAA;AP6aJ","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 @@
-
+
+