Merge pull request #173 from aldryn/feature/release

Bumped version to 4.1.0

Author: FinalAngel

CHANGELOG.rst

@@ -3,6 +3,12 @@ Aldryn Boilerplate Bootstrap 3
 ##############################
 
 
+4.1.0
+=====
+- Removed standard templates ``fullwidth.html``, ``sidebar_left.html``,
+  ``sidebar_right.html`` and ``tpl_home.html`` and use ``base.html`` instead
+
+
 4.0.9
 =====
 - Removed dead references to select2 images

boilerplate.json

@@ -1,12 +1,9 @@
 {
     "identifier": "bootstrap3",
     "package-name": "aldryn-boilerplate-bootstrap3-libsass",
-    "version": "4.0.9",
+    "version": "4.1.0",
     "templates": [
-        ["fullwidth.html", "full width"],
-        ["sidebar_left.html", "sidebar left"],
-        ["sidebar_right.html", "sidebar right"],
-        ["tpl_home.html", "home template"]
+        ["base.html", "base"],
     ],
     "excluded": [
         "docs",

templates/base.html

@@ -76,7 +76,13 @@ <h3 class="sr-only">{% trans "You are here" %}</h3>
     {% block messages %}
         {% include "includes/messages.html" %}
     {% endblock messages %}
-    {% block content %}{% endblock %}
+    {% block content %}
+        {% with 960 as width %}
+            <div class="container">
+                {% placeholder "content" %}
+            </div>
+        {% endwith %}
+    {% endblock %}
 {% endblock extend_base %}
 <hr class="sr-only" />
 {# end: content #}