From 0782be6f923204be33f4d142c563c929bf1a5685 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Fri, 3 Aug 2018 16:04:52 -0400 Subject: [PATCH] testing out vue stuff --- js/index.js | 1 + templates/base.html | 27 +++++++++++++++------------ templates/components/modal.html | 26 ++++++++++++++++++++------ templates/home.html | 8 +++++++- templates/styleguide.html | 5 ++--- 5 files changed, 45 insertions(+), 22 deletions(-) diff --git a/js/index.js b/js/index.js index 4f8a3ad3..0c122a10 100644 --- a/js/index.js +++ b/js/index.js @@ -1,4 +1,5 @@ import classes from '../styles/atat.scss' +import Vue from 'vue/dist/vue' import './example' diff --git a/templates/base.html b/templates/base.html index 93dbe8e7..f7622db6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,25 +15,28 @@ - {% block template_vars %}{% endblock %} +
+ {% block template_vars %}{% endblock %} - {% include 'navigation/topbar.html' %} + {% include 'navigation/topbar.html' %} -
- {% include 'navigation/global_navigation.html' %} +
+ {% include 'navigation/global_navigation.html' %} -
- {% block sidenav %}{% endblock %} +
+ {% block sidenav %}{% endblock %} - {% block content %} - these are not the droids you are looking for - {% endblock %} + {% block content %} + these are not the droids you are looking for + {% endblock %} +
+ + {% include 'footer.html' %} + + {% block modal %}{% endblock %}
- {% include 'footer.html' %} - - {% block modal %}{% endblock %} {% assets "js_all" %} {% endassets %} diff --git a/templates/components/modal.html b/templates/components/modal.html index 8e483de4..c6918a0e 100644 --- a/templates/components/modal.html +++ b/templates/components/modal.html @@ -1,9 +1,23 @@ -{% macro Modal() -%} -
-