From 41f6267c234291eb48394280f9767d0754c0b9f6 Mon Sep 17 00:00:00 2001
From: Martin Portevin <DrMartinGonzo@users.noreply.github.com>
Date: Tue, 12 Jun 2018 16:17:31 +0200
Subject: [PATCH 1/2] Fix "+" icon in add new inline button

---
 .../Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss b/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss
index c63a65a..40f70de 100644
--- a/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss
+++ b/templates/Symbiote/GridFieldExtensions/GridFieldAddNewInlineButton.ss
@@ -1,3 +1,3 @@
-<button href="$Link" class="ss-gridfield-add-new-inline btn btn-primary" data-icon="add">
+<button href="$Link" class="ss-gridfield-add-new-inline btn btn-primary font-icon-plus-circled">
 	$Title
 </button>

From 688c29ba049cd56dcfccc6d15204b2b92d145bd0 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Mon, 25 Jun 2018 14:16:05 +1200
Subject: [PATCH 2/2] Add various recipe versions to Travis build matrix

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e18a3b..74cc970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,25 +2,25 @@ language: php
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION="4.0.x-dev"
+    - COMPOSER_ROOT_VERSION="3.1.x-dev"
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=PGSQL PHPUNIT_TEST=1
+      env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.2
-      env: DB=MYSQL PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
 
 before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
 
   - composer validate
-  - composer require silverstripe/recipe-core 1.0.x-dev  --no-update
+  - composer require silverstripe/recipe-core "$RECIPE_VERSION"  --no-update
   - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --no-update; fi
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile