diff --git a/cache/lastCache.txt b/cache/lastCache.txt index a8a9e84..7a035af 100644 --- a/cache/lastCache.txt +++ b/cache/lastCache.txt @@ -1 +1 @@ -1540917193 \ No newline at end of file +1540919595 \ No newline at end of file diff --git a/composer.lock b/composer.lock index 0b25eb6..7488dbf 100644 --- a/composer.lock +++ b/composer.lock @@ -890,12 +890,12 @@ "source": { "type": "git", "url": "https://github.com/vlucas/valitron.git", - "reference": "e3b3eb31a2fc41827ac8d5646e406dde4584f3c2" + "reference": "661365f3173433fd0deee625f1835377ce0947e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/e3b3eb31a2fc41827ac8d5646e406dde4584f3c2", - "reference": "e3b3eb31a2fc41827ac8d5646e406dde4584f3c2", + "url": "https://api.github.com/repos/vlucas/valitron/zipball/661365f3173433fd0deee625f1835377ce0947e5", + "reference": "661365f3173433fd0deee625f1835377ce0947e5", "shasum": "" }, "require": { @@ -931,7 +931,7 @@ "validation", "validator" ], - "time": "2018-09-23T19:46:36+00:00" + "time": "2018-10-14T12:01:40+00:00" } ], "packages-dev": [], diff --git a/content/00-Welcome/01-Get-Help.md b/content/00-Welcome/01-Get-Help.md index f509b65..e9ad6c9 100644 --- a/content/00-Welcome/01-Get-Help.md +++ b/content/00-Welcome/01-Get-Help.md @@ -1,4 +1,4 @@ -Get Help +# Get Help If you need any help, then please read the [documentation on typemill.net](https://typemill.net/typemill) first. Some short video-tutorials are in work right now. diff --git a/content/00-Welcome/index.md b/content/00-Welcome/index.md new file mode 100644 index 0000000..376e86a --- /dev/null +++ b/content/00-Welcome/index.md @@ -0,0 +1,6 @@ +# Welcome to Typemill + +Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a really productive little writing-system. + +Before you start, please read the short introduction about "writing content". Or simply play around, I hope that Typemill is already quite intuitive to use... + diff --git a/content/00-Welcome/index.txt b/content/00-Welcome/index.txt deleted file mode 100644 index 9cacf8b..0000000 --- a/content/00-Welcome/index.txt +++ /dev/null @@ -1 +0,0 @@ -["# Welcome to Typemill","Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a really productive little writing-system.","Before you start, please read the short introduction about \"writing content\". Or simply play around, I hope that Typemill is already quite intuitive to use..."] \ No newline at end of file diff --git a/content/index.md b/content/index.md index 072647b..9a40933 100644 --- a/content/index.md +++ b/content/index.md @@ -2,5 +2,4 @@ **MODERN WEB PUBLISHING FOR WRITERS** -*Typemill is a user-friendly and lightweight open source CMS for publishing text-works like prosa, lyrics, manuals, documentations, studies and more. Just download and start.* - +*Typemill is a user-friendly and lightweight open source CMS for publishing text-works like prosa, lyrics, manuals, documentations, studies and more. Just download and start.* \ No newline at end of file diff --git a/content/index.txt b/content/index.txt deleted file mode 100644 index cb72c3a..0000000 --- a/content/index.txt +++ /dev/null @@ -1 +0,0 @@ -["# Typemill","**MODERN WEB PUBLISHING FOR WRITERS**","*Typemill is a user-friendly and lightweight open source CMS for publishing text-works like prosa, lyrics, manuals, documentations, studies and more. Just download and start.*"] \ No newline at end of file diff --git a/system/Settings.php b/system/Settings.php index 8191d25..c9e4218 100644 --- a/system/Settings.php +++ b/system/Settings.php @@ -44,7 +44,7 @@ class Settings 'contentFolder' => 'content', 'cache' => true, 'cachePath' => $rootPath . 'cache', - 'version' => '1.2.5', + 'version' => '1.2.6', 'setup' => true, 'welcome' => true ]; diff --git a/system/author/css/style.css b/system/author/css/style.css index 90f8e92..f282303 100644 --- a/system/author/css/style.css +++ b/system/author/css/style.css @@ -1417,9 +1417,6 @@ label .help, .label .help{ color: #444; border: 1px solid #eee; } -.blox:hover{ - // background: #f9f8f6; -} .visible{ display: block; } @@ -1559,7 +1556,9 @@ label .help, .label .help{ .blox blockquote p{ margin-left: 50px; } -img{} +.blox img{ + width: 100%; +} sup{} cite{} abbr{} diff --git a/system/author/js/vue-blox.js b/system/author/js/vue-blox.js index 636654f..909fe32 100644 --- a/system/author/js/vue-blox.js +++ b/system/author/js/vue-blox.js @@ -254,11 +254,11 @@ let editor = new Vue({ blockMarkdown: '', freeze: false, newBlocks: [], + draftDisabled: true, }, mounted: function(){ publishController.visual = true; - editor.draftDisabled = true; var url = this.root + '/api/v1/article/markdown'; diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig index 298bb07..be4c896 100644 --- a/system/author/layouts/layout.twig +++ b/system/author/layouts/layout.twig @@ -33,7 +33,7 @@ - - + + \ No newline at end of file diff --git a/system/author/layouts/layoutAuth.twig b/system/author/layouts/layoutAuth.twig index 0be06ed..9caa921 100644 --- a/system/author/layouts/layoutAuth.twig +++ b/system/author/layouts/layoutAuth.twig @@ -27,6 +27,6 @@ {% block content %}{% endblock %} - + \ No newline at end of file diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig index 8d7754f..dc3c9f4 100644 --- a/system/author/layouts/layoutBlox.twig +++ b/system/author/layouts/layoutBlox.twig @@ -17,7 +17,7 @@ - + @@ -34,13 +34,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig index 1e1e85c..a528577 100644 --- a/system/author/layouts/layoutEditor.twig +++ b/system/author/layouts/layoutEditor.twig @@ -17,7 +17,7 @@ - + @@ -34,13 +34,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file