Citizen Scientist

Disclaim all copyright, fix wording
Begin Makerspace Theory note
2024-07-23 22:01:21 -06:00 · 2024-07-06 18:49:51 -06:00 · 2024-06-12 18:50:18 -06:00 · 2024-06-12 18:30:29 -06:00 · 2023-04-05 11:02:27 -06:00 · 2023-04-01 11:26:57 -06:00
33 changed files with 1009 additions and 206 deletions
--- a/README.md
+++ b/README.md
@@ -0,0 +1,41 @@
+# Solarpunk City
+
+## Development
+
+After cloning the repo:
+
+```
+$ cd solarpunkcity/
+$ virtualenv -p python3 env
+$ source env/bin/activate
+(env) $ pip install -r requirements.txt
+```
+
+While editing:
+
+```
+$ source env/bin/activate
+(env) $ pelican -rl -s pelicanconf.py
+```
+
+To deploy:
+
+```
+$ source env/bin/activate
+(env) $ pelican -d -s publishconf.py && rsync -rv --delete output/ solarpunkcity.org:/var/www/solarpunkcity/
+```
+
+## Editing
+
+Edit `.md` files in the `content/` directory.
+
+Place all media in the `content/media/` directory. Pelican will automatically find it.
+
+## Permissions
+
+To fix permissions on the server:
+
+```
+$ sudo chown -R root:solarpunks /var/www/solarpunkcity
+$ sudo chmod -R g+rw /var/www/solarpunkcity
+```
--- a/assets/fonts/example.html
+++ b/assets/fonts/example.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <link rel="stylesheet" type="text/css"
+          href="style.css"/>
+</head>
+
+<body>
+
+<h1>Generated from: http://www.cufonfonts.com</h1><br/>
+<h1 style="font-family:'Interstate Black Comp';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Black Cond';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Light Cond';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Regular Comp';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Regular Italic';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate UltraBlack Comp';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Bold Cond';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate ExtraLight Italic';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Light Italic';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+<h1 style="font-family:'Interstate Thin Italic';font-weight:normal;font-size:42px">AaBbCcDdEeFfGgHhŞşIıİi Example</h1>
+
+
+</body>
+</html>
--- a/assets/fonts/interstate-black-comp-58b64117a2ad9.woff
+++ b/assets/fonts/interstate-black-comp-58b64117a2ad9.woff
--- a/assets/fonts/interstate-black-cond-58b642507872b.woff
+++ b/assets/fonts/interstate-black-cond-58b642507872b.woff
--- a/assets/fonts/interstate-bold-cond-58b64162258ca.woff
+++ b/assets/fonts/interstate-bold-cond-58b64162258ca.woff
--- a/assets/fonts/interstate-extralight-italic-58b642045546b.woff
+++ b/assets/fonts/interstate-extralight-italic-58b642045546b.woff
--- a/assets/fonts/interstate-light-cond-58b64220b1490.woff
+++ b/assets/fonts/interstate-light-cond-58b64220b1490.woff
--- a/assets/fonts/interstate-light-italic-58b64147957e5.woff
+++ b/assets/fonts/interstate-light-italic-58b64147957e5.woff
--- a/assets/fonts/interstate-regular-comp-58b641cc0aca1.woff
+++ b/assets/fonts/interstate-regular-comp-58b641cc0aca1.woff
--- a/assets/fonts/interstate-regular-italic-58b641ecad88f.woff
+++ b/assets/fonts/interstate-regular-italic-58b641ecad88f.woff
--- a/assets/fonts/interstate-thin-italic-58b641b2d5a92.woff
+++ b/assets/fonts/interstate-thin-italic-58b641b2d5a92.woff
--- a/assets/fonts/interstate-ultrablack-comp-58b64130a8cbf.woff
+++ b/assets/fonts/interstate-ultrablack-comp-58b64130a8cbf.woff
--- a/assets/fonts/style.css
+++ b/assets/fonts/style.css
@@ -0,0 +1,80 @@
+/* #### Generated By: http://www.cufonfonts.com #### */
+
+    @font-face {
+    font-family: 'Interstate Black Comp';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Black Comp'), url('interstate-black-comp-58b64117a2ad9.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Black Cond';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Black Cond'), url('interstate-black-cond-58b642507872b.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Light Cond';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Light Cond'), url('interstate-light-cond-58b64220b1490.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Regular Comp';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Regular Comp'), url('interstate-regular-comp-58b641cc0aca1.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Regular Italic';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Regular Italic'), url('interstate-regular-italic-58b641ecad88f.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate UltraBlack Comp';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate UltraBlack Comp'), url('interstate-ultrablack-comp-58b64130a8cbf.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Bold Cond';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Bold Cond'), url('interstate-bold-cond-58b64162258ca.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate ExtraLight Italic';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate ExtraLight Italic'), url('interstate-extralight-italic-58b642045546b.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Light Italic';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Light Italic'), url('interstate-light-italic-58b64147957e5.woff') format('woff');
+    }
+    
+
+    @font-face {
+    font-family: 'Interstate Thin Italic';
+    font-style: normal;
+    font-weight: normal;
+    src: local('Interstate Thin Italic'), url('interstate-thin-italic-58b641b2d5a92.woff') format('woff');
+    }
--- a/assets/logos_all.svg
+++ b/assets/logos_all.svg
--- a/content/About.md
+++ b/content/About.md
@@ -0,0 +1,16 @@
+Title: About
+Date: 2023-03-25
+Category: Misc
+Summary: About Solarpunk City.
+
+Solarpunk City's mission is to build and share resources, knowledge and tools to help all of us build a solarpunk world.
+
+All of our designs, software, hardware and knowledge are open source.
+Use them to build resilient and sovereign sources for food, energy, water and shelter.
+Please use them and contribute your own improvements.
+Try to use zero marginal cost economics as much as you can to lower the barrier-to-entry.
+
+Engage and grow together.
+Find your friends, partners and allies.
+All humans are valued.
+Turn your city into a Solarpunk City.
--- a/content/Airflow.md
+++ b/content/Airflow.md
@@ -0,0 +1,17 @@
+Title: Airflow
+Date: 2023-03-07
+Category: Notes
+Summary: Point a fan at indoor hydroponic plants once they develop their true leaves.
+
+Airflow across plants is important because it helps with [transpiration][1], the process of water movement through a plant and evaporation off its leaves. The water is used to move minerals up the plant from its roots. Quoting Wikipedia:
+
+> In still air, water lost due to transpiration can accumulate in the form of vapor close to the leaf surface. This will reduce the rate of water loss, as the water potential gradient from inside to outside of the leaf is then slightly less. The wind blows away much of this water vapor near the leaf surface, making the potential gradient steeper and speeding up the diffusion of water molecules into the surrounding air. Even in wind, though, there may be some accumulation of water vapor in a thin boundary layer of slower moving air next to the leaf surface. The stronger the wind, the thinner this layer will tend to be, and the steeper the water potential gradient.
+
+A lack of airflow can cause [mineral deficiencies][2] which is why it's recommended to point a fan at plants grown hydroponically.
+
+The plant can't do anything to fix too little airflow, but can close [stomas][3] to correct for too much airflow. The exception to this is with young shoots which have a cuticle layer on their leaves. The waxy layer prevents stoma regulation, so pointing a fan at shoots may dry them out.
+
+
+[1]: https://en.wikipedia.org/wiki/Transpiration
+[2]: https://hortamericas.com/blog/science/how-to-avoid-calcium-deficiency-in-controlled-environment-food-crops/
+[3]: https://en.wikipedia.org/wiki/Stoma
--- a/content/Algae
+++ b/content/Algae
@@ -0,0 +1,8 @@
+Title: Algae Growth
+Date: 2023-03-11
+Category: Notes
+Summary: Prevent hydroponic algae from growing by blocking light to any nutrient solution.
+
+Algae will grow anywhere light is able to touch hydroponic nutrient solution. This won't be a problem if the solution is regularly flushed. In Kratky systems the algae will compete for resources with your plants and grow exponentially.
+
+The solution is to prevent light from reaching the solution by using dark containers and covering exposed parts with and opaque material such as aluminium foil.
--- a/content/Citizen
+++ b/content/Citizen
@@ -0,0 +1,8 @@
+Title: Citizen Scientist
+Date: 2024-06-23
+Category: Notes
+Summary: Citizen Scientists use makerspaces, open-source tools, and local industry to research, understand, and push forward our understanding of the natural world
+
+They use makerspaces, tools and open source/open hardware scientific laboratory equipment to research and understand the world around them. The citizen scientist is the next great revolution in our understanding of the natural world.
+
+With the power of local industry producing scientific equipment from open source designs, that are continually tweaked and improved upon available to schools, libraries, residences, makerspaces, and local businesses all studying and contributing their own knowledge and experiences to online open access systems driving a widespread understanding of the natural world, rooted in high resolution photophraphy, microscopy, metrology and modern analytical tools and techniques. we use this understanding to diagnose, understand and assist the healing of the natural world
--- a/content/Design
+++ b/content/Design
@@ -0,0 +1,33 @@
+Title: Design Guidelines for Solarpunk Projects
+Date: 2023-03-26
+Category: Notes
+Summary: Elements of successful solarpunk projects
+
+#### Follow Pete Seeger's advice as much as you can:
+  > If it can't be reduced, reused, repaired, rebuilt, refurbished, refinished, resold, recycled, or composted, then it should be restricted, designed or removed from production.
+
+#### Select components that are common or sourced in bulk 
+Common or bulk materials means lots of supply, which means low cost and high availability.
+Don't force builders to search out substitutes.
+
+#### Parameterize designs 
+Parameterized designs allow to be flexible and adaptable
+
+#### Keep designs modular
+Modular designs are easy to repair and remix.
+Damaged components can be easily swapped out or repaired
+
+#### Keep failure-prone or high-wear components accessible 
+So they are easy to service.
+Prefer low-wear and low-failure prone components, materials and designs.
+
+#### Avoid extraneous components
+The most reliable component is one that doesn't exist.
+
+#### Designs should be implementable
+Designs should be implementable without having to remake the earth or having to learn an entire field of study.
+If you do ask your user or builder to learn something, make it something high-value.
+
+#### Prefer designs that help users develop useful conceptual models
+A conceptual model is an explanation, usually simplified, of how something works.
+Completeness or accuracy is less important than usefulness.
--- a/content/Helios
+++ b/content/Helios
@@ -3,7 +3,7 @@ Date: 2023-03-06
 Category: Designs
 Summary: A large one-tank hydroponics system.

-The Helios Alpha is a hydroponics system that can grow up to six plants. It's designed around a single 102 L plastic tote. It holds enough water to harvest lettuce once before refilling. After the initial setup, the system can be ignored for weeks.
+Helios Alpha is a hydroponics system that can grow up to six plants. It's designed around a single 102 L plastic tote. It holds enough water to harvest lettuce once before refilling. After the initial setup, the system can be ignored for weeks.

 ![[heliosalpha1.jpg]]

@@ -28,10 +28,10 @@ Hang the grow lights with the included hangers off the lower shelf. The height c

 Drill six holes in the plastic lid for where you want the plant to go. Bias the holes towards the edges so the plants are more spread out for air flow.

-Cover the lid with two strips aluminium foil to prevent light from passing into the nutrient solution. This prevents algae growth which will kill your plants and reflect the light back up to the leaves. Tape the aluminium foil to the lid and then cut holes in it the size of the net cups. Scrunch excess foil down into the hole.
+Cover the lid with two strips aluminium foil to prevent light from passing into the nutrient solution. This prevents [[Algae Growth |algae growth]] which will kill your plants and reflect the light back up to the leaves. Tape the aluminium foil to the lid and then cut holes in it the size of the net cups. Scrunch excess foil down into the hole.

 Insert the six net cups into the six holes. Place the lid back on the tote and position it under the grow lights.

-Point a fan towards where the plants will grow. This is important indoors to enable water transpiration so the leaves don't get mineral deficiencies. Plug the fan in but keep it off until the starters have grown their "true leaves".
+Point a fan towards where the plants will grow. [[Airflow |Airflow is important]] indoors to enable water transpiration so the leaves don't get mineral deficiencies. Plug the fan in but keep it off until the starters have grown their "true leaves".

 Plug the power strip into the outlet timer and adjust it for 16 hours on, 8 hours off. The specific timing will depend on the plant.
--- a/content/Makerspace
+++ b/content/Makerspace
@@ -0,0 +1,31 @@
+Title: Makerspace Theory
+Date: 2024-06-12
+Category: Notes
+Summary: Lessons learned from running and visiting makerspaces.
+
+Makerspaces are solarpunk since they give people a place to improve their communities. This document outlines lessons learned by the authors from running and visiting makerspaces around the world.
+
+## Community
+
+Focus on community building and finding people that want to be part of the makerspace. Organize social events like open house nights, work parties, or hackathons.
+
+The community and members should shape what the makerspace is, not the other way around. Determine what the community needs and provide it.
+
+## Advertising
+
+The makerspace should have a cogent website that describes what a makerspace is (many people don't know) and what makes your makerspace special. Include pictures and detailed descriptions of work areas and how memberships work. Include contact info that feels personal and direct, not a generic form to fill out. When people ask you questions, use that as a hint for what info your website is missing.
+
+Hold events, classes, and workshops that are open to the public to get people in and seeing what a makerspace is. Make it obvious that they have the option of joining your community.
+
+## Finances
+
+The makerspace should be a non-profit company or charity.
+
+Everyone pays member dues (even any directors or owners). This helps the non-profit survive by being able to pay bills and helps prevent the creation of an out-group and and in-group.
+
+The space should welcome commercial activity as long as it's not impeding or exploiting the makerspace. Commercial users can contribute back a percentage of revenue, or volunteer their time.
+
+The space itself can operate some kind of commercial activity by helping make things that are useful to others. Sustainable projects are a good example.
+## Member Termination
+
+A makerspace needs to be able to get rid of toxic members using a subjective process, not vulnerable to political manipulation or rules lawyer-ing. An example may be simply giving the directors or owners the ability to end memberships.
--- a/content/Solarpunk
+++ b/content/Solarpunk
@@ -0,0 +1,43 @@
+Title: Solarpunk Project Ideas
+Date: 2023-04-01
+Category: Notes
+Summary: A list of example projects we'd like to have on Solarpunk City.
+
+The following is a list of solarpunk inspired projects that we'd like to have documented on Solarpunk City. Documenting the process or design will help others replicate it more easily.
+
+- Hydroponics: Design methods of growing food hydroponically.
+
+- Vertical gardens and green roofs: Create a network of vertical gardens and green roofs to increase urban greenery, reduce the urban heat island effect, and provide food and habitat for local wildlife.
+
+- Community composting: Establish a community composting program to reduce waste and create nutrient-rich soil for gardens and urban farms.
+
+- Water harvesting and filtration systems: Install rainwater harvesting systems and water filtration systems to provide clean water for drinking, irrigation, and other uses.
+
+- Pedestrian and bike-friendly infrastructure: Petition the city to create pedestrian and bike-friendly infrastructure, such as bike lanes, pedestrian bridges, and walkways, to encourage sustainable transportation and reduce reliance on cars.
+
+- Community art projects: Collaborate with local artists to create murals, sculptures, and other art installations that promote sustainability and inspire community engagement.
+
+- Urban beekeeping: Establish urban beekeeping programs to support local pollinators and increase urban biodiversity.
+
+- Green energy cooperatives: Create green energy cooperatives to provide affordable and renewable energy to local communities.
+
+- Sustainable fashion and textiles: Promote sustainable fashion and textiles by supporting local designers and artisans who use eco-friendly materials and production methods.
+
+- Community tool libraries: Establish community tool libraries where residents can borrow tools and equipment for DIY projects, reducing the need for individuals to purchase and store their own tools.
+
+- Permaculture design: Implement permaculture design principles to create sustainable and self-sufficient food systems in urban and rural areas.
+
+- Community-owned land trusts: Establish community-owned land trusts to protect and preserve local green spaces and natural habitats.
+
+- Renewable energy microgrids: Develop renewable energy microgrids that provide reliable and affordable electricity to local communities, especially in areas with unreliable or no access to the grid.
+
+- Sustainable waste management: Implement sustainable waste management practices, such as zero waste initiatives, recycling programs, and composting, to reduce waste and promote a circular economy.
+
+- Sustainable transportation hubs: Develop sustainable transportation hubs, such as bike-sharing programs, electric vehicle charging stations, and public transportation systems powered by renewable energy.
+
+- Community-led renewable energy projects: Empower local communities to lead their own renewable energy projects, such as wind turbines or small-scale hydroelectric projects, to increase energy independence and promote community ownership.
+
+- Sustainable building materials: Research the use of sustainable building materials, such as bamboo, hempcrete, and recycled materials, in construction projects to reduce the environmental impact of the built environment.
+
+- Community-led conservation efforts: Encourage community-led conservation efforts, such as reforestation projects and beach cleanups, to promote environmental stewardship and protect local ecosystems.
+
--- a/Solarpunk.md
+++ b/Solarpunk.md
@@ -0,0 +1,37 @@
+Title: What is Solarpunk?
+Date: 2023-03-25
+Category: Misc
+Summary: About the Solarpunk genre.
+
+Scientists and engineers don't create world-changing technology alone.
+Science fiction writers create ideas, inventions and worlds that scientists and engineers later build.
+
+# Don't Look at the Hazard
+
+When driving or biking in dangerous terrain, the best way to avoid the danger is to not look at the hazards.
+We tend to go where we look, so look where you should go.
+When driving, look at the open road, not the accident.
+When biking, look at the path, not the tree.
+
+In the matter of building our world, hazards dominate our fiction and media.
+Dystopian works of fiction (cyberpunk) focus on high-tech and low-life.
+Dystopian, outrage porn fill our screens and our feeds.
+When the focus of our minds eye is on hazards, it is towards the hazards we will go.
+
+# The Open Road
+
+Solarpunk is the open road.
+Solarpunk focuses on high-life and how to get there, whether high-tech or low-tech.
+Solarpunk is a genre of fiction that envisions a future in which renewable energy sources and sustainable practices are the norm.
+Solarpunk rejects pessimism, cynicism and defeatism in favor of hope, effort and ingenuity.
+Solarpunk encourages on pragmatism and do-it-yourself.
+
+![[solarpunk1.jpg]]
+
+Solarpunk stories often feature vibrant, green cities filled with community gardens, solar panels, and other forms of sustainable technology.
+Characters in solarpunk stories are often activists, artists, and other individuals who are working to create a more just and equitable world.
+
+Solarpunk is not just a literary genre or artistic movement.
+It is a movement that inspires people to take action towards a sustainable future.
+It is a call to imagine and build a world that is not only livable but also beautiful, inspiring and vibrant for all.
+We're here to make solarpunk a reality.
--- a/content/extra/favicon.svg
+++ b/content/extra/favicon.svg
--- a/content/extra/logo.svg
+++ b/content/extra/logo.svg
--- a/content/media/solarpunk1.jpg
+++ b/content/media/solarpunk1.jpg
--- a/logo/logo.svg
+++ b/logo/logo.svg
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="95.499756mm"
-   height="16.116993mm"
-   viewBox="0 0 95.499756 16.116993"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   sodipodi:docname="logo.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="1.4948513"
-     inkscape:cx="189.31649"
-     inkscape:cy="82.282432"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="text291" />
-  <defs
-     id="defs2">
-    <rect
-       x="68.310822"
-       y="32.805908"
-       width="673.89819"
-       height="146.4996"
-       id="rect285" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-54.980671,-31.784372)">
-    <text
-       xml:space="preserve"
-       transform="scale(0.26458333)"
-       id="text283"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:Comfortaa;-inkscape-font-specification:Comfortaa;white-space:pre;shape-inside:url(#rect285);fill:#000000;fill-opacity:1;stroke:none" />
-    <g
-       aria-label="SOLARPUNK CITY"
-       id="text291"
-       style="font-size:10.5833px;line-height:1.25;stroke-width:0.264583"
-       transform="translate(12.422372,17.443701)">
-      <path
-         d="m 45.503279,26.58724 q -0.677331,0 -1.259413,-0.190499 -0.571498,-0.201083 -0.99483,-0.560915 -0.423332,-0.359832 -0.645581,-0.836081 -0.08467,-0.169333 -0.01058,-0.306915 0.08467,-0.148167 0.275166,-0.201083 0.148166,-0.04233 0.285749,0.03175 0.148166,0.07408 0.222249,0.222249 0.15875,0.306916 0.465666,0.550332 0.306915,0.243415 0.730247,0.380998 0.423332,0.127 0.931331,0.127 0.560915,0 0.99483,-0.179916 0.433915,-0.190499 0.677331,-0.539748 0.253999,-0.359833 0.253999,-0.867831 0,-0.645581 -0.476248,-1.111246 -0.476249,-0.465666 -1.492246,-0.592665 -1.238246,-0.148166 -1.936743,-0.761998 -0.698498,-0.624414 -0.698498,-1.523995 0,-0.645581 0.338665,-1.12183 0.349249,-0.476248 0.952497,-0.730247 0.603249,-0.264583 1.386413,-0.264583 0.582081,0 1.05833,0.1905 0.476248,0.179916 0.825497,0.486831 0.359832,0.296333 0.582082,0.656165 0.105833,0.169333 0.0635,0.328082 -0.03175,0.15875 -0.179916,0.243416 -0.158749,0.07408 -0.328082,0.02117 -0.15875,-0.05292 -0.243416,-0.201083 -0.158749,-0.243416 -0.402165,-0.455082 -0.232833,-0.222249 -0.571499,-0.349249 -0.338665,-0.126999 -0.814914,-0.137583 -0.83608,0 -1.344079,0.359833 -0.507998,0.349248 -0.507998,1.02658 0,0.359832 0.190499,0.666747 0.1905,0.296333 0.624415,0.518582 0.444499,0.211666 1.18533,0.317499 1.322912,0.1905 1.95791,0.814914 0.645581,0.613832 0.645581,1.608662 0,0.571498 -0.211666,1.015997 -0.201082,0.444498 -0.582081,0.751414 -0.370416,0.296332 -0.878414,0.455082 -0.497415,0.158749 -1.068913,0.158749 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1132" />
-      <path
-         d="m 53.790009,26.58724 q -0.920747,0 -1.693328,-0.317499 -0.772581,-0.317499 -1.344079,-0.888997 -0.560915,-0.571498 -0.878414,-1.344079 -0.306915,-0.772581 -0.306915,-1.693328 0,-0.910164 0.306915,-1.682745 0.317499,-0.772581 0.878414,-1.344079 0.571498,-0.571498 1.344079,-0.888997 0.772581,-0.317499 1.693328,-0.317499 0.910164,0 1.682745,0.317499 0.772581,0.317499 1.344079,0.888997 0.571498,0.571498 0.878414,1.344079 0.317499,0.772581 0.317499,1.682745 0,0.920747 -0.317499,1.693328 -0.306916,0.772581 -0.878414,1.344079 -0.571498,0.571498 -1.344079,0.888997 -0.772581,0.317499 -1.682745,0.317499 z m 0,-0.783164 q 0.730248,0 1.354663,-0.253999 0.624414,-0.264583 1.079496,-0.730248 0.465665,-0.476248 0.719664,-1.100663 0.254,-0.634998 0.254,-1.375829 0,-0.730248 -0.254,-1.354662 -0.253999,-0.634998 -0.719664,-1.100664 -0.455082,-0.476248 -1.079496,-0.730247 -0.624415,-0.264583 -1.354663,-0.264583 -0.740831,0 -1.365246,0.264583 -0.624414,0.253999 -1.090079,0.730247 -0.455082,0.465666 -0.709081,1.100664 -0.254,0.624414 -0.254,1.354662 0,0.740831 0.254,1.375829 0.253999,0.624415 0.709081,1.100663 0.465665,0.465665 1.090079,0.730248 0.624415,0.253999 1.365246,0.253999 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1134" />
-      <path
-         d="m 60.1294,26.481407 q -0.169333,0 -0.296332,-0.116416 -0.116417,-0.116416 -0.116417,-0.296333 v -7.440059 q 0,-0.169333 0.116417,-0.285749 0.126999,-0.127 0.296332,-0.127 0.169333,0 0.285749,0.127 0.127,0.116416 0.127,0.285749 v 7.069644 h 4.13807 q 0.169333,0 0.285749,0.116416 0.127,0.105833 0.127,0.275166 0,0.169333 -0.127,0.285749 -0.116416,0.105833 -0.285749,0.105833 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1136" />
-      <path
-         d="m 65.960792,26.481407 q -0.243416,0 -0.349249,-0.201083 -0.105833,-0.201082 -0.02117,-0.391582 l 3.11149,-7.387143 q 0.116416,-0.285749 0.402165,-0.285749 0.275166,0 0.391582,0.285749 l 3.122073,7.397727 q 0.09525,0.201082 -0.03175,0.391582 -0.116417,0.190499 -0.338666,0.190499 -0.127,0 -0.232833,-0.0635 -0.09525,-0.0635 -0.158749,-0.190499 l -2.910407,-7.059061 h 0.328082 l -2.931574,7.059061 q -0.05292,0.127 -0.15875,0.190499 -0.09525,0.0635 -0.222249,0.0635 z m 0.698498,-1.968494 0.317499,-0.709081 h 4.296819 l 0.317499,0.709081 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1138" />
-      <path
-         d="m 74.268675,26.481407 q -0.179916,0 -0.296333,-0.116416 -0.116416,-0.116416 -0.116416,-0.296333 v -7.440059 q 0,-0.179916 0.116416,-0.296333 0.116417,-0.116416 0.296333,-0.116416 h 1.979077 q 0.772581,0 1.375829,0.328082 0.603248,0.317499 0.941913,0.899581 0.349249,0.571498 0.349249,1.322912 0,0.719665 -0.349249,1.28058 -0.338665,0.560914 -0.941913,0.878413 -0.603248,0.317499 -1.375829,0.317499 h -1.566329 v 2.825741 q 0,0.179917 -0.116416,0.296333 -0.116416,0.116416 -0.296332,0.116416 z m 4.423819,0 q -0.137583,0 -0.222249,-0.05292 -0.07408,-0.05292 -0.137583,-0.15875 l -2.031994,-3.23849 0.825498,-0.211666 1.89441,3.026824 q 0.15875,0.253999 0.05292,0.444499 -0.09525,0.190499 -0.380999,0.190499 z M 74.681423,22.44917 h 1.566329 q 0.539748,0 0.952497,-0.211666 0.423332,-0.222249 0.666748,-0.603248 0.243415,-0.380999 0.243415,-0.867831 0,-0.518581 -0.243415,-0.910163 -0.243416,-0.402166 -0.666748,-0.624415 -0.412749,-0.222249 -0.952497,-0.222249 h -1.566329 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1140" />
-      <path
-         d="m 80.809152,26.481407 q -0.179916,0 -0.296332,-0.116416 -0.116416,-0.116416 -0.116416,-0.296333 v -7.440059 q 0,-0.179916 0.116416,-0.296333 0.116416,-0.116416 0.296332,-0.116416 h 2.11666 q 0.783164,0 1.386413,0.349249 0.603248,0.338666 0.941913,0.941914 0.338666,0.603248 0.338666,1.396995 0,0.772581 -0.338666,1.375829 -0.338665,0.592665 -0.941913,0.941914 -0.603249,0.338665 -1.386413,0.338665 h -1.703911 v 2.508242 q 0,0.179917 -0.116416,0.296333 -0.116417,0.116416 -0.296333,0.116416 z m 0.412749,-3.714738 h 1.703911 q 0.539749,0 0.963081,-0.232833 0.423332,-0.243415 0.656164,-0.666747 0.243416,-0.423332 0.243416,-0.963081 0,-0.560915 -0.243416,-0.984247 -0.232832,-0.423332 -0.656164,-0.666747 -0.423332,-0.243416 -0.963081,-0.243416 h -1.703911 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1142" />
-      <path
-         d="m 90.164784,26.65074 q -0.96308,0 -1.714494,-0.370416 -0.740831,-0.370415 -1.164163,-1.02658 -0.412749,-0.656164 -0.412749,-1.502828 v -5.122317 q 0,-0.179916 0.116416,-0.296333 0.116417,-0.116416 0.296333,-0.116416 0.179916,0 0.296332,0.116416 0.116417,0.116417 0.116417,0.296333 v 5.122317 q 0,0.624415 0.306915,1.100663 0.317499,0.476249 0.878414,0.751414 0.560915,0.264583 1.280579,0.264583 0.709081,0 1.259413,-0.264583 0.550332,-0.275165 0.857247,-0.751414 0.317499,-0.476248 0.317499,-1.100663 v -5.122317 q 0,-0.179916 0.116417,-0.296333 0.116416,-0.116416 0.296332,-0.116416 0.190499,0 0.296332,0.116416 0.116417,0.116417 0.116417,0.296333 v 5.122317 q 0,0.846664 -0.423332,1.502828 -0.412749,0.656165 -1.15358,1.02658 -0.730248,0.370416 -1.682745,0.370416 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1144" />
-      <path
-         d="m 95.953851,26.481407 q -0.179916,0 -0.296332,-0.116416 -0.116416,-0.116416 -0.116416,-0.296333 v -7.440059 q 0,-0.179916 0.116416,-0.296333 0.116416,-0.116416 0.296332,-0.116416 0.1905,0 0.317499,0.148166 l 5.05882,6.646313 v -6.38173 q 0,-0.179916 0.11641,-0.296333 0.11642,-0.116416 0.29634,-0.116416 0.16933,0 0.28575,0.116416 0.127,0.116417 0.127,0.296333 v 7.440059 q 0,0.179917 -0.127,0.296333 -0.11642,0.116416 -0.28575,0.116416 -0.0847,0 -0.16934,-0.03175 -0.0847,-0.03175 -0.13758,-0.105833 l -5.0694,-6.646312 v 6.371146 q 0,0.179917 -0.126999,0.296333 -0.116417,0.116416 -0.28575,0.116416 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1146" />
-      <path
-         d="m 104.68508,26.481407 q -0.16933,0 -0.29633,-0.116416 -0.11642,-0.127 -0.11642,-0.296333 v -7.440059 q 0,-0.169333 0.11642,-0.285749 0.127,-0.127 0.29633,-0.127 0.16934,0 0.28575,0.127 0.127,0.116416 0.127,0.285749 v 3.598322 l 3.86291,-3.862905 q 0.0847,-0.08467 0.15875,-0.116416 0.0741,-0.03175 0.16933,-0.03175 0.1905,0 0.28575,0.116416 0.0953,0.116417 0.0847,0.28575 0,0.158749 -0.127,0.306915 l -2.89982,2.899824 2.93157,4.000488 q 0.0952,0.137582 0.0741,0.296332 -0.0106,0.148166 -0.11642,0.253999 -0.10583,0.105833 -0.254,0.105833 -0.23283,0 -0.34925,-0.179916 l -2.87865,-3.894654 -0.94192,0.952497 v 2.709324 q 0,0.169333 -0.127,0.296333 -0.11641,0.116416 -0.28575,0.116416 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1148" />
-      <path
-         d="m 118.02004,26.58724 q -0.85724,0 -1.60866,-0.328082 -0.74083,-0.328082 -1.31233,-0.910164 -0.56091,-0.592665 -0.87841,-1.354662 -0.3175,-0.772581 -0.3175,-1.650995 0,-0.867831 0.30692,-1.629828 0.31749,-0.772581 0.87841,-1.354662 0.5715,-0.582082 1.31233,-0.910164 0.75141,-0.338666 1.61924,-0.338666 0.762,0 1.38642,0.222249 0.62441,0.22225 1.20649,0.709082 0.0953,0.07408 0.10583,0.179916 0.0212,0.09525 -0.0212,0.190499 -0.0423,0.08467 -0.127,0.127 -0.0212,0.08467 -0.10583,0.126999 -0.0847,0.04233 -0.20109,0.03175 -0.10583,-0.01058 -0.21166,-0.09525 -0.41275,-0.359832 -0.89958,-0.529165 -0.48684,-0.179916 -1.13242,-0.179916 -0.68791,0 -1.29116,0.275166 -0.59266,0.275166 -1.04775,0.751414 -0.45508,0.476249 -0.71966,1.100664 -0.254,0.624414 -0.254,1.322912 0,0.719664 0.254,1.344079 0.26458,0.624415 0.71966,1.100663 0.45509,0.476249 1.04775,0.751414 0.60325,0.264583 1.29116,0.264583 0.58208,0 1.10067,-0.190499 0.51858,-0.1905 0.98424,-0.550332 0.127,-0.105833 0.26459,-0.08467 0.14816,0.02117 0.25399,0.126999 0.10584,0.105833 0.10584,0.275166 0,0.08467 -0.0318,0.158749 -0.0212,0.0635 -0.0847,0.137583 -0.53975,0.497415 -1.20649,0.709081 -0.66675,0.201083 -1.38642,0.201083 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1150" />
-      <path
-         d="m 122.84602,26.481407 q -0.17991,0 -0.29633,-0.116416 -0.11642,-0.116416 -0.11642,-0.296333 v -7.440059 q 0,-0.179916 0.11642,-0.296333 0.11642,-0.116416 0.29633,-0.116416 0.17992,0 0.29633,0.116416 0.11642,0.116417 0.11642,0.296333 v 7.440059 q 0,0.179917 -0.11642,0.296333 -0.11641,0.116416 -0.29633,0.116416 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1152" />
-      <path
-         d="m 127.77784,26.481407 q -0.16934,0 -0.29634,-0.116416 -0.11641,-0.127 -0.11641,-0.296333 V 18.21585 h 0.82549 v 7.852808 q 0,0.169333 -0.11641,0.296333 -0.11642,0.116416 -0.29633,0.116416 z m -2.921,-7.514143 q -0.16933,0 -0.27516,-0.105833 -0.10583,-0.105833 -0.10583,-0.264582 0,-0.169333 0.10583,-0.275166 0.10583,-0.105833 0.27516,-0.105833 h 5.85257 q 0.16933,0 0.27517,0.105833 0.10583,0.105833 0.10583,0.275166 0,0.158749 -0.10583,0.264582 -0.10584,0.105833 -0.27517,0.105833 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1154" />
-      <path
-         d="m 134.67815,26.481407 q -0.16933,0 -0.29633,-0.116416 -0.11642,-0.127 -0.11642,-0.296333 v -2.645824 l -2.87865,-4.561403 q -0.10584,-0.158749 -0.0847,-0.306915 0.0318,-0.148166 0.13758,-0.243416 0.10584,-0.09525 0.26459,-0.09525 0.127,0 0.20108,0.05292 0.0847,0.05292 0.14817,0.148166 l 2.85749,4.603735 h -0.4445 l 2.84691,-4.582569 q 0.0741,-0.116416 0.15874,-0.169332 0.0952,-0.05292 0.22225,-0.05292 0.14817,0 0.24342,0.105833 0.10583,0.09525 0.11642,0.243416 0.0212,0.148166 -0.0741,0.296332 l -2.88924,4.561403 v 2.645824 q 0,0.169333 -0.127,0.296333 -0.11641,0.116416 -0.28575,0.116416 z"
-         style="font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
-         id="path1156" />
-      <g
-         id="g1508"
-         transform="translate(-3.301085,-60.132446)">
-        <path
-           d="m 57.091094,86.719686 q -0.920747,0 -1.693328,-0.317499 -0.772581,-0.317499 -1.344079,-0.888997 -0.560915,-0.571498 -0.878414,-1.344079 -0.306915,-0.772581 -0.306915,-1.693328 0,-0.910164 0.306915,-1.682745 0.317499,-0.772581 0.878414,-1.344079 0.571498,-0.571498 1.344079,-0.888997 0.772581,-0.317499 1.693328,-0.317499 0.910164,0 1.682745,0.317499 0.772581,0.317499 1.344079,0.888997 0.571498,0.571498 0.878414,1.344079 0.317499,0.772581 0.317499,1.682745 0,0.920747 -0.317499,1.693328 -0.306916,0.772581 -0.878414,1.344079 -0.571498,0.571498 -1.344079,0.888997 -0.772581,0.317499 -1.682745,0.317499 z m 0,-0.783164 q 0.730248,0 1.354663,-0.253999 0.624414,-0.264583 1.079496,-0.730248 0.465665,-0.476248 0.719664,-1.100663 0.254,-0.634998 0.254,-1.375829 0,-0.730248 -0.254,-1.354662 -0.253999,-0.634998 -0.719664,-1.100664 -0.455082,-0.476248 -1.079496,-0.730247 -0.624415,-0.264583 -1.354663,-0.264583 -0.740831,0 -1.365246,0.264583 -0.624414,0.253999 -1.090079,0.730247 -0.455082,0.465666 -0.709081,1.100664 -0.254,0.624414 -0.254,1.354662 0,0.740831 0.254,1.375829 0.253999,0.624415 0.709081,1.100663 0.465665,0.465665 1.090079,0.730248 0.624415,0.253999 1.365246,0.253999 z"
-           style="font-size:10.5833px;line-height:1.25;font-family:Comfortaa;-inkscape-font-specification:Comfortaa;stroke-width:0.264583"
-           id="path1134-7" />
-        <g
-           id="g1451">
-          <path
-             style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-             d="m 60.536549,78.927948 4.532854,-4.272915"
-             id="path1186"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="font-size:10.5833px;line-height:1.25;fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-             d="M 53.53328,78.923347 52.685351,78.134793"
-             id="path1186-6"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:0.45;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-             d="M 57.091095,77.632331 V 75.392307"
-             id="path1269"
-             sodipodi:nodetypes="cc" />
-        </g>
-        <g
-           id="g1451-8"
-           style="font-size:10.5833px;line-height:1.25;stroke-width:0.264583"
-           transform="rotate(180,57.091095,82.531614)">
-          <path
-             style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-             d="m 60.536549,78.927948 4.532854,-4.272915"
-             id="path1186-9"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="font-size:10.5833px;line-height:1.25;fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-             d="M 53.53328,78.923347 52.685351,78.134793"
-             id="path1186-6-2"
-             sodipodi:nodetypes="cc" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:0.45;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-             d="M 57.091095,77.632331 V 75.392307"
-             id="path1269-6"
-             sodipodi:nodetypes="cc" />
-        </g>
-        <circle
-           style="fill:#000000;stroke:#000000;stroke-width:0.865;stroke-dasharray:none"
-           id="path1446"
-           cx="57.091095"
-           cy="82.481071"
-           r="0.68521023" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -38,6 +38,7 @@ PLUGINS = [
 STATIC_PATHS = ['media', 'extra']

 EXTRA_PATH_METADATA = {
+    'extra/logo.svg': {'path': 'logo.svg'},
    'extra/favicon.svg': {'path': 'favicon.svg'},
 }

--- a/publishconf.py
+++ b/publishconf.py
@@ -38,6 +38,7 @@ PLUGINS = [
 STATIC_PATHS = ['media', 'extra']

 EXTRA_PATH_METADATA = {
+    'extra/logo.svg': {'path': 'logo.svg'},
    'extra/favicon.svg': {'path': 'favicon.svg'},
 }

--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,9 @@ docutils==0.18.1
 feedgenerator==2.0.0
 Jinja2==3.1.2
 Markdown==3.3.6
+markdown-it-py==2.2.0
 MarkupSafe==2.1.1
+mdurl==0.1.2
 pelican==4.7.2
 pelican-linkclass==2.0.2
 pelican-obsidian @ git+https://git.tannercollin.com/tanner/pelican-obsidian.git@41dd1d649127ae2833f5a4b1c3b6b6cb571117d8
--- a/themes/theme/templates/base.html
+++ b/themes/theme/templates/base.html
@@ -9,6 +9,8 @@
 		<meta name="author" content="Solarpunk City" />
 		{% endblock head %}

+		<link rel="shortcut icon" href="/favicon.svg" type="image/x-icon">
+
 		<style>
 			{% include 'style.css' %}

@@ -19,40 +21,7 @@
 		<div class="container">
 			<div class="logo">
 				<a href="/" aria-label="Return home">
-					<svg version="1.1" viewBox="0 0 95.5 16.117" xmlns="http://www.w3.org/2000/svg">
-						<g transform="translate(-54.981 -31.784)">
-						<text transform="scale(.26458)" fill="#000000" font-family="Comfortaa" font-size="40px" style="line-height:1.25;shape-inside:url(#rect285);white-space:pre" xml:space="preserve"/>
-						<g transform="translate(12.422 17.444)" stroke-width=".26458" aria-label="SOLARPUNK CITY">
-						<path d="m45.503 26.587q-0.67733 0-1.2594-0.1905-0.5715-0.20108-0.99483-0.56092t-0.64558-0.83608q-0.08467-0.16933-0.01058-0.30692 0.08467-0.14817 0.27517-0.20108 0.14817-0.04233 0.28575 0.03175 0.14817 0.07408 0.22225 0.22225 0.15875 0.30692 0.46567 0.55033 0.30692 0.24342 0.73025 0.381 0.42333 0.127 0.93133 0.127 0.56092 0 0.99483-0.17992 0.43392-0.1905 0.67733-0.53975 0.254-0.35983 0.254-0.86783 0-0.64558-0.47625-1.1112-0.47625-0.46567-1.4922-0.59266-1.2382-0.14817-1.9367-0.762-0.6985-0.62441-0.6985-1.524 0-0.64558 0.33866-1.1218 0.34925-0.47625 0.9525-0.73025 0.60325-0.26458 1.3864-0.26458 0.58208 0 1.0583 0.1905 0.47625 0.17992 0.8255 0.48683 0.35983 0.29633 0.58208 0.65616 0.10583 0.16933 0.0635 0.32808-0.03175 0.15875-0.17992 0.24342-0.15875 0.07408-0.32808 0.02117-0.15875-0.05292-0.24342-0.20108-0.15875-0.24342-0.40216-0.45508-0.23283-0.22225-0.5715-0.34925-0.33866-0.127-0.81491-0.13758-0.83608 0-1.3441 0.35983-0.508 0.34925-0.508 1.0266 0 0.35983 0.1905 0.66675 0.1905 0.29633 0.62442 0.51858 0.4445 0.21167 1.1853 0.3175 1.3229 0.1905 1.9579 0.81491 0.64558 0.61383 0.64558 1.6087 0 0.5715-0.21167 1.016-0.20108 0.4445-0.58208 0.75141-0.37042 0.29633-0.87841 0.45508-0.49742 0.15875-1.0689 0.15875z"/>
-						<path d="m53.79 26.587q-0.92075 0-1.6933-0.3175t-1.3441-0.889q-0.56092-0.5715-0.87841-1.3441-0.30692-0.77258-0.30692-1.6933 0-0.91016 0.30692-1.6827 0.3175-0.77258 0.87841-1.3441 0.5715-0.5715 1.3441-0.889t1.6933-0.3175q0.91016 0 1.6827 0.3175t1.3441 0.889 0.87841 1.3441q0.3175 0.77258 0.3175 1.6827 0 0.92075-0.3175 1.6933-0.30692 0.77258-0.87841 1.3441t-1.3441 0.889-1.6827 0.3175zm0-0.78316q0.73025 0 1.3547-0.254 0.62441-0.26458 1.0795-0.73025 0.46566-0.47625 0.71966-1.1007 0.254-0.635 0.254-1.3758 0-0.73025-0.254-1.3547-0.254-0.635-0.71966-1.1007-0.45508-0.47625-1.0795-0.73025-0.62442-0.26458-1.3547-0.26458-0.74083 0-1.3652 0.26458-0.62441 0.254-1.0901 0.73025-0.45508 0.46567-0.70908 1.1007-0.254 0.62441-0.254 1.3547 0 0.74083 0.254 1.3758 0.254 0.62442 0.70908 1.1007 0.46566 0.46566 1.0901 0.73025 0.62442 0.254 1.3652 0.254z"/>
-						<path d="m60.129 26.481q-0.16933 0-0.29633-0.11642-0.11642-0.11642-0.11642-0.29633v-7.4401q0-0.16933 0.11642-0.28575 0.127-0.127 0.29633-0.127t0.28575 0.127q0.127 0.11642 0.127 0.28575v7.0696h4.1381q0.16933 0 0.28575 0.11642 0.127 0.10583 0.127 0.27517t-0.127 0.28575q-0.11642 0.10583-0.28575 0.10583z"/>
-						<path d="m65.961 26.481q-0.24342 0-0.34925-0.20108-0.10583-0.20108-0.02117-0.39158l3.1115-7.3871q0.11642-0.28575 0.40216-0.28575 0.27517 0 0.39158 0.28575l3.1221 7.3977q0.09525 0.20108-0.03175 0.39158-0.11642 0.1905-0.33867 0.1905-0.127 0-0.23283-0.0635-0.09525-0.0635-0.15875-0.1905l-2.9104-7.0591h0.32808l-2.9316 7.0591q-0.05292 0.127-0.15875 0.1905-0.09525 0.0635-0.22225 0.0635zm0.6985-1.9685 0.3175-0.70908h4.2968l0.3175 0.70908z"/>
-						<path d="m74.269 26.481q-0.17992 0-0.29633-0.11642-0.11642-0.11642-0.11642-0.29633v-7.4401q0-0.17992 0.11642-0.29633 0.11642-0.11642 0.29633-0.11642h1.9791q0.77258 0 1.3758 0.32808 0.60325 0.3175 0.94191 0.89958 0.34925 0.5715 0.34925 1.3229 0 0.71966-0.34925 1.2806-0.33866 0.56091-0.94191 0.87841t-1.3758 0.3175h-1.5663v2.8257q0 0.17992-0.11642 0.29633t-0.29633 0.11642zm4.4238 0q-0.13758 0-0.22225-0.05292-0.07408-0.05292-0.13758-0.15875l-2.032-3.2385 0.8255-0.21167 1.8944 3.0268q0.15875 0.254 0.05292 0.4445-0.09525 0.1905-0.381 0.1905zm-4.0111-4.0322h1.5663q0.53975 0 0.9525-0.21167 0.42333-0.22225 0.66675-0.60325 0.24342-0.381 0.24342-0.86783 0-0.51858-0.24342-0.91016-0.24342-0.40217-0.66675-0.62442-0.41275-0.22225-0.9525-0.22225h-1.5663z"/>
-						<path d="m80.809 26.481q-0.17992 0-0.29633-0.11642t-0.11642-0.29633v-7.4401q0-0.17992 0.11642-0.29633 0.11642-0.11642 0.29633-0.11642h2.1167q0.78316 0 1.3864 0.34925 0.60325 0.33867 0.94191 0.94191 0.33867 0.60325 0.33867 1.397 0 0.77258-0.33867 1.3758-0.33866 0.59266-0.94191 0.94191-0.60325 0.33866-1.3864 0.33866h-1.7039v2.5082q0 0.17992-0.11642 0.29633-0.11642 0.11642-0.29633 0.11642zm0.41275-3.7147h1.7039q0.53975 0 0.96308-0.23283 0.42333-0.24342 0.65616-0.66675 0.24342-0.42333 0.24342-0.96308 0-0.56092-0.24342-0.98425-0.23283-0.42333-0.65616-0.66675-0.42333-0.24342-0.96308-0.24342h-1.7039z"/>
-						<path d="m90.165 26.651q-0.96308 0-1.7145-0.37042-0.74083-0.37042-1.1642-1.0266-0.41275-0.65616-0.41275-1.5028v-5.1223q0-0.17992 0.11642-0.29633 0.11642-0.11642 0.29633-0.11642t0.29633 0.11642q0.11642 0.11642 0.11642 0.29633v5.1223q0 0.62442 0.30692 1.1007 0.3175 0.47625 0.87841 0.75141 0.56092 0.26458 1.2806 0.26458 0.70908 0 1.2594-0.26458 0.55033-0.27516 0.85725-0.75141 0.3175-0.47625 0.3175-1.1007v-5.1223q0-0.17992 0.11642-0.29633 0.11642-0.11642 0.29633-0.11642 0.1905 0 0.29633 0.11642 0.11642 0.11642 0.11642 0.29633v5.1223q0 0.84666-0.42333 1.5028-0.41275 0.65616-1.1536 1.0266-0.73025 0.37042-1.6827 0.37042z"/>
-						<path d="m95.954 26.481q-0.17992 0-0.29633-0.11642t-0.11642-0.29633v-7.4401q0-0.17992 0.11642-0.29633 0.11642-0.11642 0.29633-0.11642 0.1905 0 0.3175 0.14817l5.0588 6.6463v-6.3817q0-0.17992 0.11641-0.29633 0.11642-0.11642 0.29634-0.11642 0.16933 0 0.28575 0.11642 0.127 0.11642 0.127 0.29633v7.4401q0 0.17992-0.127 0.29633-0.11642 0.11642-0.28575 0.11642-0.0847 0-0.16934-0.03175-0.0847-0.03175-0.13758-0.10583l-5.0694-6.6463v6.3711q0 0.17992-0.127 0.29633-0.11642 0.11642-0.28575 0.11642z"/>
-						<path d="m104.69 26.481q-0.16933 0-0.29633-0.11642-0.11642-0.127-0.11642-0.29633v-7.4401q0-0.16933 0.11642-0.28575 0.127-0.127 0.29633-0.127 0.16934 0 0.28575 0.127 0.127 0.11642 0.127 0.28575v3.5983l3.8629-3.8629q0.0847-0.08467 0.15875-0.11642 0.0741-0.03175 0.16933-0.03175 0.1905 0 0.28575 0.11642 0.0953 0.11642 0.0847 0.28575 0 0.15875-0.127 0.30692l-2.8998 2.8998 2.9316 4.0005q0.0952 0.13758 0.0741 0.29633-0.0106 0.14817-0.11642 0.254-0.10583 0.10583-0.254 0.10583-0.23283 0-0.34925-0.17992l-2.8786-3.8947-0.94192 0.9525v2.7093q0 0.16933-0.127 0.29633-0.11641 0.11642-0.28575 0.11642z"/>
-						<path d="m118.02 26.587q-0.85724 0-1.6087-0.32808-0.74083-0.32808-1.3123-0.91016-0.56091-0.59266-0.87841-1.3547-0.3175-0.77258-0.3175-1.651 0-0.86783 0.30692-1.6298 0.31749-0.77258 0.87841-1.3547 0.5715-0.58208 1.3123-0.91016 0.75141-0.33867 1.6192-0.33867 0.762 0 1.3864 0.22225 0.62441 0.22225 1.2065 0.70908 0.0953 0.07408 0.10583 0.17992 0.0212 0.09525-0.0212 0.1905-0.0423 0.08467-0.127 0.127-0.0212 0.08467-0.10583 0.127-0.0847 0.04233-0.20109 0.03175-0.10583-0.01058-0.21166-0.09525-0.41275-0.35983-0.89958-0.52916-0.48684-0.17992-1.1324-0.17992-0.68791 0-1.2912 0.27517-0.59266 0.27517-1.0478 0.75141-0.45508 0.47625-0.71966 1.1007-0.254 0.62441-0.254 1.3229 0 0.71966 0.254 1.3441 0.26458 0.62442 0.71966 1.1007 0.45509 0.47625 1.0478 0.75141 0.60325 0.26458 1.2912 0.26458 0.58208 0 1.1007-0.1905 0.51858-0.1905 0.98424-0.55033 0.127-0.10583 0.26459-0.08467 0.14816 0.02117 0.25399 0.127 0.10584 0.10583 0.10584 0.27517 0 0.08467-0.0318 0.15875-0.0212 0.0635-0.0847 0.13758-0.53975 0.49742-1.2065 0.70908-0.66675 0.20108-1.3864 0.20108z"/>
-						<path d="m122.85 26.481q-0.17991 0-0.29633-0.11642t-0.11642-0.29633v-7.4401q0-0.17992 0.11642-0.29633 0.11642-0.11642 0.29633-0.11642 0.17992 0 0.29633 0.11642 0.11642 0.11642 0.11642 0.29633v7.4401q0 0.17992-0.11642 0.29633-0.11641 0.11642-0.29633 0.11642z"/>
-						<path d="m127.78 26.481q-0.16934 0-0.29634-0.11642-0.11641-0.127-0.11641-0.29633v-7.8528h0.82549v7.8528q0 0.16933-0.11641 0.29633-0.11642 0.11642-0.29633 0.11642zm-2.921-7.5141q-0.16933 0-0.27516-0.10583t-0.10583-0.26458q0-0.16933 0.10583-0.27517t0.27516-0.10583h5.8526q0.16933 0 0.27517 0.10583 0.10583 0.10583 0.10583 0.27517 0 0.15875-0.10583 0.26458-0.10584 0.10583-0.27517 0.10583z"/>
-						<path d="m134.68 26.481q-0.16933 0-0.29633-0.11642-0.11642-0.127-0.11642-0.29633v-2.6458l-2.8786-4.5614q-0.10584-0.15875-0.0847-0.30692 0.0318-0.14817 0.13758-0.24342 0.10584-0.09525 0.26459-0.09525 0.127 0 0.20108 0.05292 0.0847 0.05292 0.14817 0.14817l2.8575 4.6037h-0.4445l2.8469-4.5826q0.0741-0.11642 0.15874-0.16933 0.0952-0.05292 0.22225-0.05292 0.14817 0 0.24342 0.10583 0.10583 0.09525 0.11642 0.24342 0.0212 0.14817-0.0741 0.29633l-2.8892 4.5614v2.6458q0 0.16933-0.127 0.29633-0.11641 0.11642-0.28575 0.11642z"/>
-						<g transform="translate(-3.3011 -60.132)">
-						<path d="m57.091 86.72q-0.92075 0-1.6933-0.3175t-1.3441-0.889q-0.56092-0.5715-0.87841-1.3441-0.30692-0.77258-0.30692-1.6933 0-0.91016 0.30692-1.6827 0.3175-0.77258 0.87841-1.3441 0.5715-0.5715 1.3441-0.889t1.6933-0.3175q0.91016 0 1.6827 0.3175t1.3441 0.889 0.87841 1.3441q0.3175 0.77258 0.3175 1.6827 0 0.92075-0.3175 1.6933-0.30692 0.77258-0.87841 1.3441t-1.3441 0.889-1.6827 0.3175zm0-0.78316q0.73025 0 1.3547-0.254 0.62441-0.26458 1.0795-0.73025 0.46566-0.47625 0.71966-1.1007 0.254-0.635 0.254-1.3758 0-0.73025-0.254-1.3547-0.254-0.635-0.71966-1.1007-0.45508-0.47625-1.0795-0.73025-0.62442-0.26458-1.3547-0.26458-0.74083 0-1.3652 0.26458-0.62441 0.254-1.0901 0.73025-0.45508 0.46567-0.70908 1.1007-0.254 0.62441-0.254 1.3547 0 0.74083 0.254 1.3758 0.254 0.62442 0.70908 1.1007 0.46566 0.46566 1.0901 0.73025 0.62442 0.254 1.3652 0.254z" stroke-width=".26458"/>
-						<g fill="none" stroke="#000">
-						<path d="m60.537 78.928 4.5329-4.2729" stroke-width=".5"/>
-						<path d="m53.533 78.923-0.84793-0.78855" stroke-width=".5"/>
-						<path d="m57.091 77.632v-2.24" stroke-width=".45"/>
-						</g>
-						<g transform="rotate(180 57.091 82.532)" fill="none" stroke="#000">
-						<path d="m60.537 78.928 4.5329-4.2729" stroke-width=".5"/>
-						<path d="m53.533 78.923-0.84793-0.78855" stroke-width=".5"/>
-						<path d="m57.091 77.632v-2.24" stroke-width=".45"/>
-						</g>
-						<circle cx="57.091" cy="82.481" r=".68521" stroke="#000" stroke-width=".865"/>
-						</g>
-						</g>
-						</g>
-					</svg>
+					<img src="/logo.svg" width="90%" height="auto" xmlns="http://www.w3.org/2000/svg" />
 				</a>
 			</div>

@@ -61,7 +30,7 @@
 		</div>

 		<p class="footer">
-			© Solarpunk City
+			Solarpunk City – No rights reserved. All content licensed CC0 / public domain.
 		</p>
 	</body>
 </html>
--- a/themes/theme/templates/index.html
+++ b/themes/theme/templates/index.html
@@ -8,10 +8,12 @@

 {% block content %}
 			<div class="content index">
+				<a href="/about">About</a> | <a href="/what-is-solarpunk">What is Solarpunk?</a> | <a href="https://github.com/SolarpunkCity">Github</a>
+
 				<h2>Designs</h2>

 				<p>
-					Open source solarpunk inspiried designs that you can build yourself.
+					Open source solarpunk inspired designs that you can build yourself.
 				</p>

 				{% for article in articles_page.object_list if article.category.name == 'Designs' %}
@@ -21,5 +23,19 @@
 				</div>

 				{% endfor %}
+
+				<h2>Notes</h2>
+
+				<p>
+					Various notes related to solarpunk theory and designs.
+				</p>
+
+				{% for article in articles_page.object_list if article.category.name == 'Notes' %}
+				<h3><a href="{{ article.url }}">{{ article.title }}</a></h3>
+				<div class="summary">
+					{{ article.summary }}
+				</div>
+
+				{% endfor %}
 			</div>
 {% endblock %}
--- a/themes/theme/templates/style.css
+++ b/themes/theme/templates/style.css
@@ -53,6 +53,7 @@
 				width: 30rem;
 				height: auto;
 				margin: 0 auto;
+				text-align: center;
 			}

 			.container .logo a {
Author	SHA1	Message	Date
Kent Brockman	637c3096b3	Citizen Scientist	2024-07-23 22:01:21 -06:00
Tanner Collin	401b16c129	Disclaim all copyright, fix wording	2024-07-06 18:49:51 -06:00
Tanner Collin	a3736f1650	Begin Makerspace Theory note	2024-06-12 18:50:18 -06:00
Tanner Collin	0deafd2aba	Spelling	2024-06-12 18:30:29 -06:00
Kent Brockman	457e1863d2	add github link	2023-04-05 11:02:27 -06:00
Tanner Collin	7d6977b342	Add solarpunk project ideas	2023-04-01 11:26:57 -06:00
Kent Brockman	ee1b89fde2	design guidelines for solarpunk projects	2023-03-26 09:16:30 -06:00
Kent Brockman	f0a8645960	tweak favicon	2023-03-26 00:30:31 -06:00
Kent Brockman	0366db9595	update about and what-is-solarpunk	2023-03-25 23:52:09 -06:00
Tanner Collin	0858d9947e	Add how to fix permissions	2023-03-25 21:30:26 -06:00
Tanner Collin	4a9f4491e5	Add definition of solarpunk	2023-03-25 21:28:30 -06:00
Tanner Collin	95840c9fbc	Start example About page	2023-03-25 20:58:20 -06:00
Kent Brockman	7e24a8ebde	new logo art	2023-03-25 20:42:57 -06:00
Kent Brockman	cdc69abec9	added fonts	2023-03-23 09:48:32 -06:00
Kent Brockman	36727b690a	fix a typo	2023-03-18 18:42:57 -06:00
Tanner Collin	34476c68e9	Add notes to home page	2023-03-11 22:27:50 -07:00
Tanner Collin	dd31584061	Add note about algae growth	2023-03-11 22:26:30 -07:00
Tanner Collin	834f09566e	Add note about airflow	2023-03-11 22:19:38 -07:00
Tanner Collin	319d7373d8	Add README	2023-03-07 22:45:23 -07:00
Tanner Collin	612c881240	Touchups	2023-03-07 22:40:50 -07:00
Tanner Collin	056d8c0530	Freeze requirements	2023-03-07 22:39:25 -07:00