Update style and generation

MBunel · May 21, 2024 · 264f381 · 264f381
1 parent d6cd5a2
commit 264f381
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,6 +3,9 @@ on:
     branches:
     - main
 
+env:
+  WEBLORG_ENV: prod
+
 # Allows you to run this workflow maanually from the Actions tab
   workflow_dispatch:
 

diff --git a/publish.el b/publish.el
@@ -5,8 +5,10 @@
 (require 'htmlize)
 (setq org-html-htmlize-output-type 'css)
 
-; IF PRODUCTION
-(setq weblorg-default-url "https://mbunel.xyz")
+;; Definie main url
+(if (string= (getenv "WEBLORG_ENV") "prod")
+    (setq weblorg-default-url "https://mbunel.xyz")
+  (setq weblorg-default-url "http://localhost:8081"))
 
 (weblorg-site
  :theme nil

diff --git a/theme/static/style.css b/theme/static/style.css
@@ -4,7 +4,7 @@
 :root {
     /* Background */
     --background: var(--base);
-    --on-background: var(--overlay);
+    --on-background: var(--overlay0);
     --on-background-variant-subtle: var(--blue);
     --on-background-variant-muted: var(--teal);
     --on-background-variant-active: var(--green);
@@ -113,7 +113,7 @@
 
 /* Layout */
 html {
-    //line-height:1.15;
+    font-size: 14px;
 }
 
 header, footer {
@@ -127,13 +127,15 @@ header {
     flex-wrap: wrap;
     justify-content: space-between;
     align-items: center;
-    /* Margins */
-    margin-top: 1rem;
-    margin-bottom: 3rem;
+    /* Padding */
+    padding-top: 10px;
+    padding-bottom: 10px;
     /* Font */
     font-weight: bold;
+    /* Border */
+    border-bottom: 1px solid var(--on-background);
     nav {
-
+	font-size: 125%;
 	ul {
 	    margin: 0;
 	    padding: 0;
@@ -142,6 +144,9 @@ header {
 		display: inline;
 		margin-left: 1em;
 	    }
+	    li:first-child {
+		margin-left:0;
+	    }
 	}
 
     }
@@ -153,8 +158,9 @@ header {
     flex-wrap: wrap;
     align-items: center;
     h1 {
-	font-size: 175%;
+	font-size: 200%;
 	margin-left: 1em;
+	margin-right: 1em;
     }
 
 }
@@ -175,6 +181,7 @@ footer {
     margin-top: 2rem;
     font-size: small;
     line-height: 1;
+    border-top: 1px solid var(--on-background);
 }
 
 

diff --git a/theme/templates/base.html b/theme/templates/base.html
@@ -63,15 +63,15 @@ <h1>
     {% endblock %}
 
     {# Probably where most of the action will happen #}
-    <main id="main">
+    <main>
       {% block main %}{% endblock %}
     </main>
 
     {# Links, copyright notice, etc #}
     {% block footer %}
     <footer>
       <p>Mattia Bunel, <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">CC-BY-SA</a>, 2024.</p>
-      <p>Fabriqué à coups de <kbd>M-x</kbd> avec <a href="https://emacs.love/weblorg" target="_blank">Weblorg</a> et <a href="https://guix.gnu.org/" target="_blank">Guix</a></p>
+      <p>Fabriqué le {{ now() | strftime("%d %b %Y") }}, à coups de <kbd>M-x</kbd> avec <a href="https://emacs.love/weblorg" target="_blank">Weblorg</a> et <a href="https://guix.gnu.org/" target="_blank">Guix</a>.</p>
     </footer>
     {% endblock %}
   </body>