update

huidetang · Jul 5, 2024 · 9872f67 · 9872f67
1 parent 68e2e36
commit 9872f67
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 32 deletions.
diff --git a/backcover.xhtml b/backcover.xhtml
@@ -9,7 +9,7 @@
 </head>
 <body>
   <section class="backcover" id="backcover" role="doc-backcover">
-    <img src="images/backcover.png" />
+    <img src="images/backcover.png" class="max" />
   </section>
 </body>
 </html>
diff --git a/colophon.xhtml b/colophon.xhtml
@@ -9,7 +9,7 @@
 </head>
 <body>
   <section class="colophon" id="colophon" role="doc-colophon">
-    <img src="images/colophon.png" />
+    <img src="images/colophon.png" class="max" />
   </section>
 </body>
 </html>
diff --git a/config-vivliostyle.yml b/config-vivliostyle.yml
@@ -1,10 +1,10 @@
 inherit: ["config.yml"]
 stylesheet: vivliostyle-a6.css
 cover: null
-coverimage: null
-titlepage: true
-titlefile: title.xhtml
-colophon: null
+coverimage: cover.xhtml
+titlepage: false
+# titlefile: title.xhtml
+colophon: colophon.xhtml
 backcover: null
 # catalogfile: catalog.yml
 bookname: book

diff --git a/cover.xhtml b/cover.xhtml
@@ -9,7 +9,7 @@
 </head>
 <body>
   <section class="cover" id="cover" role="doc-cover">
-    <img src="images/title.png" />
+    <img src="images/title.png" class="max" />
   </section>
 </body>
 </html>
diff --git a/sass/common/_contents.scss b/sass/common/_contents.scss
@@ -36,23 +36,23 @@ figure > img[src$='.jpeg'] {
   image-resolution: 350dpi;
 }
 
-p > img, div > img {
+p > img, div > img, section > img {
   width: auto;
   max-width: $content-width;
   max-height: $content-height;
 }
 
 /* 奥付 */
-.colophon {
-  font-size: 7pt;
-  // 3行空け
-  margin-block-start: $base-line-height * 3;
-
-  p {
-    text-indent: 0;
-    hanging-punctuation: none;
-  }
-}
+// .colophon {
+//   font-size: 7pt;
+//   // 3行空け
+//   margin-block-start: $base-line-height * 3;
+
+//   p {
+//     text-indent: 0;
+//     hanging-punctuation: none;
+//   }
+// }
 
 /* 改ページ */
 .page-break {
@@ -86,13 +86,7 @@ p > img, div > img {
 }
 
 /* 表紙 */
-.cover, .title, .backcover {
-  margin: 0 !important;
-  img {
-    max-width: 100vw !important;
-    max-height: 100vh !important;
-  }
-}
+
 
 /* 3行あける */
 .line-03 {
@@ -114,9 +108,11 @@ div.note, div.memo, div.tip, div.info, div.warning, div.important, div.caution,
 }
 
 img.max {
-  margin: 0;
-  width: 100%;
-  height: 100vh;
+  margin: 0 !important;
+  max-width: 100vw;
+  width: auto;
+  max-height: 100vh;
+  height: auto;
 }
 
 pre {

diff --git a/sass/common/_format.scss b/sass/common/_format.scss
@@ -83,7 +83,10 @@ html {
 }
 
 @page cover {
-  margin: 0 !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  margin-right: 0 !important;
+  margin-left: 0 !important;
 
   @top-left {
     content: none;
@@ -107,7 +110,10 @@ html {
 }
 
 @page title {
-  margin: 0 !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  margin-right: 0 !important;
+  margin-left: 0 !important;
 
   @top-left {
     content: none;
@@ -144,20 +150,36 @@ html {
 }
 
 @page colophon {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  margin-right: 0 !important;
+  margin-left: 0 !important;
+
   @top-left {
     content: none;
   }
   @top-right {
     content: none;
   }
+
+  @right-middle {
+    content: none;
+  }
+
+  @left-middle {
+    content: none;
+  }
 }
 
 .backcover {
   page: backcover;
 }
 
 @page backcover {
-  margin: 0 !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  margin-right: 0 !important;
+  margin-left: 0 !important;
 
   @top-left {
     content: none;

diff --git a/title.xhtml b/title.xhtml
@@ -9,7 +9,7 @@
 </head>
 <body>
   <section class="title" id="title" role="doc-title">
-    <img src="images/title.png" />
+    <img src="images/title.png" class="max" />
   </section>
 </body>
 </html>