Merge branch 'develop'

README.md

@@ -302,9 +302,9 @@ for more information.
 
 ## Maintainers
 
-[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](http://www.praxis.net.au)
+[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](https://www.praxis.net.au)
 ---|---
-[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](http://www.praxis.net.au)
+[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](https://www.praxis.net.au)
 
 ## License
 

client/src/styles/components/ContentComponent.scss

@@ -11,4 +11,14 @@
 
   }
 
+  > div.content {
+
+    &:after {
+      content: "";
+      display: table;
+      clear: both;
+    }
+
+  }
+
 }

composer.json

@@ -15,7 +15,7 @@
       "name": "Colin Tucker",
       "role": "Developer",
       "email": "colin@praxis.net.au",
-      "homepage": "http://www.praxis.net.au"
+      "homepage": "https://www.praxis.net.au"
     }
   ],
   "require": {

package.json

@@ -15,7 +15,7 @@
     {
       "name": "Colin Tucker",
       "email": "colin@praxis.net.au",
-      "url": "http://www.praxis.net.au"
+      "url": "https://www.praxis.net.au"
     }
   ],
   "repository": {

src/Extensions/Model/ImageResizeExtension.php

@@ -17,6 +17,7 @@
 
 namespace SilverWare\Extensions\Model;
 
+use SilverStripe\Assets\File;
 use SilverStripe\Assets\Image;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
@@ -95,18 +96,24 @@ public function updateFieldLabels(&$labels)
     /**
      * Answers a resized image using the defined dimensions and resize method.
      *
-     * @param Image $image Image object to be resized.
+     * @param File $image Image object to be resized.
      *
-     * @return Image
+     * @return File
      */
-    public function performImageResize(Image $image)
+    public function performImageResize(File $image)
     {
-        return $this->tools()->resize(
-            $image,
-            $this->owner->ImageResizeWidth,
-            $this->owner->ImageResizeHeight,
-            $this->owner->ImageResizeMethod
-        );
+        if ($image instanceof Image) {
+
+            return $this->tools()->resize(
+                $image,
+                $this->owner->ImageResizeWidth,
+                $this->owner->ImageResizeHeight,
+                $this->owner->ImageResizeMethod
+            );
+
+        }
+
+        return $image;
     }
 
     /**

webpack.config.js

@@ -73,12 +73,7 @@ const rules = (env) => {
           loader: 'postcss-loader'
         },
         {
-          loader: 'sass-loader',
-          options: {
-            includePaths: [
-              path.resolve(process.env.PWD, '../') // allows resolving of framework paths in symlinked modules
-            ]
-          }
+          loader: 'sass-loader'
         }
       ])
     },