diff --git a/composer.json b/composer.json index ec2d650..df7df41 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "require": { "ext-gd": "*", "ext-mbstring": "*", - "silverstripe/docsviewer": "^2.0", + "silverstripe/docsviewer": "dev-master", "silverstripe/framework": "^3.2", "silverstripe/toolbar": "^4.2", "silverstripe/dynamodb": "^1.1", diff --git a/composer.lock b/composer.lock index e90306e..0e09d1c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "97b04332e19c043a9bd03636901f7cc3", - "content-hash": "feac3e9e8ca69e497713cdb8c438dd03", + "hash": "e6ed503e08d9e9ccf302c7fe3057b177", + "content-hash": "8c652b05aa3bdebb477f26c03e4cd66b", "packages": [ { "name": "aws/aws-sdk-php", - "version": "2.8.30", + "version": "2.8.31", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2d7183cd22381237bce25f11d741a77bdeb2d0b8" + "reference": "64fa4b07f056e338a5f0f29eece75babaa83af68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2d7183cd22381237bce25f11d741a77bdeb2d0b8", - "reference": "2d7183cd22381237bce25f11d741a77bdeb2d0b8", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/64fa4b07f056e338a5f0f29eece75babaa83af68", + "reference": "64fa4b07f056e338a5f0f29eece75babaa83af68", "shasum": "" }, "require": { @@ -68,20 +68,20 @@ "s3", "sdk" ], - "time": "2016-05-03 17:42:24" + "time": "2016-07-25 18:03:20" }, { "name": "composer/installers", - "version": "v1.0.25", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "36e5b5843203d7f1cf6ffb0305a97e014387bd8e" + "reference": "d78064c68299743e0161004f2de3a0204e33b804" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/36e5b5843203d7f1cf6ffb0305a97e014387bd8e", - "reference": "36e5b5843203d7f1cf6ffb0305a97e014387bd8e", + "url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804", + "reference": "d78064c68299743e0161004f2de3a0204e33b804", "shasum": "" }, "require": { @@ -128,21 +128,26 @@ "MODX Evo", "Mautic", "OXID", + "Plentymarkets", + "RadPHP", "SMF", "Thelia", "WolfCMS", "agl", "aimeos", "annotatecms", + "attogram", "bitrix", "cakephp", "chef", + "cockpit", "codeigniter", "concrete5", "croogo", "dokuwiki", "drupal", "elgg", + "expressionengine", "fuelphp", "grav", "installer", @@ -159,16 +164,18 @@ "piwik", "ppi", "puppet", + "reindex", "roundcube", "shopware", "silverstripe", "symfony", "typo3", "wordpress", + "yawik", "zend", "zikula" ], - "time": "2016-04-13 19:46:30" + "time": "2016-08-13 20:53:52" }, { "name": "doctrine/cache", @@ -460,23 +467,23 @@ }, { "name": "mtdowling/cron-expression", - "version": "v1.0.4", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/mtdowling/cron-expression.git", - "reference": "fd92e883195e5dfa77720b1868cf084b08be4412" + "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412", - "reference": "fd92e883195e5dfa77720b1868cf084b08be4412", + "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", + "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "~4.0|~5.0" }, "type": "library", "autoload": { @@ -500,35 +507,30 @@ "cron", "schedule" ], - "time": "2015-01-11 23:07:46" + "time": "2016-01-26 21:23:30" }, { "name": "silverstripe/crontask", - "version": "v1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-crontask.git", - "reference": "0db152c8edf448e3ed9797d60e181800ac67ed75" + "reference": "ef1992904075604b76a40cc286c0f448064ddc20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-crontask/zipball/0db152c8edf448e3ed9797d60e181800ac67ed75", - "reference": "0db152c8edf448e3ed9797d60e181800ac67ed75", + "url": "https://api.github.com/repos/silverstripe/silverstripe-crontask/zipball/ef1992904075604b76a40cc286c0f448064ddc20", + "reference": "ef1992904075604b76a40cc286c0f448064ddc20", "shasum": "" }, "require": { - "mtdowling/cron-expression": "1.0.*", + "mtdowling/cron-expression": "~1.0", "silverstripe/framework": "~3.1" }, "require-dev": { "phpunit/phpunit": "~3.7@stable" }, "type": "silverstripe-module", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -548,20 +550,20 @@ "cron", "silverstripe" ], - "time": "2014-11-20 01:20:17" + "time": "2016-09-13 10:39:18" }, { "name": "silverstripe/docsviewer", - "version": "2.0.0-beta1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git", - "reference": "fd9a7da68b06fccde5d76dc531a142bed01f41a2" + "reference": "4bd9f267bd66cf1f6093dd98dda89c1c1260528d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/fd9a7da68b06fccde5d76dc531a142bed01f41a2", - "reference": "fd9a7da68b06fccde5d76dc531a142bed01f41a2", + "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/4bd9f267bd66cf1f6093dd98dda89c1c1260528d", + "reference": "4bd9f267bd66cf1f6093dd98dda89c1c1260528d", "shasum": "" }, "require": { @@ -589,7 +591,7 @@ "documentation", "silverstripe" ], - "time": "2016-06-24 01:39:57" + "time": "2016-10-21 00:56:44" }, { "name": "silverstripe/dynamodb", @@ -634,16 +636,16 @@ }, { "name": "silverstripe/framework", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-framework.git", - "reference": "8008fcbe9769f1d2cb53c542f302ad6d32d185d6" + "reference": "1f06e6dd18419cda02d58a78f39f6613c067a3ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/8008fcbe9769f1d2cb53c542f302ad6d32d185d6", - "reference": "8008fcbe9769f1d2cb53c542f302ad6d32d185d6", + "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/1f06e6dd18419cda02d58a78f39f6613c067a3ed", + "reference": "1f06e6dd18419cda02d58a78f39f6613c067a3ed", "shasum": "" }, "require": { @@ -654,11 +656,6 @@ "phpunit/phpunit": "~3.7" }, "type": "silverstripe-module", - "extra": { - "branch-alias": { - "3.x-dev": "3.4.x-dev" - } - }, "autoload": { "classmap": [ "tests/behat/features/bootstrap" @@ -684,7 +681,7 @@ "framework", "silverstripe" ], - "time": "2016-06-02 22:59:29" + "time": "2016-08-15 06:29:38" }, { "name": "silverstripe/toolbar", @@ -732,16 +729,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.8.8", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9" + "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9", - "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8", + "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8", "shasum": "" }, "require": { @@ -788,7 +785,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:29:29" + "time": "2016-07-28 16:56:28" }, { "name": "unclecheese/display-logic", @@ -1203,16 +1200,16 @@ }, { "name": "symfony/yaml", - "version": "v2.8.8", + "version": "v2.8.12", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8" + "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8", - "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c", + "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c", "shasum": "" }, "require": { @@ -1248,12 +1245,13 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:29:29" + "time": "2016-09-02 01:57:56" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { + "silverstripe/docsviewer": 20, "phpunit/phpunit": 0 }, "prefer-stable": true, diff --git a/themes/docs/css/styles.css b/themes/docs/css/styles.css index 93a0f5f..4138218 100644 --- a/themes/docs/css/styles.css +++ b/themes/docs/css/styles.css @@ -43,7 +43,7 @@ .quickfeedback .btn, .quickfeedback input { text-transform: uppercase; - padding: 10px 30px; + padding: 10px 30px; margin-right: 7px; border-width: 1px; } @@ -87,4 +87,26 @@ form .message.good { form .message.error { background: #FF8480; color:#fff; -} \ No newline at end of file +} +/* Remove global navigation in mobile view */ +.nav-mobile { + display: block; + min-height: 0; + margin: 0; +} + +@media (max-width: 992px) { + .site-header { + display: none; + } + /* SilverStripe logo on top of page */ + #masthead .logo { + display: inline-block; + float: left; + height: 40px; + width: 75%; + margin-bottom: 24px; + margin-left: 4px; + background: url(https://www.silverstripe.org/themes/ssv3/img/global-logo-open-source.svg) no-repeat; + } +} diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index 973f298..f724517 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -1,11 +1,18 @@ - <% include DocumentationHead %> - + <% include DocumentationHead %> +
class="has_versions"<% end_if %>>
- <% if Breadcrumbs.count > 1 %> + + + + + + + + <% if Breadcrumbs.count > 1 %> <% include DocumentationBreadcrumbs %> <% else_if Page.Title %>

$Page.Title

@@ -18,8 +25,8 @@ <% include DocumentationVersions %>
-
- + +
@@ -27,11 +34,11 @@
$Layout - + <% include DocumentationFooter %>
- <% include DocumentationGA %> + <% include DocumentationGA %> <% include DocumentationEnd %> diff --git a/themes/docs/templates/Includes/DocumentationHead.ss b/themes/docs/templates/Includes/DocumentationHead.ss index 2838f03..70e4c8d 100644 --- a/themes/docs/templates/Includes/DocumentationHead.ss +++ b/themes/docs/templates/Includes/DocumentationHead.ss @@ -1,6 +1,7 @@ <% base_tag %> + <% if Title %>$Title – <% end_if %>SilverStripe Documentation <% include DocumentationFavicons %> @@ -17,8 +18,10 @@