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

Merge pull request #188 from lexakami/hotfix/55276-swiftype 

Update search template and move outside header to fix being behind overlay
This commit is contained in:
Robbie Averill 2019-08-13 13:27:49 +12:00 committed by GitHub
parent 7b9436e9e5 81b0401154
commit 6aabf25f4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -6,7 +6,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"silverstripe/docsviewer": "^2.0", "silverstripe/docsviewer": "^2.0",
"silverstripe/framework": "~3.6", "silverstripe/framework": "~3.6",
"silverstripe/toolbar": "^4.2", "silverstripe/toolbar": "~4.2.3",
"silverstripe/dynamodb": "^3", "silverstripe/dynamodb": "^3",
"mandrew/silverstripe-quickfeedback": "^0.2", "mandrew/silverstripe-quickfeedback": "^0.2",
"silverstripe/raygun": "^1.1" "silverstripe/raygun": "^1.1"
@ -15,10 +15,10 @@
"phpunit/phpunit": "~3.7@stable" "phpunit/phpunit": "~3.7@stable"
}, },
"repositories": [ "repositories": [
{ {
"type": "vcs", "type": "vcs",
"url": "git://github.com/silverstripe/silverstripe-globaltoolbar.git" "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git"
} }
], ],
"config": { "config": {
"process-timeout": 600 "process-timeout": 600

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bebddbda993b76e7ce5d76d5963b1764", "content-hash": "584b20c5ae4aa35473bb51416f1500a2",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -1184,16 +1184,16 @@
}, },
{ {
"name": "silverstripe/toolbar", "name": "silverstripe/toolbar",
"version": "4.2.2", "version": "4.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
"reference": "1b0ea930e122e21f44fbb3b0e7c62ea7d47a06c3" "reference": "999a1c2587f13b5953498f6453d74c8469c24b64"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/1b0ea930e122e21f44fbb3b0e7c62ea7d47a06c3", "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/999a1c2587f13b5953498f6453d74c8469c24b64",
"reference": "1b0ea930e122e21f44fbb3b0e7c62ea7d47a06c3", "reference": "999a1c2587f13b5953498f6453d74c8469c24b64",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1221,10 +1221,10 @@
"silverstripe" "silverstripe"
], ],
"support": { "support": {
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2", "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2.3",
"issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
}, },
"time": "2019-07-08T23:12:15+00:00" "time": "2019-08-12T23:19:56+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",

2
themes/docs/templates/Includes/DocumentationHead.ss vendored
View File

@ -28,8 +28,8 @@
<div id="navWrapper"> <div id="navWrapper">
<div class="nav-mobile"> <div class="nav-mobile">
$GlobalNav('doc') $GlobalNav('doc')
<% include SearchBox %>
</div> </div>
</div> </div>
</div> </div>
</header> </header>
<% include SearchModal %>