Commit 0fafc2e8 authored by julien's avatar julien

Merge branch 'editoria-v2' into 'master'

Editoria update

See merge request pagedjs-templates/atla!1
parents 1ee55088 8d831319
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -51,7 +51,7 @@
@import "modules/page-copyright.css";
@import "modules/page-dedication.css";
@import "modules/page-appendix.css";
@import "modules/specific-book2.css";
/* @import "modules/specific-book2.css"; */
......
@import 'modules/reset.css';
@import "modules/fonts.css";
@import "modules/vars.css";
@import "modules/body.css";
@import "modules/header.css";
@import "modules/pictures.css";
@import "modules/list.css";
@import "modules/table.css";
@import "modules/numbering.css";
@import "modules/copyright.css";
@import "modules/dedication.css";
@import "modules/notes.css";
@import "modules/appendix.css";
@import "modules/specific.css";
@import "modules/appendix.css";
/* hack for stuff not implemented yet */
@import "interface/hack.css";
\ No newline at end of file
......@@ -14,9 +14,11 @@ h2,
h3,
h4,
h5,
h6 {
h6,
.author {
& + p {
text-indent: 0;
--text-indent: 0;
/* text-indent: 0; */
}
}
......@@ -45,6 +47,9 @@ li {
}
}
li {
text-align-: left;
}
hr {
height: var(--font-lineHeight);
margin: 0;
......@@ -63,7 +68,6 @@ hr {
content: "* * *";
text-align: center;
margin: 0;
}
& + p {
......@@ -76,12 +80,11 @@ blockquote {
line-height: var(--font-lineHeight);
padding-bottom: calc(var(--font-lineHeight) / 2);
padding-left: 39px;
font-style: italic;
font-style: normal;
font-weight: 400;
em {
font-style: normal;
font-style: italic;
}
cite {
......@@ -124,7 +127,13 @@ blockquote {
/* color: #E65A3A; */
&:not(.note-callout) {
background: linear-gradient(to bottom, var(--link-background) 0, var(--link-background) 95%, var(--color-secondary) 95%, var(--color-secondary) 100%);
background: linear-gradient(
to bottom,
var(--link-background) 0,
var(--link-background) 95%,
var(--color-secondary) 95%,
var(--color-secondary) 100%
);
color: var(--color-secondary);
&::after {
......@@ -166,7 +175,6 @@ i {
}
em {
}
.small-caps {
/* font-variant: all-small-caps; */
......@@ -214,7 +222,6 @@ ul.notes[data-split-from] {
font-weight: bold;
font-size: 1.3em;
}
}
p.contrib.start:first-letter {
......@@ -227,24 +234,72 @@ p.contrib.start:first-line {
/* japan text */
span[lang="ja"] {
font-style: normal;
}
.jap-in {
text-justify: inter-word;
}
.emdash {
letter-spacing: 1px;
}
.unnumbered-notes, .part-notes, .component-notes {
.unnumbered-notes,
.part-notes,
.component-notes {
li {
text-align: left;
}
}
\ No newline at end of file
}
.citedWorks {
--text-indent: 4ch;
text-indent: calc(var(--text-indent) * -1 );
margin-left: var(--text-indent);
/* break-inside: avoid; */
widows: 2;
orphans: 2;
text-align: left;
}
.pageBreak {
break-after: page;
color: transparent;
height: 0;
position: absolute;
left: -1000px;
}
.Question {
text-indent: 0;
margin-top: var(--font-lineHeight);
break-after: avoid;
}
.answer {
margin-left: 22px;
text-indent: 0;
&::before {
content: "▢";
position: absolute;
text-indent: 0em;
margin-left: -2em;
font-family: sans-serif;
font-weight: 400;
font-size: 0.9em;
}
}
.contributors {
p {
--text-indent: 0;
margin-top: var(--font-lineHeight);
strong {
/* text-transform: uppercase; */
margin-right: 0;
/* font-weight: 400; */
}
}
}
......@@ -4,7 +4,7 @@
src:url(../fonts/NotoSerifJP-Regular.woff2) format("woff2");
font-style:normal;
font-weight:400;
unicode-range: 4E009FFF;
unicode-range: 4E009FFF;
}
@font-face {
......@@ -12,9 +12,23 @@
src:url(../fonts/NotoSerifJP-Regular.woff2) format("woff2");
font-style:italic;
font-weight:400;
unicode-range: 4E009FFF;
unicode-range: 4E009FFF;
}
@font-face {
font-family:"Noto Sans Tibetan";
src:url(../fonts/NotoSansTibetan-Regular.ttf);
font-style:normal;
font-weight:400;
unicode-range: 0F000FFF;
}
@font-face {
font-family:"Noto Sans Tibetan";
src:url(../fonts/NotoSansTibetan-Bold.ttf);
font-style:normal;
font-weight:600;
unicode-range: 0F000FFF;
}
@font-face {
font-family: "Linguistics Pro";
src: url(../fonts/LinguisticsPro-Regular.otf);
......
......@@ -76,71 +76,45 @@ header {
}
}
.component-front,
.component-body {
header + p {
&:first-line {
font-family: var(--font-body-small-caps);
/* font-variant: all-small-caps; */
/* font-feature-settings: 'c2sc' on, 'smcp' on; */
/* text-transform: uppercase; */
/* font-weight: 400; */
/* letter-spacing: 0.2em; */
}
&::first-letter {
font-family: var(--font-body);
font-size: 7em;
position: relative;
color: var(--primary);
font-style: italic;
font-weight: 600;
text-transform: uppercase;
line-height: 0.8;
display: inline-block;
font-variant: none;
float: left;
margin-left: -16px;
border: 2px solid #0000;
margin-right: 14px;
margin-top: -20px;
/* margin-bottom: 0; */
}
}
}
h2 + p {
text-indent: 0;
.sep + .dropcap {
margin-top: calc(var(--font-lineHeight) * 6);
}
header + h2 + p {
/* text-indent: var(--text-indent); */
.dropcap:not([data-split-from]) {
--text-indent: 0;
margin-top: calc(var(--font-lineHeight) * 3);
&:first-line {
/* font-variant: all-small-caps;
/* font-family: var(--font-body-small-caps);
font-variant: all-small-caps;
font-feature-settings: "c2sc" on, "smcp" on;
text-transform: uppercase;
font-weight: 400;
letter-spacing: 0.2em;
color: var(--primary); */
letter-spacing: 0.2em; */
}
&::first-letter {
/* font-size: 7em;
font-family: var(--font-body);
font-size: 7em;
position: relative;
color: var(--primary);
font-style: italic;
font-weight: 600;
text-transform: lowercase;
text-transform: uppercase;
line-height: 0.8;
height: 0px;
display: inline-block;
font-variant: none;
float: left;
margin-left: -16px;
border: 2px solid #0000;
margin-right: 14px;
margin-top: -10px; */
margin-top: -20px;
}
}
h2 + p {
text-indent: 0;
}
:root {
--font-scale: 1.618;
}
......@@ -254,8 +228,6 @@ header blockquote:last-child {
margin-bottom: 72px;
}
header {
cite {
display: block;
......@@ -286,7 +258,6 @@ header {
/* padding-left: 40px; */
width: 55ch;
text-align: left;
}
.ct + blockquote {
......@@ -294,15 +265,15 @@ header {
}
}
header {
.author {
text-transform: uppercase;
margin-top: var(--font-lineHeight);
text-indent: 0;
hyphens: none;
text-align: left;
font-family: var(--font-sans);
}
.author {
text-transform: uppercase;
margin-top: var(--font-lineHeight);
margin-bottom: var(--font-lineHeight);
text-indent: 0;
hyphens: none;
text-align: left;
font-family: var(--font-sans);
}
p.start {
......@@ -350,4 +321,4 @@ header blockquote.sep {
text-indent: 0;
font-style: italic;
}
}
\ No newline at end of file
}
......@@ -82,7 +82,7 @@
@bottom-right {
/* content: string(booktitle); */
content: element(right);
content: element(left);
/* content: string(chaptertitle); */
text-align: right;
font-size: 1em;
......
ol, ul {
margin-left: 40px;
margin-left: 20px;
padding-top: calc(var(--font-lineHeight) / 2);
padding-bottom: 9px;
text-align: left;
ul {
margin-left: 10px;
text-align: left;
list-style-type: disc;
li {
break-inside: avoid;
ul {
margin-left: 0;
list-style-type: "> ";
}
}
li::before {
content: none;
}
}
}
li {
text-indent: 0;
hyphens: auto;
text-align: left;
}
ol[data-split-from], ul[data-split-from] {
......@@ -51,15 +69,9 @@ ol {
}
}
.bibliography-entry {
text-indent: calc(var(--text-indent) * -1 );
margin-left: var(--text-indent);
break-inside: avoid;
widows: 2;
orphans: 2;
text-align: left;
}
ul ul {
break-before: avoid;
}
\ No newline at end of file
}
......@@ -4,7 +4,9 @@
bottom: 4px;
max-width: 70%;
font-size: 0.8em;
h1, h2, h3 {
display: none;
}
}
@page copyright {
......
.title {
.titlepage {
* {
hyphens: none;
}
page: title;
.pub {
position: absolute;
......@@ -6,10 +10,35 @@
right: -80px;
width: 80%;
}
p {
margin: 0;
text-indent: 0;
text-align: left;
}
.publisher{
margin-top: var(--font-lineHeight);
text-transform: uppercase;
}
header {
min-height: unset;
.cst {
margin: 0;
margin-bottom: var(--font-lineHeight);
margin-top: var(--font-lineHeight);
font-size: 1.6em;
line-height: 1.3;
}
}
.author {
text-transform: uppercase;
}
}
@page title {
/* background: orange; */
@bottom-center {
content: none;
}
......@@ -22,3 +51,29 @@
}
.titlepage {
.author {
font-size: 1em;
text-indent: 0;
text-transform: uppercase;
margin-top: var(--font-lineHeight);
margin-bottom: var(--font-lineHeight);
text-indent: 0;
hyphens: none;
text-align: left;
font-family: inherit;
}
.author + p {
margin-top: calc(var(--font-lineHeight) * 2);
text-transform: uppercase;
}
}
......@@ -8,12 +8,14 @@
}
@page toc:right {
background: white;
/* background: red; */
@bottom-left {
content: none;
}
}
@page toc:left {
background: white;
/* background: red; */
@bottom-right {
content: none;
......@@ -21,7 +23,7 @@
}
.toc header {
min-height: unset;
min-height: calc(var(--font-lineHeight) * 5);
}
.toc .ct::before {
......@@ -41,7 +43,7 @@
font-weight: 400;
font-style: italic;
position: relative;
margin-bottom: calc(var(--font-lineHeight) / 3);
margin-bottom: calc(var(--font-lineHeight));
text-align: left;
em {
font-style: normal;
......@@ -52,7 +54,7 @@
width: calc(100% - 1em);
margin-left: 0;
/* height: 3px; */
bottom: 0;
bottom: 3px;
/* background: red; */
position: absolute;
color: grey;
......@@ -101,6 +103,8 @@
background: var(--color-paper);
padding-left: 2ch;
/* left: 95px; */
bottom: -1px;
position: relative;
}
}
.toc-front,
......@@ -141,7 +145,6 @@
background: var(--color-paper);
padding-right: 2ch;
align-self: stretch;
}
.name {
background: white;
......@@ -160,4 +163,34 @@
.toc [data-split-from] li {
margin-top: 0;
}
\ No newline at end of file
}
.toc a:not(.note-callout), .toc a:not(.note-callout), .toc a:not(.note-callout) {
background: none;
color: inherit;
}
/* hack to support numbering in the toc */
.toc {
counter-reset: toc-chapter;
}
.toc-chapter {
counter-increment: toc-chapter;
}
.toc-chapter a .name::before {
content: counter(toc-chapter) ". ";
align-self: flex-start;
width: 3ch;
}
.toc-component a .name::before,
.toc-unnumbered a .name::before,
.toc-contributors a .name::before,
.toc-appendix a .name::before {
content: " ";
width: 3ch;
align-self: flex-start;
}
......@@ -5,6 +5,7 @@ img {
/* height: calc(var(--font-lineHeight) * 17); */
height: auto;
max-height: calc(var(--font-lineHeight) * 20);
/* max-height: calc(var(--font-lineHeight) * 10); */
/* margin-top: calc(var(--font-lineHeight) / 2); */
......
.contributors {
p {
margin-top: var(--font-lineHeight);
strong {
text-transform: uppercase;
margin-left: 4ch;
}
}
}
\ No newline at end of file
.title {
* {
hyphens: none;
}
}
.title {
page: title;
/* color: yellow; */
h2 {
margin-top: calc(var(--font-lineHeight) * 3);
margin-left: 0;
text-indent: 0;
font-style: italic;
font-size: 40px;
line-height: calc(var(--font-lineHeight) * 2.3);
}
p {
text-indent: 0;
line-height: var(--font-lineHeight);
}
.author {
font-size: 1em;
text-indent: 0;
text-transform: uppercase;
}
.author + p {
margin-top: calc(var(--font-lineHeight) * 2);
text-transform: uppercase;
}
img {
/* width: 100%;
position: relative;
z-index: 202;
top: 22px; */
}
}
......@@ -22,7 +22,7 @@
/* --color-baseline: transparent; */
/* fonts for the book */
--font-body: "Linguistics Pro", serif;
--font-body: "Noto Sans Tibetan", "Linguistics Pro", serif;
--font-body-small-caps: "Linguistics Pro smallcaps";
--font-sans: "Karla";
/* --font-alternate: "Alegreya Sans"; */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment