diff --git a/cache/lastCache.txt b/cache/lastCache.txt index be5ff7d..b3d34dc 100644 --- a/cache/lastCache.txt +++ b/cache/lastCache.txt @@ -1 +1 @@ -1574576173 \ No newline at end of file +1574585614 \ No newline at end of file diff --git a/composer.lock b/composer.lock index c6be09d..fe7c966 100644 --- a/composer.lock +++ b/composer.lock @@ -35,6 +35,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -655,7 +656,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.34", + "version": "v3.4.35", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -776,7 +777,7 @@ }, { "name": "symfony/yaml", - "version": "v2.8.50", + "version": "v2.8.52", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", diff --git a/system/Settings.php b/system/Settings.php index 8fe26dc..ac26003 100644 --- a/system/Settings.php +++ b/system/Settings.php @@ -54,7 +54,7 @@ class Settings 'contentFolder' => 'content', 'cache' => true, 'cachePath' => $rootPath . 'cache', - 'version' => '1.2.18', + 'version' => '1.2.19', 'setup' => true, 'welcome' => true, 'images' => ['live' => ['width' => 820], 'mlibrary' => ['width' => 50, 'height' => 50]], diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig index 4f11a0e..4427994 100644 --- a/system/author/layouts/layout.twig +++ b/system/author/layouts/layout.twig @@ -16,9 +16,8 @@ - - + @@ -56,7 +55,7 @@ - - + + \ No newline at end of file diff --git a/system/author/layouts/layoutAuth.twig b/system/author/layouts/layoutAuth.twig index e7aec4a..a25b3f7 100644 --- a/system/author/layouts/layoutAuth.twig +++ b/system/author/layouts/layoutAuth.twig @@ -16,10 +16,9 @@ - - + - + @@ -55,6 +54,6 @@ {% block content %}{% endblock %} - + \ No newline at end of file diff --git a/system/author/layouts/layoutBlank.twig b/system/author/layouts/layoutBlank.twig index ed3ad72..0f79c9c 100644 --- a/system/author/layouts/layoutBlank.twig +++ b/system/author/layouts/layoutBlank.twig @@ -14,11 +14,10 @@ - - - + + - + diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig index af2a7f7..5be000a 100644 --- a/system/author/layouts/layoutBlox.twig +++ b/system/author/layouts/layoutBlox.twig @@ -17,9 +17,8 @@ - - + {{ assets.renderCSS() }} @@ -161,22 +160,22 @@ - - - - - - - + + + + + + + {{ assets.renderEditorJS() }} - - - + + + {{ assets.renderJS() }} diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig index 87bb5c8..b8c6892 100644 --- a/system/author/layouts/layoutEditor.twig +++ b/system/author/layouts/layoutEditor.twig @@ -17,9 +17,8 @@ - - + @@ -57,13 +56,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file