From ed8de4962250c423790a2bb28e72e5a3692c49d2 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 9 Aug 2015 01:34:20 +0100
Subject: [PATCH] Changed base to default
---
source/_layouts/base.html.twig | 29 -----------------------------
source/_layouts/default.html.twig | 30 +++++++++++++++++++++++++++++-
2 files changed, 29 insertions(+), 30 deletions(-)
delete mode 100644 source/_layouts/base.html.twig
diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig
deleted file mode 100644
index fe5bdc40..00000000
--- a/source/_layouts/base.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<!--[if lte IE 8]> <html class="ie ie8 lt9 lte8 lte7"> <![endif]-->
-<!--[if IE 9]> <html class="ie ie9 lte9"> <![endif]-->
-<!--[if gt IE 9]> <html> <![endif]-->
-<!--[if !IE]><!--> <html> <!--<![endif]-->
- {% include 'head' %}
- <body class="{% block body_classes %}{% endblock %}">
- <!--[if lt IE 7]>
- <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
- <![endif]-->
-
- {% include 'navbar' %}
-
- <div class="container">
- <div class="row">
- {% block content_wrapper %}
- <main class="col-md-10">
- {% block content %}{% endblock %}
- </main>
- {% endblock %}
-
- {% include 'sidebar' %}
- </div>{# .row #}
- </div>{# .container #}
-
- {% include 'footer_content' %}
- {% include 'footer_scripts' %}
- </body>
-</html>
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index d2b36be9..fe5bdc40 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -1 +1,29 @@
-{% extends "base.html.twig" %}
+<!DOCTYPE html>
+<!--[if lte IE 8]> <html class="ie ie8 lt9 lte8 lte7"> <![endif]-->
+<!--[if IE 9]> <html class="ie ie9 lte9"> <![endif]-->
+<!--[if gt IE 9]> <html> <![endif]-->
+<!--[if !IE]><!--> <html> <!--<![endif]-->
+ {% include 'head' %}
+ <body class="{% block body_classes %}{% endblock %}">
+ <!--[if lt IE 7]>
+ <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+ <![endif]-->
+
+ {% include 'navbar' %}
+
+ <div class="container">
+ <div class="row">
+ {% block content_wrapper %}
+ <main class="col-md-10">
+ {% block content %}{% endblock %}
+ </main>
+ {% endblock %}
+
+ {% include 'sidebar' %}
+ </div>{# .row #}
+ </div>{# .container #}
+
+ {% include 'footer_content' %}
+ {% include 'footer_scripts' %}
+ </body>
+</html>