Add intercooler and dependencies

This commit is contained in:
Jason F. McBrayer 2018-08-30 15:21:51 -04:00
parent 3f84d26e41
commit 02a20722fe
7 changed files with 3801 additions and 185 deletions

File diff suppressed because it is too large Load Diff

1650
brutaldon/static/js/zepto.js Normal file

File diff suppressed because it is too large Load Diff

2
brutaldon/static/js/zepto.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -27,6 +27,8 @@
<link rel="stylesheet"
href="{% static 'css/fork-awesome.min.css' %}">
{% block page_scripts %}
<script type="text/javascript" src="{% static 'js/zepto.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/intercooler.js' %}"></script>
{% endblock %}
{% endif %}
{% endif %}
@ -137,7 +139,7 @@
{% if not preferences.theme.is_brutalist %}
<script type="application/javascript">
document.addEventListener('DOMContentLoaded', function () {
document.addEventListener('DOMContentLoaded', function () {
// Remove is-active from navbar menu
var menu = document.querySelector('#navMenu');
menu.classList.remove('is-active');
@ -181,7 +183,7 @@ document.addEventListener('DOMContentLoaded', function () {
});
}
});
});
</script>
{% block page_scripts_inline %}
{% endblock %}

View File

@ -34,9 +34,9 @@ def humane_time(arg):
else:
utc = ""
if diff < timedelta(hours=6):
return arg.strftime("%a, %b %d, %Y at %-I:%M %p") + utc
return arg.strftime("%a, %b %d, %Y at %I:%M %p") + utc
elif diff < timedelta(hours=12):
return arg.strftime("%a, %b %d, %Y around %-I %p") + utc
return arg.strftime("%a, %b %d, %Y around %I %p") + utc
elif diff < timedelta(hours=36):
return arg.strftime("%a, %b %d, %Y in the ") + time_of_day(arg.hour) + utc
elif diff < timedelta(days=6*28):

View File

@ -3,6 +3,8 @@
"bulma": "^0.7.1",
"bulmaswatch": "^0.6.2",
"fork-awesome": "^1.1.0",
"mousetrap": "^1.6.2"
"intercooler": "^1.2.1",
"mousetrap": "^1.6.2",
"zepto": "^1.2.0"
}
}

View File

@ -14,6 +14,14 @@ fork-awesome@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.0.tgz#771c8fcee6bb3d1481c8394094d4ea1f2d3e4acc"
intercooler@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/intercooler/-/intercooler-1.2.1.tgz#50e9727ef2643ef7d5130c8e58f2af78098aa01f"
mousetrap@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.2.tgz#caadd9cf886db0986fb2fee59a82f6bd37527587"
zepto@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/zepto/-/zepto-1.2.0.tgz#e127bd9e66fd846be5eab48c1394882f7c0e4f98"