Merge branch 'master' into prod
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
<link href="{% static "css/site.css" %}" rel="stylesheet" />
|
<link href="{% static "css/site.css" %}" rel="stylesheet" />
|
||||||
<link rel="icon" href="{% static "favicon.32.png" %}" sizes="32x32" type="image/png">
|
<link rel="icon" href="{% static "favicon.32.png" %}" sizes="32x32" type="image/png">
|
||||||
<link rel="icon" href="{% static "/favicon.64.png" %}" sizes="64x64" type="image/png">
|
<link rel="icon" href="{% static "favicon.64.png" %}" sizes="64x64" type="image/png">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="nav">
|
<div class="nav">
|
||||||
@@ -21,14 +21,5 @@
|
|||||||
</div>
|
</div>
|
||||||
{% block bottom %}
|
{% block bottom %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<script>
|
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
|
||||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
|
||||||
|
|
||||||
ga('create', 'UA-62761470-2', 'auto');
|
|
||||||
ga('send', 'pageview');
|
|
||||||
</script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
<link href="{% static "css/site.css" %}" rel="stylesheet">
|
<link href="{% static "css/site.css" %}" rel="stylesheet">
|
||||||
|
<link rel="icon" href="{% static "favicon.32.png" %}" sizes="32x32" type="image/png">
|
||||||
|
<link rel="icon" href="{% static "favicon.64.png" %}" sizes="64x64" type="image/png">
|
||||||
</head>
|
</head>
|
||||||
<body class="login">
|
<body class="login">
|
||||||
<div>
|
<div>
|
||||||
@@ -17,15 +19,6 @@
|
|||||||
Login with your AndrewID
|
Login with your AndrewID
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
|
||||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
|
||||||
|
|
||||||
ga('create', 'UA-62761470-2', 'auto');
|
|
||||||
ga('send', 'pageview');
|
|
||||||
</script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user