diff --git a/.githooks/post-receive b/.githooks/post-receive index dbca694..256f6dd 100644 --- a/.githooks/post-receive +++ b/.githooks/post-receive @@ -155,7 +155,7 @@ deploy_path=$(get_deploy_path "$branch") envfile=$(get_deploy_env_file "$branch") - if [[ "$branch" == "production" || "$branch" == "main" || "$branch" == "testing" ]]; then + if [[ "$branch" == "staging" || "$branch" == "main" || "$branch" == "testing" ]]; then # For testing environments, use the efficient method (replace everything) if [[ "$branch" == "testing" ]]; then diff --git a/content b/content index 239c1cf..938e7e7 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 239c1cfcd1785c1deb6d69b2eb34f475c8bcfab4 +Subproject commit 938e7e76247b5c34c754f7be344ce5f7b881e1f3 diff --git a/package.json b/package.json index 5eaba99..fb725b5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "stop-main": "node_modules/pm2/bin/pm2 delete expressjs-blog-main", "stop-testing": "node_modules/pm2/bin/pm2 delete expressjs-blog-testing", "test:prepush": "node scripts/test-prepush.js", - "test:postreceive": "node scripts/test-postreceive.js" + "test:postreceive": "node scripts/test-postreceive.js", + "update-submodules": "git submodule update --init --recursive --remote" }, "keywords": [], "author": "", diff --git a/public/css/post.css b/public/css/post.css index 5a03f89..8d4054d 100644 --- a/public/css/post.css +++ b/public/css/post.css @@ -7,9 +7,11 @@ } .markdown-content p, .markdown-content li { - max-width: 60ch; + max-width: 70ch; line-height: 1.6; margin-bottom: 1.25rem; + padding-left: 0.5rem; + text-indent: 0.5rem; } .markdown-content h1, .markdown-content h2 { margin-top: 2rem; @@ -55,4 +57,19 @@ .markdown-content a:hover { text-decoration: underline; } - \ No newline at end of file + .markdown-content h2 { + padding-left: 0.5rem; + border-left: 4px solid #ccc; + margin-left: -0.5rem; +} + +.markdown-content ul { + padding-left: 1.25rem; /* increase left padding */ + list-style-position: outside; + list-style-type: disc; +} + +.markdown-content ul li { + margin-bottom: 0.75rem; + text-indent: -0.25rem; /* slight hanging indent */ +} diff --git a/src/routes/pages.js b/src/routes/pages.js index 9182e92..c6ac3a1 100644 --- a/src/routes/pages.js +++ b/src/routes/pages.js @@ -14,20 +14,17 @@ ) { // construction.register("/newsletter", "Newsletter"); construction.register("/projects", "Projects"); - construction.register("/about/blog", "About this blog"); } else { - markdown.register("/about/blog", "about-blog"); markdown.register("/projects", "projects"); } +markdown.register("/about/blog", "about-blog"); const newsletter = require("./newsletter"); router.use(newsletter, csrfToken); construction.register("/changelog", "Changelog"); construction.register("/archive", "Archive"); -// construction.register("/rss-feed.xml", "RSS Feed"); construction.register("/tags", "Tags"); -construction.register("/about/blog", "About This Blog"); // construction.register("/contact", "Contact Me"); markdown.register("/tools", "tools", "tools");