Commit 0fafc2e8 authored by julien's avatar julien
Browse files

Merge branch 'editoria-v2' into 'master'

Editoria update

See merge request pagedjs-templates/atla!1
parents 1ee55088 8d831319
......@@ -267,8 +267,8 @@ body{
word-spacing:-0.1px;
font-variant-ligatures:common-ligatures;
}
ul + p, ol + p, h1 + p, h2 + p, h3 + p, h4 + p, h5 + p, h6 + p{
text-indent:0;
ul + p, ol + p, h1 + p, h2 + p, h3 + p, h4 + p, h5 + p, h6 + p, .author + p{
--text-indent:0;
}
ul,
ol,
......@@ -291,6 +291,9 @@ li{
p.sc-continuous-paragraph, li.sc-continuous-paragraph{
text-indent:0;
}
li{
text-align-:left;
}
hr{
height:var(--font-lineHeight);
margin:0;
......@@ -308,7 +311,6 @@ hr::before{
content:"* * *";
text-align:center;
margin:0;
}
hr + p{
text-indent:var(--text-indent);
......@@ -318,13 +320,14 @@ 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;
}
blockquote em,blockquote cite{
font-style:normal;
blockquote em{
font-style:italic;
}
blockquote cite{
font-style:normal;
line-height:0;
margin-left:0.5em;
font-weight:400;
......@@ -353,7 +356,13 @@ blockquote p:first-of-type{
line-height:0;
}
.component-front a:not(.note-callout), .component-body a:not(.note-callout), .component-back a: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);
}
.component-front a:not(.note-callout)::after, .component-body a:not(.note-callout)::after, .component-back a:not(.note-callout)::after{
......@@ -383,7 +392,6 @@ i{
line-height:0;
}
em{
}
.small-caps{
font-family:var(--font-body-small-caps);
......@@ -407,7 +415,6 @@ ul.notes[data-split-from]{
.contrib{
margin-bottom:var(--font-lineHeight);
text-indent:0;
}
.contrib strong{
font-variant:all-small-caps;
......@@ -422,14 +429,52 @@ span[lang="ja"]{
}
.jap-in{
text-justify:inter-word;
}
.emdash{
letter-spacing:1px;
}
.unnumbered-notes li, .part-notes li, .component-notes li{
.unnumbered-notes li, .part-notes li, .component-notes li,.citedWorks{
text-align:left;
}
.citedWorks{
--text-indent:4ch;
text-indent:calc(var(--text-indent) * -1 );
margin-left:var(--text-indent);
widows:2;
orphans:2;
}
.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;
}
.answer::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);
}
.contributors p strong{
margin-right:0;
}
h1,
h2,
h3,
......@@ -486,33 +531,35 @@ header{
}
:not(.appendix) header + p.double-story:first-letter, :not(.appendix) header + p.double-story:first-letter, :not(.contributors) header + p.double-story:first-letter{
}
.component-front header + p:first-line, .component-body header + p:first-line{
font-family:var(--font-body-small-caps);
}
.component-front header + p::first-letter, .component-body header + p::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;
}
h2 + p{
text-indent:0;
.sep + .dropcap{
margin-top:calc(var(--font-lineHeight) * 6);
}
header + h2 + p:first-line{
.dropcap:not([data-split-from]){
--text-indent:0;
margin-top:calc(var(--font-lineHeight) * 3);
}
.dropcap:not([data-split-from]):first-line{
}
header + h2 + p::first-letter{
.dropcap:not([data-split-from])::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;
}
h2 + p{
text-indent:0;
}
:root{
--font-scale:1.618;
}
......@@ -621,20 +668,21 @@ header .sep,
padding:var(--font-lineHeight);
width:55ch;
text-align:left;
}
header .ct + blockquote{
margin-top:144px;
}
header .author{
text-transform:uppercase;
margin-top:var(--font-lineHeight);
hyphens:none;
text-align:left;
font-family:var(--font-sans);
}
header .author,p.start{
text-indent:0;
.author{
text-transform:uppercase;
margin-top:var(--font-lineHeight);
margin-bottom:var(--font-lineHeight);
hyphens:none;
text-align:left;
font-family:var(--font-sans);
}
.author,p.start{
text-indent:0;
}
header blockquote.sep{
width:100%;
......@@ -667,6 +715,7 @@ img{
width:100%;
height:auto;
max-height:calc(var(--font-lineHeight) * 20);
margin-bottom:calc(var(--font-lineHeight) / 2);
object-fit:contain;
}
......@@ -705,13 +754,31 @@ page:fullpage;
height:;
}
ol, ul{
margin-left:40px;
margin-left:20px;
padding-top:calc(var(--font-lineHeight) / 2);
padding-bottom:9px;
text-align:left;
}
ol ul, ul ul{
margin-left:10px;
text-align:left;
list-style-type:disc;
}
ol ul li, ul ul li{
break-inside:avoid;
}
ol ul li ul, ul ul li ul{
margin-left:0;
list-style-type:"> ";
}
ol ul li::before, ul ul li::before{
content:none;
}
li{
text-indent:0;
hyphens:auto;
text-align:left;
}
ol[data-split-from], ul[data-split-from]{
padding-top:calc(var(--font-lineHeight) / 2) !important;
......@@ -739,14 +806,6 @@ ol li::before{
text-align:right;
font-variant-numeric:oldstyle-nums;
}
.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;
}
......@@ -844,35 +903,6 @@ body{
padding-top:0;
padding-bottom:0;
}
.title *{
hyphens:none;
}
.title{
page:title;
}
.title 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);
}
.title p{
text-indent:0;
line-height:var(--font-lineHeight);
}
.title .author{
font-size:1em;
text-indent:0;
text-transform:uppercase;
}
.title .author + p{
margin-top:calc(var(--font-lineHeight) * 2);
text-transform:uppercase;
}
.title img{
}
.block-appendix{
background:rgb(240, 240, 240);
box-shadow:0 0 0 4px rgb(220, 220, 220);
......@@ -1143,7 +1173,7 @@ blockquote[data-split-from]{
}
@bottom-right{
content:element(right);
content:element(left);
text-align:right;
font-size:1em;
font-style:italic;
......@@ -1166,17 +1196,19 @@ blockquote[data-split-from]{
hyphens:none;
}
@page toc:right{
background:white;
@bottom-left{
content:none;
}
}
@page toc:left{
background:white;
@bottom-right{
content:none;
}
}
.toc header{
min-height:unset;
min-height:calc(var(--font-lineHeight) * 5);
}
.toc .ct::before{
content:none;
......@@ -1193,7 +1225,7 @@ blockquote[data-split-from]{
font-weight:400;
font-style:italic;
position:relative;
margin-bottom:calc(var(--font-lineHeight) / 3);
margin-bottom:calc(var(--font-lineHeight));
text-align:left;
}
.toc ol li em, .toc ul li em{
......@@ -1204,7 +1236,7 @@ blockquote[data-split-from]{
text-align-last:justify;
width:calc(100% - 1em);
margin-left:0;
bottom:0;
bottom:3px;
position:absolute;
color:grey;
}
......@@ -1242,6 +1274,8 @@ blockquote[data-split-from]{
z-index:2000;
background:var(--color-paper);
padding-left:2ch;
bottom:-1px;
position:relative;
}
.toc ol .toc-front a::after, .toc ol .toc-back a::after, .toc ul .toc-front a::after, .toc ul .toc-back a::after{
}
......@@ -1264,7 +1298,6 @@ blockquote[data-split-from]{
background:var(--color-paper);
padding-right:2ch;
align-self:stretch;
}
.toc li a .name{
background:white;
......@@ -1281,6 +1314,29 @@ blockquote[data-split-from]{
.toc [data-split-from] li{
margin-top:0;
}
.toc a:not(.note-callout), .toc a:not(.note-callout), .toc a:not(.note-callout){
background:none;
color:inherit;
}
.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;
}
.cover{
page:cover;
}
......@@ -1421,14 +1477,52 @@ blockquote[data-split-from]{
}
.pub img{
}
.title{
.titlepage{
page:title;
}
.title .pub{
.titlepage *{
hyphens:none;
}
.titlepage .pub{
position:absolute;
bottom:-90px;
right:-80px;
width:80%;
}
.titlepage p{
margin:0;
text-indent:0;
text-align:left;
}
.titlepage .publisher{
margin-top:var(--font-lineHeight);
text-transform:uppercase;
}
.titlepage header{
min-height:unset;
}
.titlepage header .cst{
margin:0;
margin-bottom:var(--font-lineHeight);
margin-top:var(--font-lineHeight);
font-size:1.6em;
line-height:1.3;
}
.titlepage .author{
text-transform:uppercase;
font-size:1em;
text-indent:0;
margin-top:var(--font-lineHeight);
margin-bottom:var(--font-lineHeight);
text-indent:0;
hyphens:none;
text-align:left;
font-family:inherit;
}
@page title{
@bottom-center{
......@@ -1441,14 +1535,20 @@ blockquote[data-split-from]{
content:none;
}
}
.titlepage .author + p{
margin-top:calc(var(--font-lineHeight) * 2);
text-transform:uppercase;
}
.copyright{
page:copyright;
position:absolute;
bottom:4px;
max-width:70%;
font-size:0.8em;
}
.copyright h1, .copyright h2, .copyright h3{
display:none;
}
@page copyright{
@bottom-center{
content:none;
......@@ -1503,8 +1603,6 @@ h2{
font-style:normal;
}
}
.contributors{
}
......
This diff is collapsed.
......@@ -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;
}