commit 2f088432e6a8c357151f3b3f0879303a14886386 parent 0178dca709f5fd20dc807e186067ca76806e832d Author: parazyd <parazyd@dyne.org> Date: Thu, 28 Jul 2016 14:20:56 +0200 cleanup Diffstat:
29 files changed, 31 insertions(+), 341 deletions(-)
diff --git a/blog/201607/footer.html b/blog/201607/footer.html @@ -1,10 +0,0 @@ - </div> - </div> - - <div id="footer"> - <span class="right"> - copyleft 2016 parazyd, design heavily inspired by <a href="http://suckless.org">suckless.org</a> ♥ - </span> - </div> -</body> -</html> diff --git a/blog/201607/header.html b/blog/201607/header.html @@ -1,14 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8"> - <meta name="description" content="Who is parazyd, software developer, designer, crypto, bitcoin, linux administrator"> - <title>DEFAULT_TITLE</title> - <link rel="stylesheet" type="text/css" href="/static/style.css"> - <link rel="shortcut icon" href="/static/favicon.ico" type="image/icon"> - <link rel="icon" href="/static/favicon.ico" type="image/icon"> -</head> - <div id="header"> - <a href="/"><img alt="logo" src="/static/logo.svg"></a> - <a id="headerLink" href="/">parazyd.cf</a> <span id="headerSubtitle">something something</span> - </div> diff --git a/blog/201607/index.md b/blog/201607/index.md @@ -1,3 +0,0 @@ -##+TITLE blog (july 2016 archive) :: parazyd.cf - -## July, 2016. diff --git a/blog/201607/navigation.html b/blog/201607/navigation.html @@ -1,23 +0,0 @@ - <div id="menu"> - <span class="left"> - <a class="thisSite" href="https://parazyd.cf">home</a> - <a href="https://git.parazyd.cf">git</a> - <a href="https://pub.parazyd.cf">pub</a> - </span> - </div> - - <div id="content"> - <div id="nav"> - - <ul> - <li><a href="/">main</a></li> - <li><a class="thisPage" href="/blog/">blog/</a></li> - <li><a href="/blog/musings/"> musings/</a></li> - <li><a href="/projects/">projects/</a></li> - <li><a href="/contact.html">contact</a></li> - <li><a href="https://www.dyne.org">../dyne.org</a></li> - </ul> - - </div> - - <div id="main"> diff --git a/dyne/index.html b/dyne/index.html @@ -0,0 +1,3 @@ +<h1>Hi there....</h1> +<p>There's not much to see here, but in the meantime, there's more +stuff at <a href="https://parazyd.cf">https://parazyd.cf</a>.</p>+ \ No newline at end of file diff --git a/dyne/index.html b/err/index.html diff --git a/links.md b/links.md @@ -0,0 +1,13 @@ +##+TITLE friends and links :: parazyd.cf + +# Links + +Not the browser. + +[nulltime.net](https://nulltime.net) + +[acme](https://root.acme.com) + +[jaromil.dyne.org](https://jaromil.dyne.org) + +[suckless.org](https://suckless.org) diff --git a/moo/footer.html b/moo/footer.html @@ -1,4 +0,0 @@ -Could not open input file: footer.php -header.php -index.php -navigation.php diff --git a/moo/footer.php b/moo/footer.php @@ -1,11 +0,0 @@ - </div> - - </div> - - <div id="footer"> - <span class="right"> - copyleft 2016 parazyd, design heavily inspired by <a href="http://suckless.org">suckless</a> ♥ - </span> - </div> -</body> -</html> diff --git a/moo/header.php b/moo/header.php @@ -1,16 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8"> - <meta name="description" content="Who is parazyd, software developer, designer, crypto, bitcoin, linux administrator"> - <title><?php echo $title; ?> : parazyd.cf</title> - <link rel="stylesheet" type="text/css" href="/static/style.css"> - <link rel="shortcut icon" href="/static/favicon.ico" type="image/icon"> - <link rel="icon" href="/static/favicon.ico" type="image/icon"> -</head> - <div id="header"> - <a href="/"><img alt="logo" src="/static/logo.svg"></a> - <a id="headerLink" href="/">parazyd.cf</a> <span id="headerSubtitle">something something</span> - </div> - -<?php include "navigation.php"; ?> diff --git a/moo/index.php b/moo/index.php @@ -1,10 +0,0 @@ -<?php $title = "moo"; include "header.php"; ?> - -<h1>Moo</h1> -<p>Yet another pomf clone!</p> -<p>Sorry, this still isn't up, not until I buy a new server... You can -help by <a href="https://parazyd.cf/contact.html">donating</a>.</p> - -<img alt="burd" src="/static/bird.png"> - -<?php include "footer.php"; ?> diff --git a/moo/navigation.php b/moo/navigation.php @@ -1,29 +0,0 @@ - <div id="menu"> - <span class="left"> - <a href="https://parazyd.cf">home</a> - <a class="thisSite" href="https://moo.parazyd.cf">moo</a> - <a href="https://pub.parazyd.cf">pub</a> - </span> - </div> - - <div id="content"> - <div id="nav"> - - <ul> - <li><a <?php if ($title=="home") - echo "class=\"thisPage\""; ?> href="https://parazyd.cf">../main</a></li> - <li><a href="https://git.parazyd.cf">../code/</a></li> - <li><a <?php if ($title=="blog") - echo "class=\"thisPage\""; ?> href="https://parazyd.cf/blog/">../blog/</a></li> - <li><a <?php if ($title=="random musings") - echo "class=\"thisPage\""; ?> href="https://parazyd.cf/blog/musings/"> musings/</a></li> - <li><a <?php if ($title=="projects") - echo "class=\"thisPage\""; ?> href="https://parazyd.cf/projects/">../projects/</a></li> - <li><a <?php if ($title=="contact") - echo "class=\"thisPage\""; ?> href="https://parazyd.cf/contact.html">../contact</a></li> - <li><a href="https://www.dyne.org">../../dyne.org</a></li> - </ul> - - </div> - - <div id="main"> diff --git a/moo/static/bird.png b/moo/static/bird.png Binary files differ. diff --git a/moo/static/favicon.ico b/moo/static/favicon.ico Binary files differ. diff --git a/moo/static/fonts/OfficinaSansStd-Bold.otf b/moo/static/fonts/OfficinaSansStd-Bold.otf Binary files differ. diff --git a/moo/static/fonts/OfficinaSansStd-BoldItalic.otf b/moo/static/fonts/OfficinaSansStd-BoldItalic.otf Binary files differ. diff --git a/moo/static/fonts/OfficinaSansStd-Book.otf b/moo/static/fonts/OfficinaSansStd-Book.otf Binary files differ. diff --git a/moo/static/fonts/OfficinaSansStd-BookItalic.otf b/moo/static/fonts/OfficinaSansStd-BookItalic.otf Binary files differ. diff --git a/moo/static/index.html b/moo/static/index.html diff --git a/moo/static/logo.svg b/moo/static/logo.svg @@ -1 +0,0 @@ -<?xml version="1.0" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="140" height="140"><g transform="matrix(20,0,0,20,10,10)"><path d="m0 0h6v6h-6zm0 2h6m-6 2h6m-4-4v6m2-6v6" style="fill:none;stroke:#000;stroke-width:.1;"/><circle cx="3" cy="1" r=".8"/><circle cx="5" cy="3" r=".8"/><circle cx="1" cy="5" r=".8"/><circle cx="3" cy="5" r=".8"/><circle cx="5" cy="5" r=".8"/></g></svg>- \ No newline at end of file diff --git a/moo/static/style.css b/moo/static/style.css @@ -1,189 +0,0 @@ -@font-face { - font-family: 'OfficinaBoldItalic'; - src: url('/static/fonts/OfficinaSansStd-BoldItalic.otf'); -} -@font-face { - font-family: 'OfficinaBold'; - src: url('/static/fonts/OfficinaSansStd-Bold.otf'); -} -@font-face { - font-family: 'OfficinaBookItalic'; - src: url('/static/fonts/OfficinaSansStd-BookItalic.otf'); -} -@font-face { - font-family: 'OfficinaBook'; - src: url('/static/fonts/OfficinaSansStd-Book.otf'); -} - -body { - background-color: #eee; - color: #222; - font-family: 'OfficinaBook', sans-serif; - -webkit-font-smoothing: antialiased; - padding: 0; - margin: 0; -} - -hr { margin: 30px 60px; } - -i { font-family: 'OfficinaBookItalic', sans-serif; } -b, strong { font-family: 'OfficinaBold', sans-serif; } -b i, i b, strong i, i strong { font-family: 'OfficinaBoldItalic', sans-serif; } - -a, a:visited { - color: #058; - text-decoration: none; - -webkit-transition: all 0.2s linear; - -moz-transition: all 0.2s linear; - -ms-transition: all 0.2s linear; - -o-transition: all 0.2s linear; - transition: all 0.2s linear; -} - -a:hover { - background-color: #eee; - text-decoration: none; -} - -#menu { - clear: both; - overflow: hidden; - color: #069; - background-color: #333; - padding: 0.7ex; - font-size: 94%; - border-top: 1px solid #333; - border-bottom: 1px solid #333; -} - -#menu a { - padding: 0.5ex 1ex 0.5ex 1ex; - color: #fff; -} - -#menu a:hover { - background-color: #333; - color: #17a; -} - -#menu a.thisSite { - font-weight: bold; -} - -#header { - clear: both; - color: #666; - font-size: 1.78em; - padding: 0.7ex 0.7ex 0.7ex 0.7em; -} - -#header img { - width: 30px; -} - -#headerLink { - color: #666; - margin-left: 5px; -} - -h1 { - font-family: 'OfficinaBold', sans-serif; - margin: 1em 1ex 0.5ex 0; - font-size: 1.4em; -} - -h2 { - font-family: 'OfficinaBold', sans-serif; - margin: 1em 1ex 0.5ex 0; - font-size: 1.3em; -} - -h3 { - font-family: 'OfficinaBold', sans-serif; - margin: 1em 1ex 0.5ex 0; - font-size: 1.0em; -} - -h4 { - font-family: 'OfficinaBold', sans-serif; - margin: 1em 1ex 0.5ex 0; - font-size: 0.9em; -} - -#headerSubtitle { - font-size: 0.75em; - font-style: italic; - margin-left: 1em; -} - -#content { - clear: both; - margin: 0; - padding: 0; - background-color: #fff; - overflow: hidden; -} - -#nav { - background-color: #fff; - float: left; - margin: 0 1px 0 0; - padding: 1em 0; - border-right: 1px dotted #ccc; - width: 200px; -} - -#nav ul { - margin: 0; - padding: 0; -} - -#nav li { - list-style: none; - padding: 0; - margin: 0; -} - -#nav li ul { - padding-left: 0.6em !important; -} - -#nav li a { - display: block; - margin: 0; - padding: 0.8ex 2em 0.8ex 1em; -} - -#nav li a.thisPage { - color: #222; /*#333;*/ - font-weight: bold; - /*font-style: italic;*/ -} - -#main { - margin: 0 0 0 200px; - padding: 1.5em; - max-width: 50em; -} - -#footer { - clear: both; - color: #666; - border-top: 1px solid #ccc; - font-size: 84%; - padding: 1em; - margin: 0 0 1.5em 0; -} - -.left { - float: left; - margin: 0; - padding: 0; -} - -.right { - float: right; - margin: 0; - padding: 0; -} - diff --git a/pushweb.sh b/pushweb.sh @@ -6,8 +6,9 @@ make ## contact.html navigation fix -sed -i -e 's/class="thisPage" //' contact.html -sed -i -e 's/href="\/contact.html"/class="thisPage" href="\/contact.html"/' contact.html +## patched into mars +#sed -i -e 's/class="thisPage" //' contact.html +#sed -i -e 's/href="\/contact.html"/class="thisPage" href="\/contact.html"/' contact.html make push diff --git a/rsync-exclude b/rsync-exclude @@ -9,7 +9,6 @@ mars.sh webtree pub/* ssl/* -etc navigation.html footer.html header.html diff --git a/static/fonts/OfficinaSansStd-Bold.otf b/static/fonts/OfficinaSansStd-Bold.otf Binary files differ. diff --git a/static/fonts/OfficinaSansStd-BoldItalic.otf b/static/fonts/OfficinaSansStd-BoldItalic.otf Binary files differ. diff --git a/static/fonts/OfficinaSansStd-Book.otf b/static/fonts/OfficinaSansStd-Book.otf Binary files differ. diff --git a/static/fonts/OfficinaSansStd-BookItalic.otf b/static/fonts/OfficinaSansStd-BookItalic.otf Binary files differ. diff --git a/static/style.css b/static/style.css @@ -1,24 +1,7 @@ -@font-face { - font-family: 'OfficinaBoldItalic'; - src: url('/static/fonts/OfficinaSansStd-BoldItalic.otf'); -} -@font-face { - font-family: 'OfficinaBold'; - src: url('/static/fonts/OfficinaSansStd-Bold.otf'); -} -@font-face { - font-family: 'OfficinaBookItalic'; - src: url('/static/fonts/OfficinaSansStd-BookItalic.otf'); -} -@font-face { - font-family: 'OfficinaBook'; - src: url('/static/fonts/OfficinaSansStd-Book.otf'); -} - body { background-color: #eee; color: #222; - font-family: 'OfficinaBook', sans-serif; + font-family: sans-serif; -webkit-font-smoothing: antialiased; padding: 0; margin: 0; @@ -26,9 +9,9 @@ body { hr { margin: 30px 60px; } -i { font-family: 'OfficinaBookItalic', sans-serif; } -b, strong { font-family: 'OfficinaBold', sans-serif; } -b i, i b, strong i, i strong { font-family: 'OfficinaBoldItalic', sans-serif; } +i { font-family: sans-serif; } +b, strong { font-family: sans-serif; } +b i, i b, strong i, i strong { font-family: sans-serif; } a, a:visited { color: #058; @@ -87,25 +70,25 @@ a:hover { } h1 { - font-family: 'OfficinaBold', sans-serif; + font-family: sans-serif; margin: 1em 1ex 0.5ex 0; font-size: 1.4em; } h2 { - font-family: 'OfficinaBold', sans-serif; + font-family: sans-serif; margin: 1em 1ex 0.5ex 0; font-size: 1.3em; } h3 { - font-family: 'OfficinaBold', sans-serif; + font-family: sans-serif; margin: 1em 1ex 0.5ex 0; font-size: 1.0em; } h4 { - font-family: 'OfficinaBold', sans-serif; + font-family: sans-serif; margin: 1em 1ex 0.5ex 0; font-size: 0.9em; } diff --git a/webtree b/webtree @@ -28,7 +28,9 @@ tree=( blog blog/musings blog/201603 - blog/201607 +# blog/201607 + +# dyne # moo @@ -50,5 +52,4 @@ exclude=( # html that is put in order after the content postcontent=(footer.html) - }
