diff --git a/maquette-tests/assets/css/base/_body.scss b/maquette-tests/assets/css/base/_body.scss index 07aa304..147de94 100644 --- a/maquette-tests/assets/css/base/_body.scss +++ b/maquette-tests/assets/css/base/_body.scss @@ -16,8 +16,8 @@ a { // } body { - --font-size: 12px; - --baseline: 17px; + --font-size: 14px; + --baseline: 20px; font-family: var(--font); font-size: var(--font-size); line-height: var(--baseline); diff --git a/maquette-tests/assets/css/base/_layout.scss b/maquette-tests/assets/css/base/_layout.scss index a99b44d..774530f 100644 --- a/maquette-tests/assets/css/base/_layout.scss +++ b/maquette-tests/assets/css/base/_layout.scss @@ -18,8 +18,8 @@ } @page:left{ - margin-left: 35mm; - margin-right: 30mm; + margin-left: 25mm; + margin-right: 25mm; @bottom-left-corner{ content: counter(page); @include running(); @@ -38,8 +38,8 @@ } @page:right{ - margin-left: 30mm; - margin-right: 35mm; + margin-left: 25mm; + margin-right: 25mm; @bottom-right-corner{ content: counter(page); @include running(); diff --git a/maquette-tests/assets/css/base/_var.scss b/maquette-tests/assets/css/base/_var.scss index 07ae9c3..85e78f2 100644 --- a/maquette-tests/assets/css/base/_var.scss +++ b/maquette-tests/assets/css/base/_var.scss @@ -1,6 +1,6 @@ :root{ - --font: 'Wagram Slab', serif; + --font: 'ITC Cheltenham', serif; // --font: 'HAL Timezone', serif; --mono: 'Selectric Mono', monospace; // --mono: 'HAL Timezone Mono', monospace; @@ -15,4 +15,9 @@ --green:black; --blue: black; + --indent: 7mm; + + --font-size: 14px; + --baseline: 18px; + } \ No newline at end of file diff --git a/maquette-tests/assets/css/modules/_notes.scss b/maquette-tests/assets/css/modules/_notes.scss index ca5f597..3fe302c 100644 --- a/maquette-tests/assets/css/modules/_notes.scss +++ b/maquette-tests/assets/css/modules/_notes.scss @@ -1,4 +1,6 @@ .inline-note{ + + display: none!important; color: var(--green); // break-inside: avoid; diff --git a/maquette-tests/assets/css/modules/_text.scss b/maquette-tests/assets/css/modules/_text.scss index f1709ff..7e42f63 100644 --- a/maquette-tests/assets/css/modules/_text.scss +++ b/maquette-tests/assets/css/modules/_text.scss @@ -2,10 +2,12 @@ p{ - text-align: justify; - hyphens: auto; + // text-align: justify; + // hyphens: auto; position: relative; color: var(--blue); + font-weight: 200; + letter-spacing: 0.01rem; // &::before{ @@ -20,19 +22,10 @@ } p + p{ - left: 14mm; - text-indent: 7mm; - // &::before{ - // left: -19mm; - // } + text-indent: var(--indent); + } -p + p + p{ - left: 7mm; -// &::before{ -// left: -13mm; -// } -} @@ -40,13 +33,15 @@ h3{ margin-top: calc(var(--baseline)*1.5); margin-bottom: calc(var(--baseline)*0.5); text-align: center; - font-weight: normal; - text-decoration: underline; - font-family: var(--mono); + font-weight: 200; + // text-decoration: underline; + // font-family: var(--mono); text-transform: uppercase; color: var(--blue); max-width: 18ch; - margin-inline: auto; + // margin-inline: auto; + letter-spacing: 0.05rem; + // &::before{ // content: ''; @@ -67,18 +62,20 @@ blockquote p{ } blockquote{ - position: relative; - left: 14mm; - p{ - font-size: 16px; - line-height: calc(var(--baseline)*1.25); - font-weight: 300; + // position: relative; + // left: 14mm; + // p{ + // font-size: 16px; + // line-height: calc(var(--baseline)*1.25); + // font-weight: 300; - } + // } + + padding-left: var(--indent); - // margin-top: calc(var(--baseline)*2); - // margin-bottom: calc(var(--baseline)*2); + margin-top: calc(var(--baseline)*2); + margin-bottom: calc(var(--baseline)*2); } diff --git a/maquette-tests/assets/css/style.css b/maquette-tests/assets/css/style.css index f6cf000..2b83f8e 100644 --- a/maquette-tests/assets/css/style.css +++ b/maquette-tests/assets/css/style.css @@ -2,7 +2,7 @@ @import url("https://fonts.googleapis.com/css2?family=Literata:ital,opsz,wght@0,7..72,200..900;1,7..72,200..900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Vollkorn:ital,wght@0,400..900;1,400..900&display=swap"); :root { - --font: "Wagram Slab", serif; + --font: "ITC Cheltenham", serif; --mono: "Selectric Mono", monospace; --note: "Routed Gothic", serif; --red: #9B0000; @@ -12,6 +12,9 @@ --red: black; --green:black; --blue: black; + --indent: 7mm; + --font-size: 14px; + --baseline: 18px; } * { @@ -28,8 +31,8 @@ a { } body { - --font-size: 12px; - --baseline: 17px; + --font-size: 14px; + --baseline: 20px; font-family: var(--font); font-size: var(--font-size); line-height: var(--baseline); @@ -44,8 +47,8 @@ body { marks: crop; } @page :left { - margin-left: 35mm; - margin-right: 30mm; + margin-left: 25mm; + margin-right: 25mm; @bottom-left-corner { content: counter(page); font-family: var(--mono); @@ -65,8 +68,8 @@ body { } } @page :right { - margin-left: 30mm; - margin-right: 35mm; + margin-left: 25mm; + margin-right: 25mm; @bottom-right-corner { content: counter(page); font-family: var(--mono); @@ -310,39 +313,28 @@ body { } .chapter p { - text-align: justify; - -webkit-hyphens: auto; - hyphens: auto; position: relative; color: var(--blue); + font-weight: 200; + letter-spacing: 0.01rem; } .chapter p + p { - left: 14mm; - text-indent: 7mm; -} -.chapter p + p + p { - left: 7mm; + text-indent: var(--indent); } .chapter h3 { margin-top: calc(var(--baseline) * 1.5); margin-bottom: calc(var(--baseline) * 0.5); text-align: center; - font-weight: normal; - text-decoration: underline; - font-family: var(--mono); + font-weight: 200; text-transform: uppercase; color: var(--blue); max-width: 18ch; - margin-inline: auto; + letter-spacing: 0.05rem; } .chapter blockquote { - position: relative; - left: 14mm; -} -.chapter blockquote p { - font-size: 16px; - line-height: calc(var(--baseline) * 1.25); - font-weight: 300; + padding-left: var(--indent); + margin-top: calc(var(--baseline) * 2); + margin-bottom: calc(var(--baseline) * 2); } .chapter > :first-child { margin-top: 0px; @@ -353,6 +345,7 @@ body { } .inline-note { + display: none !important; color: var(--green); float: left; clear: both; diff --git a/maquette-tests/assets/css/style.css.map b/maquette-tests/assets/css/style.css.map index 4530196..c011db4 100644 --- a/maquette-tests/assets/css/style.css.map +++ b/maquette-tests/assets/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["base/_type.scss","base/_var.scss","style.css","base/_body.scss","base/_layout.scss","base/_type-specimen.scss","modules/_text.scss","modules/_notes.scss","modules/_chapter-header.scss","modules/_item-decor.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["base/_type.scss","base/_var.scss","style.css","base/_body.scss","base/_layout.scss","base/_type-specimen.scss","modules/_text.scss","modules/_notes.scss","modules/_chapter-header.scss","modules/_item-decor.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/maquette-tests/index.html b/maquette-tests/index.html index 84c5d74..869333f 100644 --- a/maquette-tests/index.html +++ b/maquette-tests/index.html @@ -12,6 +12,7 @@ + diff --git a/pdf-print/Cheltenham-200_14-18.pdf b/pdf-print/Cheltenham-200_14-18.pdf new file mode 100644 index 0000000..fce1089 Binary files /dev/null and b/pdf-print/Cheltenham-200_14-18.pdf differ diff --git a/pdf-print/Cheltenham-200_14-20.pdf b/pdf-print/Cheltenham-200_14-20.pdf new file mode 100644 index 0000000..285932e Binary files /dev/null and b/pdf-print/Cheltenham-200_14-20.pdf differ diff --git a/pdf-print/Cheltenham_12:17.pdf b/pdf-print/Cheltenham_12:17.pdf new file mode 100644 index 0000000..a2f2c1c Binary files /dev/null and b/pdf-print/Cheltenham_12:17.pdf differ