tonyair
/
doc.silverstripe.org
mirror of https://github.com/silverstripe/doc.silverstripe.org
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated toolbar and framework (including icons) 

Added toolbar yml, removed toolbar yml code from config, added toolbar code into header
This commit is contained in:
Michael Andrewartha 2014-09-11 18:40:12 +12:00
parent 9f486b13d5
commit 8b4b81decb
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/_config/config.yml
View File

@ -10,18 +10,3 @@ StaticExporter:
Controller:
extensions:
- ControllerExtension
---
After:
- toolbar/*
---
GlobalNav:
hostname: 'http://ssorg-another.test.silverstripe.com/'
css_path: '/themes/ssv3/css/toolbar.css'
use_localhost: false
GlobalNavTemplateProvider:
connection_timeout: 1000
transfer_timeout: 2000
SiteController:
extensions:
- GlobalNavExtension

14
app/_config/toolbar.yml Normal file
View File

@ -0,0 +1,14 @@
---
After:
- toolbar/*
---
GlobalNav:
hostname: 'http://www.silverstripe.org/'
css_path: '/themes/ssv3/css/toolbar.css'
use_localhost: false
GlobalNavTemplateProvider:
connection_timeout: 2000
transfer_timeout: 6000
SiteController:
extensions:
- GlobalNavExtension

2
composer.json
View File

@ -11,7 +11,7 @@
"php": ">=5.3.2",
"silverstripe/docsviewer": "dev-master",
"silverstripe/staticpublisher": "dev-master",
"silverstripe/framework": "3.1.x-dev",
"silverstripe/framework": "3.1.*@stable",
"silverstripe/toolbar": "*"
},
"require-dev": {

26
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "bb8c3cbef9299e50dca7722a9f872c95",
"hash": "3eb2aa396f1f8115a345960560fa9f1b",
"packages": [
{
"name": "composer/installers",
@ -223,16 +223,16 @@
},
{
"name": "silverstripe/framework",
"version": "3.1.x-dev",
"version": "3.1.6",
"source": {
"type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "6610a6a8fb6dc3ec19dddc5515c65672f3126d90"
"reference": "9da3357e3a7348914a4778366efa053277097cc4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/6610a6a8fb6dc3ec19dddc5515c65672f3126d90",
"reference": "6610a6a8fb6dc3ec19dddc5515c65672f3126d90",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/9da3357e3a7348914a4778366efa053277097cc4",
"reference": "9da3357e3a7348914a4778366efa053277097cc4",
"shasum": ""
},
"require": {
@ -268,7 +268,7 @@
"framework",
"silverstripe"
],
"time": "2014-09-15 21:35:53"
"time": "2014-08-24 23:25:01"
},
{
"name": "silverstripe/staticpublisher",
@ -349,18 +349,24 @@
"time": "2014-08-31 23:28:18"
}
],
"packages-dev": [],
"aliases": [],
"packages-dev": [
],
"aliases": [
],
"minimum-stability": "dev",
"stability-flags": {
"silverstripe/docsviewer": 20,
"silverstripe/staticpublisher": 20,
"silverstripe/framework": 20,
"silverstripe/framework": 0,
"silverstripe/toolbar": 20
},
"prefer-stable": false,
"platform": {
"php": ">=5.3.2"
},
"platform-dev": []
"platform-dev": [
]
}

1
themes/docs/templates/DocumentationViewer.ss vendored
View File

@ -8,6 +8,7 @@
<link rel="stylesheet" href="themes/docs/css/ionicons.min.css" />
<script type="text/javascript" src="//use.typekit.net/emt4dhq.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<script>window.GLOBAL_NAV_SECONDARY_ID = 1560;</script>
</head>
<body class="theme-theme1">