Merge branch 'release/2.0.2' into craft-webpack

.gitignore

@@ -25,6 +25,7 @@
 # ASSETS
 /web/assets/*
 /web/cpresources/*
+/web/dist/*
 
 # BUILD FILES
 /bower_components/*

CHANGELOG.md

@@ -1,5 +1,12 @@
 # nystudio107/craft Change Log
 
+## 2.0.2 - 2018.08.17
+### Changed
+* Added `maxUploadFileSize` to `general.php`
+* Added `/web/dist/*` to `.gitignore`
+* Refactored the error pages out to a single channel
+* Added generic login image background
+
 ## 2.0.1 - 2018.08.15
 ### Changed
 * Numerous template changes to get the base build working

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.2 CMS scaffolding project",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "keywords": [
     "craft",
     "cms",

config/general.php

@@ -36,6 +36,7 @@
     'errorTemplatePrefix' => 'errors/',
     'generateTransformsBeforePageLoad' => true,
     'maxCachedCloudImageSize' => 3000,
+    'maxUploadFileSize' => '100M',
     'omitScriptNameInUrls' => true,
     'useEmailAsUsername' => true,
     'usePathInfo' => true,

modules/sitemodule/src/assetbundles/sitemodule/dist/css/SiteModule.css

@@ -11,8 +11,8 @@
  */
 
 body.login {
-    background-size: 600px;
-    background-repeat: repeat;
+    background-size: cover;
+    background-repeat: no-repeat;
     background-image: url('/img/site/login-background-image.svg');
 }
 

templates/_layouts/error-page-layout.twig

@@ -27,10 +27,10 @@
         <div class="container mx-auto py-8">
             <div class="text-center p-8 mb-8">
                 <h1 class="font-mono italic font-bold text-5xl pt-4">
-                    {{ entry.errorHeadline }}
+                    {{ entry.errorHeadline ?? 'Error' }}
                 </h1>
                 <p class="font-sans text-xl pt-4">
-                    {{ entry.errorText |nl2br }}
+                    {{ (entry.errorText ?? 'An error has occurred.') |nl2br }}
                 </p>
             </div>
         </div>

templates/errors/404.twig

@@ -1,3 +1,3 @@
-{% set entry = craft.entries.section("notFound").limit(1).one() %}
+{% set entry = craft.entries.section('errors').slug('error404').one() %}
 
 {% extends "_layouts/error-page-layout.twig" %}

templates/errors/503.twig

@@ -1,3 +1,3 @@
-{% set entry = craft.entries.section("serviceUnavailable").limit(1).one() %}
+{% set entry = craft.entries.section('errors').slug('error503').one() %}
 
 {% extends "_layouts/error-page-layout.twig" %}

templates/errors/error.twig

@@ -1,3 +1,3 @@
-{% set entry = craft.entries.section("genericError").limit(1).one() %}
+{% set entry = craft.entries.section('errors').slug('errorError').one() %}
 
 {% extends "_layouts/error-page-layout.twig" %}

templates/errors/offline.twig

@@ -1,3 +1,3 @@
-{% set entry = craft.entries.section("siteOffline").limit(1).one() %}
+{% set entry = craft.entries.section('errors').slug('errorOffline').one() %}
 
 {% extends "_layouts/error-page-layout.twig" %}