summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoresquizo <esquizo+noreply@esquizo.net>2026-06-14 10:40:36 -0300
committeresquizo <esquizo+noreply@esquizo.net>2026-06-14 10:40:36 -0300
commitda9ab628e308bc2c78551d68b782526cd2bf6797 (patch)
tree111700638cfb844f1eb0c307734b656c6c6d3b7d
parent160bd49d26e2ddda4b227ed672742ffc019f4d3d (diff)
parentbad609c6ba794835f6694f9fdf889742e92785dd (diff)
Merge branch 'scanlines-and-bundling'HEADmaster
-rw-r--r--.gitignore1
-rw-r--r--Makefile7
-rw-r--r--src/css/base.css (renamed from static/style.css)50
-rw-r--r--src/css/navbar.css32
-rw-r--r--src/css/scanlines.css20
-rw-r--r--src/css/style.css3
-rw-r--r--static/leila.pngbin0 -> 520728 bytes
-rw-r--r--templates/base.m48
8 files changed, 77 insertions, 44 deletions
diff --git a/.gitignore b/.gitignore
index 2d19fc7..44b8ac0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*.html
+static/style.css
diff --git a/Makefile b/Makefile
index 6371769..2aa5555 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,10 @@ RSS = blog/index.rss
URL ?= http://localhost:8000
-all: $(PAGES) blog/index.rss
+all: $(PAGES) blog/index.rss static/style.css
clean:
- rm -f $(PAGES) $(RSS) dist.tar.gz
+ rm -f $(PAGES) $(RSS) dist.tar.gz static/style.css
dist: all
tar -cv static $(RSS) $(PAGES) | gzip > dist.tar.gz
@@ -30,6 +30,9 @@ blog/index.rss: blog/posts.csv
blog/index.html: blog/posts.csv templates/base.m4
m4 -DPAGECONTENT="$$(./csv2index.sh /blog < $<)" templates/base.m4 > $@
+static/style.css: src/css/style.css src/css/style.css src/css/base.css src/css/navbar.css src/css/scanlines.css
+ esbuild src/css/style.css --bundle --minify --outfile=static/style.css
+
%.html: %.md templates/base.m4
m4 -DPAGECONTENT="$$(./genpage.sh < $<)" templates/base.m4 > $@
diff --git a/static/style.css b/src/css/base.css
index 9f114ef..f457ea9 100644
--- a/static/style.css
+++ b/src/css/base.css
@@ -57,11 +57,21 @@ pre {
border: 1px dashed #999;
}
+nav {
+ display: block;
+ margin: 5px;
+}
+
.header-container {
display: flex;
flex-direction: column;
}
+.esquizo {
+ width: 100px;
+ display: inline;
+}
+
.content {
padding: 5px;
flex-grow: 1;
@@ -70,44 +80,12 @@ pre {
background: #050505;
}
-.navbar {
-}
-
-.navbar ul {
- list-style-type: none;
- margin: 0px;
- padding: 0px;
- display: flex;
- flex-wrap: wrap;
- gap: 10px;
-}
-
-.navbar li a {
- display: block;
- color: #999;
- text-decoration: none;
- border: dashed 1px;
- text-align: center;
- padding: 5px 10px;
-}
-
-.navbar li a:hover {
- display: block;
- color: #000;
- background-color: #999;
-}
-
.bottom-align {
display: flex;
flex-direction: column;
justify-content: flex-end;
}
-.esquizo {
- width: 100px;
- display: inline;
-}
-
.image-container {
text-align: center;
}
@@ -123,14 +101,8 @@ pre {
flex-direction: row;
}
- .navbar ul {
- display: flex;
- flex-direction: column;
- gap: 0px;
- width: 125px;
- }
-
main {
flex-direction: row;
}
}
+
diff --git a/src/css/navbar.css b/src/css/navbar.css
new file mode 100644
index 0000000..2b70356
--- /dev/null
+++ b/src/css/navbar.css
@@ -0,0 +1,32 @@
+.navbar ul {
+ list-style-type: none;
+ margin: 0px;
+ padding: 0px;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 10px;
+}
+
+.navbar li a {
+ display: block;
+ color: #999;
+ text-decoration: none;
+ border: dashed 1px;
+ text-align: center;
+ padding: 5px 10px;
+}
+
+.navbar li a:hover {
+ display: block;
+ color: #000;
+ background-color: #999;
+}
+
+@media (min-width: 1000px) {
+ .navbar ul {
+ display: flex;
+ flex-direction: column;
+ gap: 0px;
+ width: 125px;
+ }
+}
diff --git a/src/css/scanlines.css b/src/css/scanlines.css
new file mode 100644
index 0000000..e48074b
--- /dev/null
+++ b/src/css/scanlines.css
@@ -0,0 +1,20 @@
+
+.scanlines::before {
+ content: " ";
+ display: block;
+ position: fixed;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ background: repeating-linear-gradient(
+ rgba(18, 16, 16, 0) 0px,
+ rgba(18, 16, 16, 0) 1px,
+ rgba(0, 0, 0, 0.25) 1px,
+ rgba(0, 0, 0, 0.25) 2px
+ );
+ background-size: 100% 100%;
+ z-index: 10;
+ pointer-events: none; /* Allows users to click elements underneath */
+}
+
diff --git a/src/css/style.css b/src/css/style.css
new file mode 100644
index 0000000..f083657
--- /dev/null
+++ b/src/css/style.css
@@ -0,0 +1,3 @@
+@import 'base.css';
+@import 'navbar.css';
+@import 'scanlines.css';
diff --git a/static/leila.png b/static/leila.png
new file mode 100644
index 0000000..9060a5a
--- /dev/null
+++ b/static/leila.png
Binary files differ
diff --git a/templates/base.m4 b/templates/base.m4
index 9940303..17b1713 100644
--- a/templates/base.m4
+++ b/templates/base.m4
@@ -9,7 +9,7 @@
<body>
<header>
<div class="header-container">
- <img class="esquizo" src="/static/esquizo.png"></img>
+ <img class="esquizo" src="/static/leila.png"></img>
<div class="bottom-align">
<h1>esquizo.net</h1>
<h2><i>Centro das verdades reveladas pelas vozes da minha cabeça</i></h2>
@@ -18,14 +18,14 @@
</header>
<main>
- <div class="navbar">
+ <nav class="navbar">
<ul>
<li><a href="/">Home</a></li>
<li><a href="/about.html">Quem eu sou?</a></li>
<li><a href="/blog">Blog</a></li>
<li><a href="https://git.esquizo.net/">Git</a></li>
</ul>
- </div>
+ </nav>
<div class="content">
PAGECONTENT
@@ -35,5 +35,7 @@
<footer>
Toda ofensa foi inteiramente proposital.
</footer>
+
+ <div class="scanlines"></div>
</body>
</html>