requirements bump for latest release

the new way to do the links without adding links to images is probably
dumb and/or missing some stuff, but it works and does what I want, and I
think I like the old look of the colors better, so time to try it and
see if it sticks still

CONTRIBUTING.md

@@ -1,7 +1,10 @@
 # How to Contribute
 
 incorporeal-cms is a personal project seeking to implement a simpler, cleaner form of what would
-commonly be called a "CMS". I appreciate any help in making incorporeal-cms better.
+commonly be called a "CMS". I appreciate any help in making it better.
+
+incorporeal-cms is made available under the GNU Affero General Public License version 3, or any
+later version.
 
 ## Opening Issues
 
@@ -10,8 +13,24 @@ Issues should be posted to my Gitea instance at
 recommend starting the title with "Improvement:", "Bug:", or similar, so I can do a high level of
 prioritization.
 
-## Guidelines for Patches, etc.
+## Contributions
 
+I don't expect contributors to sign up for my personal Gitea in order to send contributions, but it
+of course makes it easier. If you wish to go this route, please sign up at
+<https://git.incorporeal.org/bss/incorporeal-cms> and fork the project. People planning on
+contributing often are also welcome to request access to the project directly.
+
+Otherwise, contact me via any means you know to reach me at, or <bss@incorporeal.org>, to discuss
+your change and to tell me how to pull your changes.
+
+### Guidelines for Patches, etc.
+
+* Cloning
+    * Clone the project. I would advise using a pull-based workflow where I have access to the hosted
+      repository --- using my Gitea, cloning to a public GitHub, etc. --- rather than doing this over
+      email, but that works too if we must.
+    * Make your contributions in a new branch, generally off of `master`.
+    * Send me a pull request when you're ready, and we'll go through a code review.
 * Code:
     * Keep in mind that I strive for simplicity in the software. It serves files and renders
       Markdown, that's pretty much it. Features around that function are good; otherwise, I need
@@ -27,22 +46,31 @@ prioritization.
     * Squash tiny commits if you'd like. I prefer commits that make one atomic conceptual change
       that doesn't affect the rest of the code, assembling multiple of those commits into larger
       changes.
-    * Follow something like [Chris Beams'](https://chris.beams.io/posts/git-commit/) post on
+    * Follow something like [Chris Beams's post](https://chris.beams.io/posts/git-commit/) on
       formatting a good commit message.
+    * Please make sure your Author contact information is stable, in case I need to reach you.
+    * Consider cryptographically signing (`git commit -S`) your commits.
 
-## Contributions
+### Custody of Contributions
 
-I don't expect contributors to sign up for my personal Gitea in order to send contributions, but it
-of course makes it easier. If you wish to go this route, please sign up at
-<https://git.incorporeal.org/bss/incorporeal-cms> and fork the project. People planning on
-contributing often are also welcome to request access to the project directly.
+I do not request the copyright of contributions be assigned to me or to the project, and I require no
+provision that I be allowed to relicense your contributions. My personal oath is to maintain
+inbound=outbound in my open source projects, and the expectation is authors are responsible for their
+contributions.
 
-Otherwise, contact me via any means you know to reach me at, or <bss@incorporeal.org>, to discuss
-your change and to tell me how to pull your changes.
+I am following the *spirit* of the [Developer Certificate of Origin](https://developercertificate.org/),
+but in a simplified fashion:
 
-### Copyright of Contributions
+By making a contribution to this project, you certify that:
 
-Accepted changes remain the copyright of the original author, but please include appropriate contact
-methods in the event I choose to provide the project under a new license and need to contact you
-to approve the new license terms. Please note that the software is provided under the GNU AGPLv3 (or
-later).
+1. The contribution was created by you and you have the right to submit it under the open source license
+   indicated in the LICENSE file; or
+2. The contribution is based upon previous work that is covered under an appropriate open source license
+   compatible with the license indicated in the LICENSE file, and you have the right to contribute that
+   work with or without modifications, under the terms of that same open source license; or
+3. The contribution was provided directly to you by some other person who certified points 1, 2, or 3, and
+   you have not modified it.
+
+In the event of point 3, your commit **must** include the Signed-off-by line(s) as a chain of custody,
+via `git commit -s`. For points 1 and 2, your commit with accurate Author information doubles as direct
+custody.

incorporealcms/static/css/base.css

@@ -12,11 +12,11 @@ body {
 }
 
 .site-wrap-normal-width {
-    max-width: 80pc;
+    max-width: 65pc;
 }
 
 .site-wrap-double-width {
-    max-width: 160pc;
+    max-width: 130pc;
 }
 
 .site-wrap {
@@ -34,8 +34,8 @@ a {
 div.header {
     display: flex;
     justify-content: space-between;
-    font-size: 0.75em;
-    padding: 0.5em 1em;
+    font-size: 0.9em;
+    padding: 1rem 1rem;
 }
 
 div.header a {
@@ -44,17 +44,10 @@ div.header a {
 
 div.content {
     font-size: 11pt;
-    padding: 0 1em;
+    padding: 0 1rem;
     line-height: 1.6em;
 }
 
-@media only screen and (min-width: 70pc) {
-    div.content, footer {
-        margin-left: 5pc;
-        margin-right: 5pc;
-    }
-}
-
 div.content p {
     margin: 1.25em 0;
 }

incorporealcms/static/css/dark.css

@@ -6,29 +6,28 @@ html {
 }
 
 body {
-    background: #090909;
+    background: #111;
 }
 
-strong {
-    color: #EEE;
-}
-
-.site-wrap {
-    background: black;
-}
-
-a:link, a:visited {
+h1, h2, h3, h4, h5, h6 {
     color: #B31D15;
 }
 
-a:hover, a:active {
+p a, ul a, ol a {
+    color: #DDD;
+    border-bottom: 1px solid #DDD;
+}
+
+p a:hover, ul a:hover, ol a:hover {
     color: #B31D15;
     border-bottom: 1px solid #B31D15;
 }
 
+div.site-wrap {
+    background: black;
+}
+
 div.header {
-    background: #222;
-    border-bottom: 1px solid #222;
     color: #BBB;
 }
 
@@ -36,6 +35,10 @@ div.header a {
     color: #BBB;
 }
 
+div.header a:hover, div.header a:active {
+    border-bottom: 1px solid #BBB;
+}
+
 table, th, td {
     border: 1px solid #333;
 }

incorporealcms/static/css/light.css

@@ -6,29 +6,28 @@ html {
 }
 
 body {
-    background: #F6F6F6;
+    background: #EEE;
 }
 
-strong {
-    color: #111;
+h1, h2, h3, h4, h5, h6 {
+    color: #811610;
 }
 
-.site-wrap {
+p a, ul a, ol a {
+    color: #222;
+    border-bottom: 1px solid #222;
+}
+
+p a:hover, ul a:hover, ol a:hover {
+    color: #811610;
+    border-bottom: 1px solid #811610;
+}
+
+div.site-wrap {
     background: white;
 }
 
-a:link, a:visited {
-    color: #811610;
-}
-
-a:hover, a:active {
-    color: #811610;
-    border-bottom: 1px solid #B31D15;
-}
-
 div.header {
-    background: #DDD;
-    border-bottom: 1px solid #DDD;
     color: #444;
 }
 
@@ -36,6 +35,10 @@ div.header a {
     color: #444;
 }
 
+div.header a:hover, div.header a:active {
+    border-bottom: 1px solid #444;
+}
+
 table, th, td {
     border: 1px solid #CCC;
 }

requirements/requirements-dev.txt

@@ -8,16 +8,16 @@ attrs==21.4.0
     # via pytest
 bandit==1.7.4
     # via -r requirements/requirements-dev.in
-certifi==2021.10.8
+certifi==2022.5.18.1
     # via requests
 charset-normalizer==2.0.12
     # via requests
-click==8.1.2
+click==8.1.3
     # via
     #   flask
     #   pip-tools
     #   safety
-coverage[toml]==6.3.2
+coverage[toml]==6.4
     # via pytest-cov
 distlib==0.3.4
     # via virtualenv
@@ -25,7 +25,7 @@ dlint==0.12.0
     # via -r requirements/requirements-dev.in
 dparse==0.5.1
     # via safety
-filelock==3.6.0
+filelock==3.7.0
     # via
     #   tox
     #   virtualenv
@@ -54,7 +54,7 @@ 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.1.1
+flask==2.1.2
     # via -r requirements/requirements.in
 gitdb==4.0.9
     # via gitpython
@@ -68,9 +68,9 @@ isort==5.10.1
     # via flake8-isort
 itsdangerous==2.1.2
     # via flask
-jinja2==3.1.1
+jinja2==3.1.2
     # via flask
-markdown==3.3.6
+markdown==3.3.7
     # via -r requirements/requirements.in
 markupsafe==2.1.1
     # via jinja2
@@ -82,11 +82,11 @@ packaging==21.3
     #   pytest
     #   safety
     #   tox
-pbr==5.8.1
+pbr==5.9.0
     # via stevedore
 pep517==0.12.0
     # via pip-tools
-pip-tools==6.6.0
+pip-tools==6.6.2
     # via -r requirements/requirements-dev.in
 platformdirs==2.5.2
     # via virtualenv
@@ -106,11 +106,11 @@ pydot==1.4.2
     # via -r requirements/requirements-dev.in
 pyflakes==2.4.0
     # via flake8
-pyparsing==3.0.8
+pyparsing==3.0.9
     # via
     #   packaging
     #   pydot
-pytest==7.1.1
+pytest==7.1.2
     # via
     #   -r requirements/requirements-dev.in
     #   pytest-cov
@@ -157,7 +157,7 @@ versioneer==0.22
     # via -r requirements/requirements-dev.in
 virtualenv==20.14.1
     # via tox
-werkzeug==2.1.1
+werkzeug==2.1.2
     # via flask
 wheel==0.37.1
     # via

requirements/requirements.txt

@@ -4,17 +4,17 @@
 #
 #    pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
 #
-click==8.1.2
+click==8.1.3
     # via flask
-flask==2.1.1
+flask==2.1.2
     # via -r requirements/requirements.in
 itsdangerous==2.1.2
     # via flask
-jinja2==3.1.1
+jinja2==3.1.2
     # via flask
-markdown==3.3.6
+markdown==3.3.7
     # via -r requirements/requirements.in
 markupsafe==2.1.1
     # via jinja2
-werkzeug==2.1.1
+werkzeug==2.1.2
     # via flask