Compare commits

...

4 Commits

Author SHA1 Message Date
853a58b78b
make the breadcrumbs and style menu a bit nicer 2022-03-24 22:41:34 -05:00
3cade4fe73
add the image floats to the plain CSS
primarily it's the main page that just looks weird without it
2022-03-24 22:28:09 -05:00
63a764c6a0
don't use system tz, display timestamps as UTC
no particular reason, just one less dependency, and it goes further
towards my idyllic world where everyone is on UTC and there are no
timezones
2022-03-24 22:12:00 -05:00
d129d04e04
remove mdx_linkify and do requirement bumps 2022-03-24 22:00:37 -05:00
6 changed files with 54 additions and 72 deletions

View File

@ -32,7 +32,7 @@ class Config(object):
},
}
MARKDOWN_EXTENSIONS = ['extra', 'mdx_linkify', 'sane_lists', 'smarty', 'tables']
MARKDOWN_EXTENSIONS = ['extra', 'sane_lists', 'smarty', 'tables']
MARKDOWN_EXTENSION_CONFIGS = {
'extra': {
'attr_list': {},

View File

@ -7,7 +7,6 @@ import re
from flask import Blueprint, Markup, abort
from flask import current_app as app
from flask import redirect, request, send_from_directory
from tzlocal import get_localzone
from incorporealcms.lib import get_meta_str, init_md, render
@ -51,7 +50,7 @@ def handle_markdown_file_path(resolved_path):
try:
logger.debug("opening resolved path '%s'", resolved_path)
with app.open_instance_resource(resolved_path, 'r') as entry_file:
mtime = datetime.datetime.fromtimestamp(os.path.getmtime(entry_file.name), get_localzone())
mtime = datetime.datetime.fromtimestamp(os.path.getmtime(entry_file.name), tz=datetime.timezone.utc)
entry = entry_file.read()
logger.debug("resolved path '%s' read", resolved_path)
except OSError:

View File

@ -1,4 +1,9 @@
/* specify almost no styling, just fix some image rendering */
/* specify almost no styling, just fix some image and nav rendering */
div.header {
display: flex;
justify-content: space-between;
}
.img-25 {
max-width: 25% !important;
}
@ -10,3 +15,19 @@
.img-75 {
max-width: 75% !important;
}
.img-center {
display: block;
margin-left: auto;
margin-right: auto;
}
.img-left {
float: left;
margin-right: 1em;
}
.img-right {
float: right;
margin-left: 1em;
}

View File

@ -8,18 +8,16 @@ attrs==21.4.0
# via pytest
bandit==1.6.2
# via -r requirements/requirements-dev.in
bleach==4.1.0
# via mdx-linkify
certifi==2021.10.8
# via requests
charset-normalizer==2.0.10
charset-normalizer==2.0.12
# via requests
click==8.0.3
click==8.0.4
# via
# flask
# pip-tools
# safety
coverage[toml]==6.2
coverage[toml]==6.3.2
# via pytest-cov
distlib==0.3.4
# via virtualenv
@ -27,7 +25,7 @@ dlint==0.12.0
# via -r requirements/requirements-dev.in
dparse==0.5.1
# via safety
filelock==3.4.2
filelock==3.6.0
# via
# tox
# virtualenv
@ -40,7 +38,7 @@ flake8==4.0.1
# flake8-executable
# flake8-isort
# flake8-mutable
flake8-blind-except==0.2.0
flake8-blind-except==0.2.1
# via -r requirements/requirements-dev.in
flake8-builtins==1.5.3
# via -r requirements/requirements-dev.in
@ -56,11 +54,11 @@ flake8-logging-format==0.6.0
# via -r requirements/requirements-dev.in
flake8-mutable==1.2.0
# via -r requirements/requirements-dev.in
flask==2.0.2
flask==2.0.3
# via -r requirements/requirements.in
gitdb==4.0.9
# via gitpython
gitpython==3.1.26
gitpython==3.1.27
# via bandit
idna==3.3
# via requests
@ -68,34 +66,29 @@ iniconfig==1.1.1
# via pytest
isort==5.10.1
# via flake8-isort
itsdangerous==2.0.1
itsdangerous==2.1.2
# via flask
jinja2==3.0.3
jinja2==3.1.0
# via flask
markdown==3.3.6
# via
# -r requirements/requirements.in
# mdx-linkify
markupsafe==2.0.1
# via -r requirements/requirements.in
markupsafe==2.1.1
# via jinja2
mccabe==0.6.1
# via flake8
mdx-linkify==2.1
# via -r requirements/requirements.in
packaging==21.3
# via
# bleach
# dparse
# pytest
# safety
# tox
pbr==5.8.0
pbr==5.8.1
# via stevedore
pep517==0.12.0
# via pip-tools
pip-tools==6.4.0
pip-tools==6.5.1
# via -r requirements/requirements-dev.in
platformdirs==2.4.1
platformdirs==2.5.1
# via virtualenv
pluggy==1.0.0
# via
@ -113,18 +106,16 @@ pydot==1.4.2
# via -r requirements/requirements-dev.in
pyflakes==2.4.0
# via flake8
pyparsing==3.0.6
pyparsing==3.0.7
# via
# packaging
# pydot
pytest==6.2.5
pytest==7.1.1
# via
# -r requirements/requirements-dev.in
# pytest-cov
pytest-cov==3.0.0
# via -r requirements/requirements-dev.in
pytz-deprecation-shim==0.1.0.post0
# via tzlocal
pyyaml==6.0
# via
# bandit
@ -136,7 +127,6 @@ safety==1.10.3
six==1.16.0
# via
# bandit
# bleach
# tox
# virtualenv
smmap==5.0.0
@ -145,36 +135,30 @@ snowballstemmer==2.2.0
# via pydocstyle
stevedore==3.5.0
# via bandit
testfixtures==6.18.3
testfixtures==6.18.5
# via flake8-isort
toml==0.10.2
# via
# dparse
# pytest
# tox
tomli==2.0.0
tomli==2.0.1
# via
# coverage
# pep517
# pytest
tox==3.24.5
# via
# -r requirements/requirements-dev.in
# tox-wheel
tox-wheel==0.7.0
# via -r requirements/requirements-dev.in
tzdata==2021.5
# via pytz-deprecation-shim
tzlocal==4.1
# via -r requirements/requirements.in
urllib3==1.26.8
urllib3==1.26.9
# via requests
versioneer==0.21
versioneer==0.22
# via -r requirements/requirements-dev.in
virtualenv==20.13.0
virtualenv==20.13.4
# via tox
webencodings==0.5.1
# via bleach
werkzeug==2.0.2
werkzeug==2.0.3
# via flask
wheel==0.37.1
# via

View File

@ -1,4 +1,2 @@
Flask # general purpose web service and web server stuff
Markdown # markdown rendering in templates
mdx-linkify # convert URLs in the text to clickable links
tzlocal # identifying system's local timezone

View File

@ -4,37 +4,17 @@
#
# pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
#
bleach==4.1.0
# via mdx-linkify
click==8.0.3
click==8.0.4
# via flask
flask==2.0.2
flask==2.0.3
# via -r requirements/requirements.in
itsdangerous==2.0.1
itsdangerous==2.1.2
# via flask
jinja2==3.0.3
jinja2==3.1.0
# via flask
markdown==3.3.6
# via
# -r requirements/requirements.in
# mdx-linkify
markupsafe==2.0.1
# via -r requirements/requirements.in
markupsafe==2.1.1
# via jinja2
mdx-linkify==2.1
# via -r requirements/requirements.in
packaging==21.3
# via bleach
pyparsing==3.0.6
# via packaging
pytz-deprecation-shim==0.1.0.post0
# via tzlocal
six==1.16.0
# via bleach
tzdata==2021.5
# via pytz-deprecation-shim
tzlocal==4.1
# via -r requirements/requirements.in
webencodings==0.5.1
# via bleach
werkzeug==2.0.2
werkzeug==2.0.3
# via flask