Merge branch '2.0'

.travis.yml

@@ -11,19 +11,20 @@ matrix:
     - php: 5.6
       env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=PGSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=PGSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_TEST=1
     - php: 7.2
-      env: DB=MYSQL RECIPE_VERSION=1.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_COVERAGE_TEST=1
 
 before_script:
   # Init PHP
   - phpenv rehash
   - phpenv config-rm xdebug.ini || true
 
   - composer require --no-update silverstripe/recipe-cms "$RECIPE_VERSION"
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
+  # Note: Postgres version is for SilverStripe >= 4.2.x
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:

client/src/components/ModuleDetails/ModuleDetails.scss

@@ -6,17 +6,17 @@
 // Remove the background from the default popover header
 .package-summary__details-header {
   padding-bottom: 0;
-  padding-top: $popover-padding;
+  padding-top: $spacer;
   background: 0;
   border: 0;
 }
 
 .package-summary__security-alerts {
-  margin-top: $popover-padding;
-  margin-bottom: $popover-padding * .5;
+  margin-top: $spacer;
+  margin-bottom: $spacer * .5;
 
   h4 {
-    margin-bottom: $popover-padding * .5;
+    margin-bottom: $spacer * .5;
   }
 
   // Undoing the default styles that come for .popover-body a from admin module
@@ -35,6 +35,7 @@
 }
 .package-summary__details-header {
   display: flex;
+  min-width: 12rem;
 
   a {
     text-decoration: none;