Commit bc435477 authored by Mirko Vucicevich's avatar Mirko Vucicevich

Merge branch 'use-production-vue' into 'master'

Use production vue + Bump Scinage version text to 3.0!!

See merge request !60
parents c52f149b fbc36a46
......@@ -92,7 +92,7 @@
<p>
<img height="30px" src="/static/img/logo.png" style="margin-right: 15px;">
<a href="https://git.uwaterloo.ca/science-computing/Scinage" target="_blank">Scinage</a> is developed by <a href="https://uwaterloo.ca/science-computing/" target="_blank">Science Computing</a> at the <a href="https://uwaterloo.ca/" target="_blank">University of Waterloo</a>
<span style="margin-left: 15px; color: #808080; font-size: 12px;">BETA 2.1</span>
<span style="margin-left: 15px; color: #808080; font-size: 12px;">BETA 3.0</span>
</p>
</div>
</div>
......
......@@ -195,9 +195,9 @@
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<script src="/static/fontselect/jquery.fontselect.min.js"></script>
{% comment %} <script src="https://cdn.jsdelivr.net/npm/vue"></script> {% endcomment %}
<script src="https://cdn.jsdelivr.net/npm/vue"></script>
<!-- development version, includes helpful console warnings -->
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
{% comment %} <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> {% endcomment %}
<!-- Add Vue components before main.js (where Vue is instatiated) -->
<script type="text/javascript" src="/static/js/components/sidebar.js"></script>
<script type="text/javascript" src="/static/js/components/sidebar-item.js"></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment