0.2.1-alpha

Fix CSS Fix Toggle rawscript error
tanghoong · Oct 10, 2021 · f6b8f75 · f6b8f75
1 parent c5c2003
commit f6b8f75
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 13 deletions.
diff --git a/src/ChatBlock.php b/src/ChatBlock.php
@@ -96,7 +96,10 @@ public function feed($rawData='')
                         { // Lines that not match with standard, only work in single colon as index
                             if(!in_array($tempArray[0],$this->narratorList))
                             {
-                                array_push($chat['warnings'],$tempArray[0]);
+                                // array_push($chat['warnings'],$tempArray[0]);
+                                $tempLine['name']  = 'p';
+                                $tempLine['sentence']   = $tempArray[0];
+                                array_push($chat['lines'],$tempLine);
                             }
                         }
                     }// colon loop
@@ -423,10 +426,9 @@ private function render_rawdata($dialogue, $rawData)
     }
     private function render_rawdata_full($dialogue, $rawData)
     {
-        // $your_array = explode("\n", $rawData);
-        // $arr = explode("\n", $your_array);
+        $ts = time();
         $tempHtml  = '<div class="readingStory-changes well margin-top-2x padding-sm rawscript-chatblock-container">';
-        $tempHtml .= '<a class="btn btn-default btn-xs" data-toggle="collapse" data-target="#readingStory-changes-chatblock">显示原始对话剧本</a>';
+        $tempHtml .= '<a class="btn btn-default btn-xs" data-toggle="collapse" data-target="#readingStory-changes-chatblock-'.$ts.'">显示原始对话剧本</a>';
         if(isset($this->settings->allowForkScript))
         {
             $tempHtml .= '<div id="rawscript-chatblock-editor" class="rawscript-chatblock-editor">';
@@ -436,7 +438,7 @@ private function render_rawdata_full($dialogue, $rawData)
             $tempHtml .= '</div>';
             $tempHtml .= '</form>';
         }
-        $tempHtml .= '<pre id="readingStory-changes-chatblock" class="margin-top-lg collapse"><code>'.($rawData).'</code></pre>';
+        $tempHtml .= '<pre id="readingStory-changes-chatblock-'.$ts.'" class="margin-top-lg collapse"><code>'.($rawData).'</code></pre>';
         $tempHtml .= '</div>';
         return $tempHtml;
     }
@@ -456,14 +458,14 @@ private function render_text($dialogue)
     {
         $sentence  = $this->fn_filter($dialogue['sentence']);
         $tempHtml  = '<div class="imessage">';
-        $tempHtml .= '<p class="comment">'.$sentence.'</p>';
+        $tempHtml .= '<p class="comment-full">'.$sentence.'</p>';
         $tempHtml .= '</div>';
         return $tempHtml;
     }
     private function render_heading($dialogue)
     {
         $link = $this->fn_valid_link($dialogue['sentence']);
-        $tempHtml   = '<div class="imessage">';
+        $tempHtml   = '<div class="imessage text-center">';
         $tempHtml  .= '<'.strtolower($dialogue['name']).'>';
         $tempHtml  .= $dialogue['sentence'];
         $tempHtml  .= '</'.strtolower($dialogue['name']).'>';
@@ -690,5 +692,10 @@ private function loadChatHeaderImg($castName)
         }
         return false; // If not match
     }
+    // https://stackoverflow.com/questions/18254566/file-get-contents-seems-to-add-extra-returns-to-the-data
+    private function convertEOL($string, $to = "\n")
+    {   
+        return preg_replace("/\r\n|\r|\n/", $to, $string);
+    }
 } // EOF
 ?>
diff --git a/src/chatblock.css b/src/chatblock.css
@@ -7,7 +7,7 @@
 }
 
 .chatblock .imessage {
-    background-color: #fff;
+    /* background-color: #fff; */
     /* border: 1px solid #e5e5ea; */
     border-radius: 0.25rem;
     display: flex;
@@ -16,6 +16,7 @@
     font-size: inherit;
     margin: 0 auto;
     max-width: 600px;
+    /* padding: 0.5rem 1.5rem; */
   }
 
   .chatblock .imessage p {
@@ -44,6 +45,26 @@
     background-color: #666;
     color: #fff; 
   }
+/* 
+  .chatblock p.from-me {
+    background: linear-gradient(to bottom, #57B2FF, #0086F8);
+    box-shadow: 0px 5px 20px 1px;
+    position:relative;
+  }
+  
+  .chatblock p.from-me:after {
+    content:"";
+    display:block;
+    width:50%;
+    height:50%;
+    background: black;
+    position:absolute;
+    bottom:0px;
+    left:50%;
+    transform:translateX(-50%);
+    z-index:-1;
+    box-shadow: 0px 5px 80px 0px;
+  } */
 
   /* .chatblock p.from-me::before {
     border-bottom-left-radius: 0.8rem 0.7rem;
@@ -66,11 +87,13 @@
   }
 
   .chatblock p.from-me ~ p.from-me {
-    margin: 0.25rem 0 0;
+    /* margin: 0.25rem 0 0; */
+    margin: 0;
   }
 
   .chatblock p.from-me ~ p.from-me:not(:last-child) {
-    margin: 0.25rem 0 0;
+    /* margin: 0.25rem 0 0; */
+    margin: 0;
   }
 
   .chatblock p.from-me ~ p.from-me:last-child {
@@ -169,7 +192,12 @@
     width: 100%;
     padding: 0;
   }
-
+
+  .chatblock .comment-full {
+    max-width: 100% !important;
+    width: 100%;
+  }
+
   @media screen and (max-width: 800px) {
 
     .chatblock .container {
@@ -180,7 +208,7 @@
       font-size: inherit;
       margin: 0 auto;
       max-width: 600px;
-      padding: 0.25rem 0.875rem;
+      padding: 0.15rem 0.875rem;
     }
 
     .chatblock .imessage p {
@@ -221,8 +249,17 @@
     text-align: left;
 }
 
-.chatblock .imessage .text-center{
+.chatblock .imessage .text-center,
+.chatblock .imessage h1,
+.chatblock .imessage h2,
+.chatblock .imessage h3,
+.chatblock .imessage h4,
+.chatblock .imessage h5,
+.chatblock .imessage h6
+{
   text-align: center;
+  margin: 0.5em;
+  color: #AAA;
 }
 
 .chatblock .imessage .text-bold{