diff --git a/js/example.js b/js/example.js deleted file mode 100644 index 7cb5b7d1..00000000 --- a/js/example.js +++ /dev/null @@ -1,4 +0,0 @@ -window.onload = function() { - console.log('hello from example') -} - diff --git a/js/index.js b/js/index.js index 4f8a3ad3..72dbda3d 100644 --- a/js/index.js +++ b/js/index.js @@ -1,5 +1,21 @@ import classes from '../styles/atat.scss' +import Vue from 'vue/dist/vue' -import './example' - -console.log('hello from index') +const app = new Vue({ + el: '#app-root', + methods: { + closeModal: function(name) { + this.modals[name] = false + }, + openModal: function (name) { + this.modals[name] = true + } + }, + data: function() { + return { + modals: { + styleguideModal: false, + } + } + } +}) diff --git a/styles/components/_global_layout.scss b/styles/components/_global_layout.scss index d79890c5..47995964 100644 --- a/styles/components/_global_layout.scss +++ b/styles/components/_global_layout.scss @@ -1,4 +1,4 @@ -body { +#app-root { background-color: $color-gray-lightest; display: flex; flex-direction: column; diff --git a/styles/core/_util.scss b/styles/core/_util.scss index 48957b6c..c041db1e 100644 --- a/styles/core/_util.scss +++ b/styles/core/_util.scss @@ -31,3 +31,7 @@ @mixin line-max { max-width: 45em; } + +[v-cloak] { + display: none +} diff --git a/templates/base.html b/templates/base.html index 93dbe8e7..185cd205 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..aedebd42 100644 --- a/templates/components/modal.html +++ b/templates/components/modal.html @@ -1,8 +1,20 @@ -{% macro Modal() -%} -
-