mirror of
https://github.com/silverstripe/doc.silverstripe.org
synced 2024-10-22 15:05:50 +00:00
updated composer and changed global nav template
This commit is contained in:
Michael Andrewartha
parent
e113b37f0b
commit
6f304dc1cd
@ -4,7 +4,7 @@
|
|||||||
"repositories": [
|
"repositories": [
|
||||||
{
|
{
|
||||||
"type": "vcs",
|
"type": "vcs",
|
||||||
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git"
|
"url": "https://github.com/mandrew/silverstripe-globaltoolbar.git"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
@ -14,8 +14,11 @@
|
|||||||
"silverstripe/framework": "3.1.x-dev",
|
"silverstripe/framework": "3.1.x-dev",
|
||||||
"silverstripe/toolbar": "*"
|
"silverstripe/toolbar": "*"
|
||||||
},
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"silverstripe/toolbar": "dev-search"
|
||||||
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"process-timeout": 600
|
"process-timeout": 600
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev"
|
"minimum-stability": "dev"
|
||||||
}
|
}
|
||||||
|
|||||||
148
composer.lock
generated
148
composer.lock
generated
@ -4,7 +4,7 @@
|
|||||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "9908c6f7b23a5287bb68374e37ee6e8c",
|
"hash": "bb8c3cbef9299e50dca7722a9f872c95",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "composer/installers",
|
"name": "composer/installers",
|
||||||
@ -12,12 +12,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/composer/installers.git",
|
"url": "https://github.com/composer/installers.git",
|
||||||
"reference": "41cf781ed1271e25bf31b715416a349996aa2527"
|
"reference": "74fb0a7a1a23696d9c8cc2fba5903f6711cdd067"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/composer/installers/zipball/41cf781ed1271e25bf31b715416a349996aa2527",
|
"url": "https://api.github.com/repos/composer/installers/zipball/74fb0a7a1a23696d9c8cc2fba5903f6711cdd067",
|
||||||
"reference": "41cf781ed1271e25bf31b715416a349996aa2527",
|
"reference": "74fb0a7a1a23696d9c8cc2fba5903f6711cdd067",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
@ -94,7 +94,90 @@
|
|||||||
"zend",
|
"zend",
|
||||||
"zikula"
|
"zikula"
|
||||||
],
|
],
|
||||||
"time": "2014-07-22 17:04:15"
|
"time": "2014-08-18 20:00:12"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "erusev/parsedown",
|
||||||
|
"version": "1.0.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/erusev/parsedown.git",
|
||||||
|
"reference": "d24439ada0704948deef0d3eda2ea20fd8db1747"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/erusev/parsedown/zipball/d24439ada0704948deef0d3eda2ea20fd8db1747",
|
||||||
|
"reference": "d24439ada0704948deef0d3eda2ea20fd8db1747",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"Parsedown": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Emanuil Rusev",
|
||||||
|
"email": "hello@erusev.com",
|
||||||
|
"homepage": "http://erusev.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Parser for Markdown.",
|
||||||
|
"homepage": "http://parsedown.org",
|
||||||
|
"keywords": [
|
||||||
|
"markdown",
|
||||||
|
"parser"
|
||||||
|
],
|
||||||
|
"time": "2014-05-21 20:20:46"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "erusev/parsedown-extra",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/erusev/parsedown-extra.git",
|
||||||
|
"reference": "bcd3930f7f10915e40513e1951a253f061d75463"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/bcd3930f7f10915e40513e1951a253f061d75463",
|
||||||
|
"reference": "bcd3930f7f10915e40513e1951a253f061d75463",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"erusev/parsedown": "~1.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"ParsedownExtra": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Emanuil Rusev",
|
||||||
|
"email": "hello@erusev.com",
|
||||||
|
"homepage": "http://erusev.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "An extension of Parsedown that adds support for Markdown Extra.",
|
||||||
|
"homepage": "https://github.com/erusev/parsedown-extra",
|
||||||
|
"keywords": [
|
||||||
|
"markdown",
|
||||||
|
"markdown extra",
|
||||||
|
"parsedown",
|
||||||
|
"parser"
|
||||||
|
],
|
||||||
|
"time": "2014-06-18 23:58:16"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "silverstripe/docsviewer",
|
"name": "silverstripe/docsviewer",
|
||||||
@ -102,15 +185,16 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
|
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
|
||||||
"reference": "17527f63d3f8ce60972fc0d3d4699c636433db36"
|
"reference": "afe229d34366e0aef0d726727fd8e8d302c5ace4"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/17527f63d3f8ce60972fc0d3d4699c636433db36",
|
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/afe229d34366e0aef0d726727fd8e8d302c5ace4",
|
||||||
"reference": "17527f63d3f8ce60972fc0d3d4699c636433db36",
|
"reference": "afe229d34366e0aef0d726727fd8e8d302c5ace4",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
"erusev/parsedown-extra": "0.1.0",
|
||||||
"silverstripe/framework": "~3.1"
|
"silverstripe/framework": "~3.1"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
@ -125,7 +209,7 @@
|
|||||||
{
|
{
|
||||||
"name": "Will Rossiter",
|
"name": "Will Rossiter",
|
||||||
"email": "will@fullscreen.io",
|
"email": "will@fullscreen.io",
|
||||||
"homepage": "http://wilr.github.com"
|
"homepage": "http://wilr.github.io"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Documentation viewer module for SilverStripe",
|
"description": "Documentation viewer module for SilverStripe",
|
||||||
@ -133,7 +217,7 @@
|
|||||||
"documentation",
|
"documentation",
|
||||||
"silverstripe"
|
"silverstripe"
|
||||||
],
|
],
|
||||||
"time": "2014-07-05 07:43:47"
|
"time": "2014-08-01 04:45:09"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "silverstripe/framework",
|
"name": "silverstripe/framework",
|
||||||
@ -141,12 +225,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/silverstripe/silverstripe-framework.git",
|
"url": "https://github.com/silverstripe/silverstripe-framework.git",
|
||||||
"reference": "350ee4d421d04a075464e84713cf4a5527f3948a"
|
"reference": "a838e9bae6a1e40083f676a6494321f7aaf359e7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/350ee4d421d04a075464e84713cf4a5527f3948a",
|
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/a838e9bae6a1e40083f676a6494321f7aaf359e7",
|
||||||
"reference": "350ee4d421d04a075464e84713cf4a5527f3948a",
|
"reference": "a838e9bae6a1e40083f676a6494321f7aaf359e7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -182,7 +266,7 @@
|
|||||||
"framework",
|
"framework",
|
||||||
"silverstripe"
|
"silverstripe"
|
||||||
],
|
],
|
||||||
"time": "2014-07-22 20:54:18"
|
"time": "2014-08-18 21:38:17"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "silverstripe/staticpublisher",
|
"name": "silverstripe/staticpublisher",
|
||||||
@ -190,12 +274,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/silverstripe-labs/silverstripe-staticpublisher.git",
|
"url": "https://github.com/silverstripe-labs/silverstripe-staticpublisher.git",
|
||||||
"reference": "1a4e07c0360bb67038d752ef62d94f4f1ade9c29"
|
"reference": "9bdf8e68d97c97459c3b52a26490cb8b0860be97"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/silverstripe-labs/silverstripe-staticpublisher/zipball/1a4e07c0360bb67038d752ef62d94f4f1ade9c29",
|
"url": "https://api.github.com/repos/silverstripe-labs/silverstripe-staticpublisher/zipball/9bdf8e68d97c97459c3b52a26490cb8b0860be97",
|
||||||
"reference": "1a4e07c0360bb67038d752ef62d94f4f1ade9c29",
|
"reference": "9bdf8e68d97c97459c3b52a26490cb8b0860be97",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -204,14 +288,13 @@
|
|||||||
"type": "silverstripe-module",
|
"type": "silverstripe-module",
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
|
||||||
"name": "Will Rossiter",
|
|
||||||
"email": "will@fullscreen.io",
|
|
||||||
"homepage": "http://wilr.github.com"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Sam Minnee",
|
"name": "Sam Minnee",
|
||||||
"email": "sam@silverstripe.com"
|
"email": "sam@silverstripe.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Will Rossiter",
|
||||||
|
"email": "will@fullscreen.io"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "StaticPublisher provides an extensions for exporting a SilverStripe application to either a local or remote file systems.",
|
"description": "StaticPublisher provides an extensions for exporting a SilverStripe application to either a local or remote file systems.",
|
||||||
@ -221,20 +304,20 @@
|
|||||||
"silverstripe-labs",
|
"silverstripe-labs",
|
||||||
"static"
|
"static"
|
||||||
],
|
],
|
||||||
"time": "2014-03-23 05:09:04"
|
"time": "2014-08-03 10:04:35"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "silverstripe/toolbar",
|
"name": "silverstripe/toolbar",
|
||||||
"version": "dev-master",
|
"version": "dev-search",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
|
"url": "https://github.com/mandrew/silverstripe-globaltoolbar.git",
|
||||||
"reference": "2f7acb38d6ee109d4fb17a7ab45c149b81585434"
|
"reference": "55a9784ecf1f5c18b13d090f0f81a2af57da4b04"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/2f7acb38d6ee109d4fb17a7ab45c149b81585434",
|
"url": "https://api.github.com/repos/mandrew/silverstripe-globaltoolbar/zipball/55a9784ecf1f5c18b13d090f0f81a2af57da4b04",
|
||||||
"reference": "2f7acb38d6ee109d4fb17a7ab45c149b81585434",
|
"reference": "55a9784ecf1f5c18b13d090f0f81a2af57da4b04",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"type": "silverstripe-module",
|
"type": "silverstripe-module",
|
||||||
@ -259,10 +342,9 @@
|
|||||||
"silverstripe"
|
"silverstripe"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master",
|
"source": "https://github.com/mandrew/silverstripe-globaltoolbar/tree/search"
|
||||||
"issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
|
|
||||||
},
|
},
|
||||||
"time": "2014-07-23 03:42:37"
|
"time": "2014-08-17 23:55:02"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
@ -275,8 +357,10 @@
|
|||||||
"stability-flags": {
|
"stability-flags": {
|
||||||
"silverstripe/docsviewer": 20,
|
"silverstripe/docsviewer": 20,
|
||||||
"silverstripe/staticpublisher": 20,
|
"silverstripe/staticpublisher": 20,
|
||||||
"silverstripe/framework": 20
|
"silverstripe/framework": 20,
|
||||||
|
"silverstripe/toolbar": 20
|
||||||
},
|
},
|
||||||
|
"prefer-stable": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": ">=5.3.2"
|
"php": ">=5.3.2"
|
||||||
},
|
},
|
||||||
|
|||||||
5
themes/docs/templates/DocumentationViewer.ss
vendored
5
themes/docs/templates/DocumentationViewer.ss
vendored
@ -13,7 +13,10 @@
|
|||||||
<body class="theme-theme1">
|
<body class="theme-theme1">
|
||||||
<header data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
|
<header data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
|
||||||
<div class="global-nav header-mask">
|
<div class="global-nav header-mask">
|
||||||
$GlobalNav
|
<div id="navWrapper">
|
||||||
|
$GlobalNav
|
||||||
|
<% include SearchBox %>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<div id="container" class="container">
|
<div id="container" class="container">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user