diff --git a/content/00-welcome/index.md b/content/00-welcome/index.md index dcca197..0f28ab3 100644 --- a/content/00-welcome/index.md +++ b/content/00-welcome/index.md @@ -1,4 +1,4 @@ -# Welcome +# Wel­come & Go -Great that you give Typemill a try!! Typemill is a simple Flat File Content Management System (CMS). We (the community) work hard to provide the best author experience with easy and intuitive authoring tools. But Typemill is still in early development and it is likely that not everything will work perfectly out of the box. If you miss something or if you have ideas for improvements, then post a new issue on [GitHub](https://github.com/typemill/typemill/issues). +Great that you give Typemill a try!! & Type­mill is a simple Flat File Content Management System (CMS). We (the community) work hard to provide the best author experience with easy and intuitive authoring tools. But Typemill is still in early development and it is likely that not everything will work perfectly out of the box. If you miss something or if you have ideas for improvements, then post a new issue on [GitHub](https://github.com/typemill/typemill/issues). diff --git a/system/Extensions/ParsedownExtension.php b/system/Extensions/ParsedownExtension.php index 88db759..8c6ed6b 100644 --- a/system/Extensions/ParsedownExtension.php +++ b/system/Extensions/ParsedownExtension.php @@ -341,11 +341,14 @@ class ParsedownExtension extends \ParsedownExtra $Block = array( 'element' => array( 'name' => 'h' . min(6, $level), - 'text' => $text, - 'handler' => 'line', 'attributes' => array( - 'id' => "h-$headline" - ) + 'id' => "h-$headline" + ), + 'handler' => array( + 'function' => 'lineElements', + 'argument' => $text, + 'destination' => 'elements', + ), ) ); @@ -371,7 +374,7 @@ class ParsedownExtension extends \ParsedownExtra return $Block; } } - + # TableOfContents protected function blockTableOfContents($line, $block) diff --git a/system/Models/ProcessFile.php b/system/Models/ProcessFile.php index c5c2ad7..458416a 100644 --- a/system/Models/ProcessFile.php +++ b/system/Models/ProcessFile.php @@ -143,7 +143,7 @@ class ProcessFile extends ProcessAssets public function getFileDetails($name, $structure) - { + { $name = basename($name); if (!in_array($name, array(".","..")) && file_exists($this->fileFolder . $name)) diff --git a/system/author/css/style.css b/system/author/css/style.css index 2be886d..cd0d725 100644 --- a/system/author/css/style.css +++ b/system/author/css/style.css @@ -2322,7 +2322,19 @@ button.format-item.close:hover{ color: #ccc; background: #f9f8f6; font-weight: 300; - padding: 0; + padding: 5px 0 0; +} +.blox-editor tr:first-child:hover td.noteditable:first-child{ + cursor: default; + color: #ccc; + background: #f9f8f6; +} +.blox-editor td.noteditable{ + cursor: pointer; +} +.blox-editor td.noteditable:hover{ + background: #ccc; + color: #fff; } .blox-editor .columnaction, .blox-editor .rowaction{ position: absolute;