Merge branch 'tm2-dev' into tm2

system/typemill/Models/Content.php

@@ -204,19 +204,16 @@ class Content
         return $markdown;
 	}
 
-
 	public function markdownArrayToText(array $markdownArray)
 	{
 		return $this->parsedown->arrayBlocksToMarkdown($markdownArray);
 	}
 
-
 	public function markdownTextToArray(string $markdown)
 	{
 		return $this->parsedown->markdownToArrayBlocks($markdown);
 	}
 
-
 	public function getFirstImage(array $contentArray)
 	{
 		foreach($contentArray as $block)

system/typemill/Models/Storage.php

@@ -377,7 +377,7 @@ class Storage
 		return false;
 	}
 
-	public function publishImage($name, $noresize)
+	public function publishImage($name, $noresize = false)
 	{
 		$pathinfo = pathinfo($name);
 		if(!$pathinfo)

system/typemill/Models/Validation.php

@@ -502,7 +502,6 @@ class Validation
 
 
 
-
 	
 	public function usernameBREAK($username)
 	{

system/typemill/author/css/output.css

@@ -1246,6 +1246,10 @@ video {
   border-bottom-width: 4px;
 }
 
+.border-l-2 {
+  border-left-width: 2px;
+}
+
 .border-solid {
   border-style: solid;
 }
@@ -1294,6 +1298,16 @@ video {
   border-color: rgb(250 204 21 / var(--tw-border-opacity));
 }
 
+.border-stone-100 {
+  --tw-border-opacity: 1;
+  border-color: rgb(250 204 21 / var(--tw-border-opacity));
+}
+
+.border-rose-500 {
+  --tw-border-opacity: 1;
+  border-color: rgb(244 63 94 / var(--tw-border-opacity));
+}
+
 .border-rose-500 {
   --tw-border-opacity: 1;
   border-color: rgb(244 63 94 / var(--tw-border-opacity));
@@ -1670,6 +1684,11 @@ video {
   line-height: 1.75rem;
 }
 
+.text-2xl {
+  font-size: 1.5rem;
+  line-height: 2rem;
+}
+
 .text-3xl {
   font-size: 1.875rem;
   line-height: 2.25rem;
@@ -1793,6 +1812,11 @@ video {
   color: rgb(244 63 94 / var(--tw-text-opacity));
 }
 
+.text-cyan-500 {
+  --tw-text-opacity: 1;
+  color: rgb(6 182 212 / var(--tw-text-opacity));
+}
+
 .underline {
   -webkit-text-decoration-line: underline;
           text-decoration-line: underline;
@@ -1975,6 +1999,16 @@ video {
   background-color: rgb(190 18 60 / var(--tw-bg-opacity));
 }
 
+.hover\:bg-cyan-500:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(6 182 212 / var(--tw-bg-opacity));
+}
+
+.hover\:bg-stone-50:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(250 250 249 / var(--tw-bg-opacity));
+}
+
 .hover\:text-stone-50:hover {
   --tw-text-opacity: 1;
   color: rgb(250 250 249 / var(--tw-text-opacity));

system/typemill/author/js/vue-blox-components.js

@@ -2100,7 +2100,6 @@ bloxeditor.component('file-component', {
 	}
 })
 
-
 bloxeditor.component('video-component', {
 	props: ['markdown', 'disabled', 'index'],
 	template: `<div class="video dropbox p-8">