Merge pull request #174 from aldryn/feature/inherit

Feature/inherit

Author: FinalAngel

CHANGELOG.rst

@@ -3,6 +3,13 @@ Aldryn Boilerplate Bootstrap 3
 ##############################
 
 
+4.1.1
+=====
+
+- Fixed an issue with ``404.html`` inheriting from ``fullwidth.html``
+- Removed ``fullwidth.html`` references from documentation
+
+
 4.1.0
 =====
 - Removed standard templates ``fullwidth.html``, ``sidebar_left.html``,

boilerplate.json

@@ -1,7 +1,7 @@
 {
     "identifier": "bootstrap3",
     "package-name": "aldryn-boilerplate-bootstrap3-libsass",
-    "version": "4.1.0",
+    "version": "4.1.1",
     "templates": [
         ["base.html", "base"]
     ],

docs/structure/templates.rst

@@ -10,9 +10,7 @@ Templates
 
 From the top down the three layers are:
 
-- *user-selectable page templates* (``fullwidth.html``, ``sidebar_left.html``
-  and so on), which inherit from:
-- ``base.html``, which inherits from:
+- *user-selectable page templates* (``base.html``), which inherit from:
 - ``base_root.html``
 
 
@@ -93,13 +91,6 @@ which can be chosen within the CMS by the user.
 
 .. image:: ../_static/toolbar-templates.png
 
-The following templates are provided from the start:
-
-- ``fullwidth.html`` uses the 100% span of the Bootstrap grid
-- ``sidebar_left.html`` creates a left sidebar with the content placed on the right
-- ``sidebar_right.html`` creates a right sidebar with the content placed on the left
-- ``tpl_home.html`` specific template for the landing page
-
 
 ==========
 Page Types

templates/404.html

@@ -1,4 +1,4 @@
-{% extends "fullwidth.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
 {% block body_class %}tpl-404{% endblock %}