parents:
aebf6ee10d050def2696b21c5741833b4e48279c
086b8c047bcf7d204406190a95881765016a0edb
Nick Mykins <nick.mykins@gmail.com>
2014-11-07T19:47:44-05:00
Merge branch 'master' of https://github.com/nmyk/cowsay-blog
diff --git a/cowtemplate.html b/cowtemplate.html
index 8a4cd92e7c3aa2fa23760ee494b2a308e9ab0272..a2eff6dbcbd566d1ee22d8e86a0e2854803bdb2c 100644
--- a/cowtemplate.html
+++ b/cowtemplate.html
@@ -16,15 +16,41 @@ Monospace;}
a { color: rgb(0,255,0); }
a:visited { color: rgb(0,192,0) }
a:hover { color: white; }
+ h1 { font-size: 18pt;
+ color: rgb(246,96,171);
+ text-align: center; }
* { font-size: 12pt; }
</style>
- <h1><font color="lime">~~~~this is nick's tilde.farm page~~~~</font></h1>
- <h2>Optimized for 800x600 -- Welcome to the farm.<br><br>You know when you talk to God as a kid, but then you realize that what you were trying to convince yourself was God responding to your prayers was just more of your own internal monologue? I do. <font color="HotPink">nick at tilde dot farm</font></h2>
- <pre>
-{% for cowpost in cowposts %}
+ <h1>~ nick at tilde dot farm ~</h1>
+ <h2>Optimized for 800x600 -- Welcome to the farm.<br><br>You know when you talk to God as a kid, but then you realize that what you were trying to convince yourself was God responding to your prayers was just more of your own internal monologue? I do.</h2>
+ <div>
+ <div style="float:left">
+ <pre>{% for cowpost in cowposts %}
<font color="cyan">{{cowpost.date}}</font>
{{cowpost.cowtext}}
-{% endfor %}
-</body>
+{% endfor %}</pre>
+ </div>
+ <div style="float:right">
+ <h2>Here's some other stuff:</h2>
+ <ul>
+ <li><a href="http://lt-dan.tumblr.com">Lieutenant Dan</a>
+ <li><a href="http://nickmykins.com:5000">Random Java class name</a>
+ <li><a href="http://comics-jam.tumblr.com">Comics Jam</a>
+ </ul>
+ <br>
+ About me: <br>
+ <pre>
+ ____________________
+/ I am programmed to \
+\ tell the truth /
+ --------------------
+ \ ^__^
+ \ (##)\_______
+ (__)\ )\/\
+ ||----w |
+ || ||
+ </pre>
+ </div>
+ </body>
</html>
diff --git a/public_html/index.html b/public_html/index.html
index de83ebe84dee50d92a8995ec90db5f562150ac01..5d3963977c30ef11db4bf15fa7c039749015c26d 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -16,11 +16,52 @@ Monospace;}
a { color: rgb(0,255,0); }
a:visited { color: rgb(0,192,0) }
a:hover { color: white; }
+ h1 { font-size: 18pt;
+ color: rgb(246,96,171);
+ text-align: center; }
* { font-size: 12pt; }
</style>
- <h1><font color="lime">~~~~this is nick's tilde.farm page~~~~</font></h1>
- <h2>Optimized for 800x600 -- Welcome to the farm.<br><br>You know when you talk to God as a kid, but then you realize that what you were trying to convince yourself was God responding to your prayers was just more of your own internal monologue? I do. <font color="HotPink">nick at tilde dot farm</font></h2>
+ <h1>~ nick at tilde dot farm ~</h1>
+ <h2>Optimized for 800x600 -- Welcome to the farm.<br><br>You know when you talk to God as a kid, but then you realize that what you were trying to convince yourself was God responding to your prayers was just more of your own internal monologue? I do.</h2>
+ <div>
+ <div style="float:left">
<pre>
+<font color="cyan">2014-11-07 19:16:36</font>
+ _________________________________________
+/ The modern corporate office, if it were \
+| logistically perfect--that is, if its |
+| architecture were such that employees |
+| were always either moving in a |
+| controlled manner or completely |
+| isolated; if management could, in a |
+| passive and unobtrusive way, monitor |
+| every employee at all times; if every |
+| employee's daily schedule followed a |
+| perfectly rigid timetable--it would be |
+| a prison. |
+| |
+| So would a perfect school. So would a |
+| perfect hospital. |
+| |
+\ Drink your milk. /
+ -----------------------------------------
+ \ ____________
+ \ |__________|
+ / /\
+ / / \
+ /___________/___/|
+ | | |
+ | ==\ /== | |
+ | O O | \ \ |
+ | < | \ \|
+ /| | \ \
+ / | \_____/ | / /
+ / /| | / /|
+/||\| | /||\/
+ -------------|
+ | | | |
+ <__/ \__>
+
<font color="cyan">2014-11-07 07:07:26</font>
_________________________________________
@@ -36,7 +77,7 @@ -----------------------------------------
\ ^__^
\ (==)\_______
(__)\ )\/\
- U ||----w |
+ U ||----w |
|| ||
@@ -69,6 +110,28 @@ (__)\ )\/\
||----w |
|| ||
-
-</body>
+</pre>
+ </div>
+ <div style="float:right">
+ <h2>Here's some other stuff:</h2>
+ <ul>
+ <li><a href="http://lt-dan.tumblr.com">Lieutenant Dan</a>
+ <li><a href="http://nickmykins.com:5000">Random Java class name</a>
+ <li><a href="http://comics-jam.tumblr.com">Comics Jam</a>
+ </ul>
+ <br>
+ About me: <br>
+ <pre>
+ ____________________
+/ I am programmed to \
+\ tell the truth /
+ --------------------
+ \ ^__^
+ \ (##)\_______
+ (__)\ )\/\
+ ||----w |
+ || ||
+ </pre>
+ </div>
+ </body>
</html>