summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaniel-Jones <daniel@danieljon.es>2018-06-11 09:42:53 +0930
committerdaniel-Jones <daniel@danieljon.es>2018-06-11 09:42:53 +0930
commitd365ef07be8d5e3066211983bea59371a55ee087 (patch)
treeb25fc4564cc3de7c53e31b4c7a1c07b7af9c6db2
parentc246f482691ce59000c3c529c492f8cc06b32e5c (diff)
downloadwebsite-d365ef07be8d5e3066211983bea59371a55ee087.tar.gz
website-d365ef07be8d5e3066211983bea59371a55ee087.zip
changed default theme to light, added solarized template and link
Diffstat
-rwxr-xr-xlive.sh2
-rwxr-xr-xsync.sh4
-rw-r--r--template.txt13
-rw-r--r--templates/template_dark.txt2
-rw-r--r--templates/template_kawaii.txt2
-rw-r--r--templates/template_light.txt2
-rw-r--r--templates/template_nocss.txt2
-rw-r--r--templates/template_solarized.txt44
8 files changed, 58 insertions, 13 deletions
diff --git a/live.sh b/live.sh
index 48cb930..456cf83 100755
--- a/live.sh
+++ b/live.sh
@@ -3,9 +3,11 @@ python3 generatesite.py templates/template_dark.txt dark
python3 generatesite.py templates/template_nocss.txt nocss
python3 generatesite.py templates/template_kawaii.txt kawaii
python3 generatesite.py templates/template_light.txt light
+python3 generatesite.py templates/template_solarized.txt solarized
cp -r output/* /var/www
chmod -R +r /var/www/blog
chmod -R +r /var/www/dark
chmod -R +r /var/www/kawaii
chmod -R +r /var/www/nocss
chmod -R +r /var/www/light
+chmod -R +r /var/www/solarized
diff --git a/sync.sh b/sync.sh
index 15083ef..626c29e 100755
--- a/sync.sh
+++ b/sync.sh
@@ -5,21 +5,25 @@ rsync -r /var/www/media /var/www/kawaii/
rsync -r /var/www/media /var/www/dark/
rsync -r /var/www/media /var/www/light/
rsync -r /var/www/media /var/www/nocss/
+rsync -r /var/www/media /var/www/solarized/
# blog media directory
rsync -r /var/www/blog/media /var/www/kawaii/blog/
rsync -r /var/www/blog/media /var/www/dark/blog/
rsync -r /var/www/blog/media /var/www/light/blog/
rsync -r /var/www/blog/media /var/www/nocss/blog/
+rsync -r /var/www/blog/media /var/www/solarized/blog/
# waifu media directory
rsync -r /var/www/waifus/media /var/www/kawaii/waifus/
rsync -r /var/www/waifus/media /var/www/dark/waifus/
rsync -r /var/www/waifus/media /var/www/light/waifus/
rsync -r /var/www/waifus/media /var/www/nocss/waifus/
+rsync -r /var/www/waifus/media /var/www/solarized/waifus/
# opinions media directory
rsync -r /var/www/opinions/media /var/www/kawaii/opinions/
rsync -r /var/www/opinions/media /var/www/dark/opinions/
rsync -r /var/www/opinions/media /var/www/light/opinions/
rsync -r /var/www/opinions/media /var/www/nocss/opinions/
+rsync -r /var/www/opinions/media /var/www/solarized/opinions/
diff --git a/template.txt b/template.txt
index b8711b1..20bed26 100644
--- a/template.txt
+++ b/template.txt
@@ -10,27 +10,22 @@
<link rel="icon" type="image/png" href="https://danieljon.es/favicon.png">
<title>{TITLE}</title>
<style>
-*{border-color: #657b83;}
-a{color: #268bd2;}
-a:visited{color: #6c71c4;}
-hr{border: none; background-color: #094352; color: #094352; height: 2px;}
-body{background-color: #002b36; color: #839496; margin-right: 5%; margin-left: 5%; font-family: Verdana}
+body{margin-right: 5%; margin-left: 5%; font-family: Verdana}
img{max-width: 100%; max-height: 100%; overflow: hidden;}
-pre{padding-top: 5px; padding-bottom: 5px; padding-left: 5px; padding-right: 5px; background: #073642; overflow: auto;}
+pre{padding-top: 5px; padding-bottom: 5px; padding-left: 5px; padding-right: 5px; background: #d9d9ce; overflow: auto;}
.middle{text-align: center;}
.middiv{margin: auto; width: 80%;}
#gentag{text-align: center; font-size: 75%;}
h1,h2,h3,h4{padding-left: 5px;}
div.viewing{max-width: 70%; width: 100%; display: inline-block; margin: 10px;}
div.cover{display:inline-block; vertical-align: top; padding-top: 28px; padding-left: 15px; padding-bottom: 20px;}
-.content{border: 2px solid; border-color: #073642; border-radius: 5px; padding-top: 15px; padding-bottom: 15px; padding-left: 15px; padding-right: 15px;}
+.content{border: 1px solid black; border-radius: 5px; padding-top: 15px; padding-bottom: 15px; padding-left: 15px; padding-right: 15px; background: #eeeeec;}
</style>
</head>
<body>
<div class="middle">
<h1>danieljon.es</h1>
-<a href="https://danieljon.es">normal</a> <a href="https://light.danieljon.es">light</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
-
+<a href="https://danieljon.es">normal</a> <a href="https://solarized.danieljon.es">solarized</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
<a href="/">index</a> <a href="/blog">blog</a> <a href="/opinions">opinions</a> <a href="/interesting.html">interesting</a> <a href="https://git.danieljon.es">git</a>
{INFO}
</div>
diff --git a/templates/template_dark.txt b/templates/template_dark.txt
index 37457e2..564a680 100644
--- a/templates/template_dark.txt
+++ b/templates/template_dark.txt
@@ -29,7 +29,7 @@ div.cover{display:inline-block; vertical-align: top; padding-top: 28px; padding-
<body>
<div class="middle">
<h1>danieljon.es</h1>
-<a href="https://danieljon.es">normal</a> <a href="https://light.danieljon.es">light</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
+<a href="https://danieljon.es">normal</a> <a href="https://solarized.danieljon.es">solarized</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
<a href="/">index</a> <a href="/blog">blog</a> <a href="/opinions">opinions</a> <a href="/interesting.html">interesting</a> <a href="https://git.danieljon.es">git</a>
{INFO}
</div>
diff --git a/templates/template_kawaii.txt b/templates/template_kawaii.txt
index 88351cb..4ecd313 100644
--- a/templates/template_kawaii.txt
+++ b/templates/template_kawaii.txt
@@ -25,7 +25,7 @@ div.cover{display:inline-block; vertical-align: top; padding-top: 28px; padding-
<body>
<div class="middle">
<h1>danieljon.es</h1>
-<a href="https://danieljon.es">normal</a> <a href="https://light.danieljon.es">light</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
+<a href="https://danieljon.es">normal</a> <a href="https://solarized.danieljon.es">solarized</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
<a href="/">index</a> <a href="/blog">blog</a> <a href="/opinions">opinions</a> <a href="/interesting.html">interesting</a> <a href="https://git.danieljon.es">git</a> <img src="https://kawaii.danieljon.es/media/dance2.gif" style="position: absolute; top: 10px; float: left;">
{INFO}
</div>
diff --git a/templates/template_light.txt b/templates/template_light.txt
index f94cdfc..95abfc0 100644
--- a/templates/template_light.txt
+++ b/templates/template_light.txt
@@ -25,7 +25,7 @@ div.cover{display:inline-block; vertical-align: top; padding-top: 28px; padding-
<body>
<div class="middle">
<h1>danieljon.es</h1>
-<a href="https://danieljon.es">normal</a> <a href="https://light.danieljon.es">light</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
+<a href="https://danieljon.es">normal</a> <a href="https://solarized.danieljon.es">solarized</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
<a href="/">index</a> <a href="/blog">blog</a> <a href="/opinions">opinions</a> <a href="/interesting.html">interesting</a> <a href="https://git.danieljon.es">git</a>
{INFO}
</div>
diff --git a/templates/template_nocss.txt b/templates/template_nocss.txt
index 06e17ee..41c7533 100644
--- a/templates/template_nocss.txt
+++ b/templates/template_nocss.txt
@@ -12,7 +12,7 @@
</head>
<body>
<h1>danieljon.es</h1>
-<a href="https://danieljon.es">normal</a> <a href="https://light.danieljon.es">light</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
+<a href="https://danieljon.es">normal</a> <a href="https://solarized.danieljon.es">solarized</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
<a href="/">index</a> <a href="/blog">blog</a> <a href="/opinions">opinions</a> <a href="/interesting.html">interesting</a> <a href="https://git.danieljon.es">git</a>
{INFO}
{CONTENT}
diff --git a/templates/template_solarized.txt b/templates/template_solarized.txt
new file mode 100644
index 0000000..65b2d54
--- /dev/null
+++ b/templates/template_solarized.txt
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta content="text/html;charset=utf-8" http-equiv="Content-Type">
+<meta name="keywords" content="Programming, C++, C, Blog">
+<meta name="description" content="Personal blog/portfolio/site for Daniel Jones">
+<meta name="author" content="Daniel Jones">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta http-equiv="Cache-control" content="public">
+<link rel="icon" type="image/png" href="https://danieljon.es/favicon.png">
+<title>{TITLE}</title>
+<style>
+*{border-color: #657b83;}
+a{color: #268bd2;}
+a:visited{color: #6c71c4;}
+hr{border: none; background-color: #094352; color: #094352; height: 2px;}
+body{background-color: #002b36; color: #839496; margin-right: 5%; margin-left: 5%; font-family: Verdana}
+img{max-width: 100%; max-height: 100%; overflow: hidden;}
+pre{padding-top: 5px; padding-bottom: 5px; padding-left: 5px; padding-right: 5px; background: #073642; overflow: auto;}
+.middle{text-align: center;}
+.middiv{margin: auto; width: 80%;}
+#gentag{text-align: center; font-size: 75%;}
+h1,h2,h3,h4{padding-left: 5px;}
+div.viewing{max-width: 70%; width: 100%; display: inline-block; margin: 10px;}
+div.cover{display:inline-block; vertical-align: top; padding-top: 28px; padding-left: 15px; padding-bottom: 20px;}
+.content{border: 2px solid; border-color: #073642; border-radius: 5px; padding-top: 15px; padding-bottom: 15px; padding-left: 15px; padding-right: 15px;}
+</style>
+</head>
+<body>
+<div class="middle">
+<h1>danieljon.es</h1>
+<a href="https://danieljon.es">normal</a> <a href="https://solarized.danieljon.es">solarized</a> <a href="https://dark.danieljon.es">dark</a> <a href="https://nocss.danieljon.es">no css</a> <br>
+
+<a href="/">index</a> <a href="/blog">blog</a> <a href="/opinions">opinions</a> <a href="/interesting.html">interesting</a> <a href="https://git.danieljon.es">git</a>
+{INFO}
+</div>
+<div class="content">
+{CONTENT}
+</div>
+<br><br> <div class="middle"> <img src="http://danieljon.es/linuxfreak.png"> <br> <a href="https://gitlab.com/ubunchu-translators/ubunchu">source</a> </div>
+<br> <div id="gentag">page generated {TIME} using <a href="https://git.danieljon.es/website/">sitegenerator</a></div>
+</body>
+</html>
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 22:18:03 +0000