Fix futanari

8 files changed, 48 insertions, 31 deletions

diff --git a/static/css/txt/bbs.css b/static/css/txt/bbs.css
index ec7fd9d..160552b 100644
--- a/static/css/txt/bbs.css
+++ b/static/css/txt/bbs.css
@@ -4,6 +4,9 @@
   -webkit-box-sizing: border-box;
   word-wrap: break-word;
 }
+@font-face {
+  font-family: "Bookman";
+}
 body,
 textarea {
   font-family: arial, helvetica, sans-serif;
@@ -31,7 +34,7 @@ h5 {
 h2 {
   font-size: 1em;
   margin: 0 0 0.5em;
-  line-height: 1.3em;
+  line-height: 1.2em;
 }
 h2 a {
   font-size: 1.5em;
diff --git a/static/css/txt/futanari.css b/static/css/txt/futanari.css
index 29d7264..e9529d1 100644
--- a/static/css/txt/futanari.css
+++ b/static/css/txt/futanari.css
@@ -1,7 +1,15 @@
+@font-face {
+  font-family: "Bookman";
+  src: local("Bookman"), local("URW Bookman"), url("/static/font/bookman-mix.woff2");
+}
 body {
   background: #21323f;
   color: #fff;
 }
+body,
+textarea {
+  font-family: "Bookman";
+}
 a,
 #n2 {
   color: #dfca89;
@@ -24,9 +32,6 @@ h5 {
   margin: -7px -7px 7px;
   padding: 7px;
 }
-h2 {
-  margin-bottom: 0;
-}
 h2 a,
 h2 a:hover,
 h3,
@@ -78,11 +83,10 @@ input[type="file"] {
 .cur_brd:before {
   content: "◆";
 }
-#titlebox {
-  margin-bottom: 0;
-  border-bottom: 0;
-}
 .outerbox,
+.innerbox,
+#threadlist a,
+.mainpage .thread,
 .replies,
 .thread .postform,
 .threadpage .postform,
@@ -93,33 +97,30 @@ input[type="file"] {
   border-left: 1px solid #5e8db4;
   border-bottom: 1px solid #10181f;
   border-right: 1px solid #10181f;
-  box-shadow: 1px 1px #000;
 }
-#threadbox {
-  border-top: 0;
-  margin-top: 0;
+.outerbox,
+.mainpage .thread,
+.threadpage .replies,
+.threadpage .postform,
+#q-p {
+  box-shadow: 1px 1px #000;
 }
 .outerbox {
   background: #476a88;
   color: #d3f8d3;
 }
-.outerbox .innerbox,
-#createbox .innerbox {
-  margin: 0;
-}
 #bailinks {
   background: #5b8bb4;
-  padding: 8px;
 }
 #threadlist {
-  background: #476a88;
   border: 1px solid #38546c;
+  border-right: 0;
 }
 #threadlist a {
   border-right: 1px solid #38546c;
   border-bottom: 1px solid #38546c;
 }
-.reply,
+.replies,
 .postform,
 #createbox .innerbox {
   background: #476a88;
@@ -127,13 +128,13 @@ input[type="file"] {
 h4 {
   background: #38546c;
   color: #999;
-  padding: 1px;
+  padding: 1px 2px;
 }
 h4:hover {
   background: #324b60;
 }
 .reply.deleted h4 {
-  color: #666;
+  color: #777;
 }
 .del a,
 .abbrev {
@@ -177,12 +178,25 @@ form .msg {
 }
 
 @media (max-width: 600px) {
+  h1,
+  h5 {
+    margin: -3px -3px 0;
+    padding: 3px;
+  }
+  .outerbox,
+  .thread {
+    padding: 1px;
+  }
   .innerbox {
     margin: 0;
-    padding: 0;
+    padding: 1px;
   }
   .outerbox .innerbox {
-    padding: 7px;
+    padding: 4px;
+  }
+  #threadlinks {
+    margin-bottom: 4px;
+    text-align: center;
   }
   .postform {
     padding: 4px !important;
@@ -191,6 +205,6 @@ form .msg {
     margin-bottom: 0;
   }
   #createbox .innerbox {
-    padding: 0.5em !important;
+    padding: 4px 4px 0 !important;
   }
 }
diff --git a/static/css/txt/void.css b/static/css/txt/void.css
index 5c935f2..7dce928 100644
--- a/static/css/txt/void.css
+++ b/static/css/txt/void.css
@@ -43,7 +43,7 @@ h4,
 .name,
 .trip,
 .date,
-.posterid,
+.hash,
 .del a,
 .pblock,
 .postform span,
diff --git a/static/example/bbs1.html b/static/example/bbs1.html
index f569fc6..93d2ab9 100644
--- a/static/example/bbs1.html
+++ b/static/example/bbs1.html
@@ -29,15 +29,15 @@
   <h2><span>[1:3]</span><a href="#">Hilo de ejemplo</a></h2>
   <div class="replies">
     <div class="reply">
-      <h4>1 : <span class="name"><b>Sin Nombre</b></span> : <span class="date">01/09/93(mie)00:26:56</span> <span class="hash">ID:BdsM7DCu0</span></h4>
+      <h4>1 : <span class="name">Sin Nombre</span> : <span class="date">01/09/93(mie)00:26:56</span> <span class="hash">ID:BdsM7DCu0</span></h4>
       <div class="msg">Mensaje de ejemplo.</div>
     </div>
     <div class="reply">
-      <h4>2 : <span class="name"><b>Sin Nombre</b> ◆Tripcode</span> : <span class="date">01/09/93(mie)00:30:40</span> <span class="hash">ID:pBCyve6z0</span></h4>
+      <h4>2 : <span class="name">Sin Nombre</span> <span class="trip">◆Tripcode</span> : <span class="date">01/09/93(mie)00:30:40</span> <span class="hash">ID:pBCyve6z0</span></h4>
       <div class="msg">Mensaje de ejemplo.</div>
     </div>
     <div class="reply">
-      <h4>3 : <a href="#"><span class="name"><b>Sin Nombre</b></span></a> : <span class="date">01/09/93(mie)01:02:10</span> <span class="hash">ID:UpB2akifa</span></h4>
+      <h4>3 : <a href="#" class="email"><span class="name">Sin Nombre</span></a> : <span class="date">01/09/93(mie)01:02:10</span> <span class="hash">ID:UpB2akifa</span></h4>
       <div class="msg">Mensaje de ejemplo.</div>
     </div>
   </div>
diff --git a/static/example/bbs2.html b/static/example/bbs2.html
index b5b86bf..218eee7 100644
--- a/static/example/bbs2.html
+++ b/static/example/bbs2.html
@@ -21,15 +21,15 @@
   <h3>Hilo de ejemplo <span>(3 respuestas)</span></h3>
   <div class="replies">
     <div class="reply">
-      <h4>1 : <span class="name"><b>Sin Nombre</b></span> : <span class="date">01/09/93(mie)00:26:56</span> <span class="hash">ID:BdsM7DCu0</span></h4>
+      <h4>1 : <span class="name">Sin Nombre</span> : <span class="date">01/09/93(mie)00:26:56</span> <span class="hash">ID:BdsM7DCu0</span></h4>
       <div class="msg">Mensaje de ejemplo.</div>
     </div>
     <div class="reply">
-      <h4>2 : <span class="name"><b>Sin Nombre</b> ◆Tripcode</span> : <span class="date">01/09/93(mie)00:30:40</span> <span class="hash">ID:pBCyve6z0</span></h4>
+      <h4>2 : <span class="name">Sin Nombre</span> <span class="trip">◆Tripcode</span> : <span class="date">01/09/93(mie)00:30:40</span> <span class="hash">ID:pBCyve6z0</span></h4>
       <div class="msg">Mensaje de ejemplo.</div>
     </div>
     <div class="reply">
-      <h4>3 : <a href="#"><span class="name"><b>Sin Nombre</b></span></a> : <span class="date">01/09/93(mie)01:02:10</span> <span class="hash">ID:UpB2akifa</span></h4>
+      <h4>3 : <a href="#" class="email"><span class="name">Sin Nombre</span></a> : <span class="date">01/09/93(mie)01:02:10</span> <span class="hash">ID:UpB2akifa</span></h4>
       <div class="msg">Mensaje de ejemplo.</div>
     </div>
   </div>
diff --git a/static/css/bookman-light.woff2 b/static/font/bookman-light.woff2
index 5186a19..5186a19 100644
--- a/static/css/bookman-light.woff2
+++ b/static/font/bookman-light.woff2
diff --git a/static/font/bookman-mix.woff2 b/static/font/bookman-mix.woff2
new file mode 100644
index 0000000..6c8ef5a
--- /dev/null
+++ b/static/font/bookman-mix.woff2
diff --git a/static/css/bookman.woff2 b/static/font/bookman.woff2
index 732c7d0..732c7d0 100644
--- a/static/css/bookman.woff2
+++ b/static/font/bookman.woff2