diff --git a/cache/lastCache.txt b/cache/lastCache.txt deleted file mode 100644 index d8b3eeb..0000000 --- a/cache/lastCache.txt +++ /dev/null @@ -1 +0,0 @@ -1499015957 \ No newline at end of file diff --git a/cache/sitemap.xml b/cache/sitemap.xml deleted file mode 100644 index ef662d8..0000000 --- a/cache/sitemap.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - http://localhost/typemill - - - http://localhost/typemill/typemill - - - http://localhost/typemill/typemill/use-cases - - - http://localhost/typemill/typemill/features - - - http://localhost/typemill/typemill/roadmap - - - http://localhost/typemill/getting-started - - - http://localhost/typemill/getting-started/system-requirements - - - http://localhost/typemill/getting-started/installation - - - http://localhost/typemill/getting-started/settings - - - http://localhost/typemill/getting-started/update - - - http://localhost/typemill/writers - - - http://localhost/typemill/writers/quick-start - - - http://localhost/typemill/writers/mardown - - - http://localhost/typemill/writers/naming-files-and-folders - - - http://localhost/typemill/writers/folder-structure - - - http://localhost/typemill/writers/google-sitemap - - - http://localhost/typemill/developers - - - http://localhost/typemill/developers/quick-start - - - http://localhost/typemill/developers/twig - - - http://localhost/typemill/developers/theme-structure - - - http://localhost/typemill/developers/theme-variables - - - http://localhost/typemill/developers/theme-variables/content - - - http://localhost/typemill/developers/theme-variables/description - - - http://localhost/typemill/developers/theme-variables/item - - - http://localhost/typemill/developers/theme-variables/breadcrumb - - - http://localhost/typemill/developers/theme-variables/navigation - - - http://localhost/typemill/developers/theme-variables/settings - - - http://localhost/typemill/info - - - http://localhost/typemill/info/release-notes - - - http://localhost/typemill/info/usage-and-licence - - - http://localhost/typemill/info/imprint-and-privacy - - - http://localhost/typemill/info/markdown-test - - \ No newline at end of file diff --git a/composer.json b/composer.json index 6d813af..6b4641d 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,7 @@ "symfony/yaml": "~2.8", "erusev/parsedown": "~1.4", "erusev/parsedown-extra": "dev-master", - "jbroadway/urlify": "dev-master", - "vlucas/valitron": "dev-master" + "jbroadway/urlify": "dev-master" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 1b1142b..c4c731e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "d051059d0d2e16c98ddd6562a4ae9c17", + "content-hash": "d87e8a91b5cd2804da3d65681e9d5945", "packages": [ { "name": "container-interop/container-interop", @@ -647,52 +647,6 @@ "templating" ], "time": "2017-06-07T18:45:17+00:00" - }, - { - "name": "vlucas/valitron", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/vlucas/valitron.git", - "reference": "107d1eebc1d5420b6e88032a4bec0420adfa7495" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/107d1eebc1d5420b6e88032a4bec0420adfa7495", - "reference": "107d1eebc1d5420b6e88032a4bec0420adfa7495", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Valitron": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com" - } - ], - "description": "Simple, elegant, stand-alone validation library with NO dependencies", - "homepage": "http://github.com/vlucas/valitron", - "keywords": [ - "valid", - "validation", - "validator" - ], - "time": "2017-06-26 21:34:20" } ], "packages-dev": [], @@ -702,8 +656,7 @@ "slim/twig-view": 20, "slim/flash": 20, "erusev/parsedown-extra": 20, - "jbroadway/urlify": 20, - "vlucas/valitron": 20 + "jbroadway/urlify": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/system/settings.php b/system/settings.php index cafd326..40e18ff 100644 --- a/system/settings.php +++ b/system/settings.php @@ -4,8 +4,8 @@ DEFINE('DS', DIRECTORY_SEPARATOR); return [ 'title' => 'TYPEMILL', - 'author' => 'unknown', - 'copyright' => 'copyright', + 'author' => 'Unknown', + 'copyright' => 'Copyright', 'startpage' => true, 'rootPath' => __DIR__ . DS . '..' . DS, 'theme' => ($theme = 'typemill'), diff --git a/system/system.php b/system/system.php index cec773e..1835895 100644 --- a/system/system.php +++ b/system/system.php @@ -47,7 +47,7 @@ $container['view'] = function ($container) use ($settings){ $path = array($settings['settings']['themePath'], $settings['settings']['authorPath']); $view = new \Slim\Views\Twig( $path, [ - 'cache' => false, + 'cache' => false, 'autoescape' => false ]); diff --git a/system/vendor/composer/autoload_namespaces.php b/system/vendor/composer/autoload_namespaces.php index e44a58f..8ccf941 100644 --- a/system/vendor/composer/autoload_namespaces.php +++ b/system/vendor/composer/autoload_namespaces.php @@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( - 'Valitron' => array($vendorDir . '/vlucas/valitron/src'), 'URLify' => array($vendorDir . '/jbroadway/urlify'), 'Twig_' => array($vendorDir . '/twig/twig/lib'), 'Pimple' => array($vendorDir . '/pimple/pimple/src'), diff --git a/system/vendor/composer/autoload_static.php b/system/vendor/composer/autoload_static.php index 9b35436..fd8913e 100644 --- a/system/vendor/composer/autoload_static.php +++ b/system/vendor/composer/autoload_static.php @@ -82,13 +82,6 @@ class ComposerStaticInit836351be733ecbf4741aea17e1973480 ); public static $prefixesPsr0 = array ( - 'V' => - array ( - 'Valitron' => - array ( - 0 => __DIR__ . '/..' . '/vlucas/valitron/src', - ), - ), 'U' => array ( 'URLify' => diff --git a/system/vendor/composer/installed.json b/system/vendor/composer/installed.json index 36209b6..e81713f 100644 --- a/system/vendor/composer/installed.json +++ b/system/vendor/composer/installed.json @@ -666,53 +666,5 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com" - }, - { - "name": "vlucas/valitron", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/vlucas/valitron.git", - "reference": "107d1eebc1d5420b6e88032a4bec0420adfa7495" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/107d1eebc1d5420b6e88032a4bec0420adfa7495", - "reference": "107d1eebc1d5420b6e88032a4bec0420adfa7495", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "time": "2017-06-26T21:34:20+00:00", - "type": "library", - "installation-source": "source", - "autoload": { - "psr-0": { - "Valitron": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com" - } - ], - "description": "Simple, elegant, stand-alone validation library with NO dependencies", - "homepage": "http://github.com/vlucas/valitron", - "keywords": [ - "valid", - "validation", - "validator" - ] } ] diff --git a/system/vendor/vlucas/valitron b/system/vendor/vlucas/valitron deleted file mode 160000 index 107d1ee..0000000 --- a/system/vendor/vlucas/valitron +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 107d1eebc1d5420b6e88032a4bec0420adfa7495 diff --git a/themes/typemill/css/style.css b/themes/typemill/css/style.css index 5c18175..23a9ac9 100644 --- a/themes/typemill/css/style.css +++ b/themes/typemill/css/style.css @@ -75,7 +75,6 @@ h4{ font-size: 1.1em; margin: 1.2em 0 0.6em; } h5{ font-size: 1em; margin: 1.2em 0 0.6em; } h6{ font-size: 1em; font-style: italic; font-weight:300; margin: 1em 0 0.6em; } - /******************** * STRUCTURE * ********************/ @@ -140,10 +139,10 @@ header p{ padding-top: 0; margin-top: 0; } + /************************ * NAVIGATION * ************************/ - .close{ max-height: 0; transition: max-height 0.25s ease-out; @@ -216,7 +215,6 @@ nav > ul > li /************************ * CHAPTER * ************************/ - .chapter{ text-align: center; } @@ -234,7 +232,6 @@ nav > ul > li /************************ * ARTICLE * ************************/ - article{ padding: 30px 30px; font-size: 1em; @@ -247,7 +244,6 @@ article img{ /************************ * PAGING / BREADCRUMB * ************************/ - article .paging, article .breadcrumb{ position: relative; width: 100%;