From c330a72d062b347a61400e69a7d6a53327ee75e8 Mon Sep 17 00:00:00 2001 From: Mikaela Young Date: Mon, 12 Aug 2019 12:23:54 +1200 Subject: [PATCH 1/3] Move search modal outside header to fix being behind overlay --- themes/docs/templates/Includes/DocumentationHead.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/docs/templates/Includes/DocumentationHead.ss b/themes/docs/templates/Includes/DocumentationHead.ss index b95b150..acca444 100644 --- a/themes/docs/templates/Includes/DocumentationHead.ss +++ b/themes/docs/templates/Includes/DocumentationHead.ss @@ -28,8 +28,8 @@ +<% include SearchModal %> From 475a7db6beaad43e1e130ee8c9348fd67bb59940 Mon Sep 17 00:00:00 2001 From: Mikaela Young Date: Mon, 12 Aug 2019 13:36:46 +1200 Subject: [PATCH 2/3] Use temp fork --- composer.json | 10 +++++----- composer.lock | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 2b88f28..5994a02 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "ext-mbstring": "*", "silverstripe/docsviewer": "^2.0", "silverstripe/framework": "~3.6", - "silverstripe/toolbar": "^4.2", + "silverstripe/toolbar": "dev-feature/55276-swiftype-search", "silverstripe/dynamodb": "^3", "mandrew/silverstripe-quickfeedback": "^0.2", "silverstripe/raygun": "^1.1" @@ -15,10 +15,10 @@ "phpunit/phpunit": "~3.7@stable" }, "repositories": [ - { - "type": "vcs", - "url": "git://github.com/silverstripe/silverstripe-globaltoolbar.git" - } + { + "type": "vcs", + "url": "https://github.com/lexakami/silverstripe-globaltoolbar" + } ], "config": { "process-timeout": 600 diff --git a/composer.lock b/composer.lock index 6152bdc..a232b39 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bebddbda993b76e7ce5d76d5963b1764", + "content-hash": "66e3760a1d7af03c0407bd5abb301dd3", "packages": [ { "name": "aws/aws-sdk-php", @@ -1184,16 +1184,16 @@ }, { "name": "silverstripe/toolbar", - "version": "4.2.2", + "version": "dev-feature/55276-swiftype-search", "source": { "type": "git", - "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", - "reference": "1b0ea930e122e21f44fbb3b0e7c62ea7d47a06c3" + "url": "https://github.com/lexakami/silverstripe-globaltoolbar.git", + "reference": "f669e9148d40d3dd32f52bd3ce74148074bec6c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/1b0ea930e122e21f44fbb3b0e7c62ea7d47a06c3", - "reference": "1b0ea930e122e21f44fbb3b0e7c62ea7d47a06c3", + "url": "https://api.github.com/repos/lexakami/silverstripe-globaltoolbar/zipball/f669e9148d40d3dd32f52bd3ce74148074bec6c7", + "reference": "f669e9148d40d3dd32f52bd3ce74148074bec6c7", "shasum": "" }, "require": { @@ -1221,10 +1221,9 @@ "silverstripe" ], "support": { - "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2", - "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" + "source": "https://github.com/lexakami/silverstripe-globaltoolbar/tree/feature/55276-swiftype-search" }, - "time": "2019-07-08T23:12:15+00:00" + "time": "2019-08-08T04:59:31+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1755,6 +1754,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "silverstripe/toolbar": 20, "phpunit/phpunit": 0 }, "prefer-stable": true, From 81b04011549d2c1776e3df5f18d7c8d7e728779b Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 13 Aug 2019 11:39:08 +1200 Subject: [PATCH 3/3] Remove toolbar fork, lock toolbar to ~4.2.3 --- composer.json | 4 ++-- composer.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 5994a02..d50da7a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "ext-mbstring": "*", "silverstripe/docsviewer": "^2.0", "silverstripe/framework": "~3.6", - "silverstripe/toolbar": "dev-feature/55276-swiftype-search", + "silverstripe/toolbar": "~4.2.3", "silverstripe/dynamodb": "^3", "mandrew/silverstripe-quickfeedback": "^0.2", "silverstripe/raygun": "^1.1" @@ -17,7 +17,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/lexakami/silverstripe-globaltoolbar" + "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git" } ], "config": { diff --git a/composer.lock b/composer.lock index a232b39..18d1717 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "66e3760a1d7af03c0407bd5abb301dd3", + "content-hash": "584b20c5ae4aa35473bb51416f1500a2", "packages": [ { "name": "aws/aws-sdk-php", @@ -1184,16 +1184,16 @@ }, { "name": "silverstripe/toolbar", - "version": "dev-feature/55276-swiftype-search", + "version": "4.2.3", "source": { "type": "git", - "url": "https://github.com/lexakami/silverstripe-globaltoolbar.git", - "reference": "f669e9148d40d3dd32f52bd3ce74148074bec6c7" + "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", + "reference": "999a1c2587f13b5953498f6453d74c8469c24b64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lexakami/silverstripe-globaltoolbar/zipball/f669e9148d40d3dd32f52bd3ce74148074bec6c7", - "reference": "f669e9148d40d3dd32f52bd3ce74148074bec6c7", + "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/999a1c2587f13b5953498f6453d74c8469c24b64", + "reference": "999a1c2587f13b5953498f6453d74c8469c24b64", "shasum": "" }, "require": { @@ -1221,9 +1221,10 @@ "silverstripe" ], "support": { - "source": "https://github.com/lexakami/silverstripe-globaltoolbar/tree/feature/55276-swiftype-search" + "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2.3", + "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" }, - "time": "2019-08-08T04:59:31+00:00" + "time": "2019-08-12T23:19:56+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1754,7 +1755,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "silverstripe/toolbar": 20, "phpunit/phpunit": 0 }, "prefer-stable": true,