Permalink
Browse files

Syncing repo to latest site. Lots-o-changes that I don't care to list.

  • Loading branch information...
1 parent 0937bda commit 37e4dcfd043f9c18bb33eee11bd7d9c1875325da @actown committed with actown Mar 16, 2012
Showing with 80 additions and 227 deletions.
  1. +1 −0 config
  2. +5 −0 content/404.mkd
  3. +1 −1 content/about.mkd
  4. +11 −3 media/css/base.css
  5. +0 −106 media/css/oldbase.css
  6. +0 −110 media/css/oldbase.css2
  7. +4 −0 media/js/jquery-1.7.1.min.js
  8. +16 −0 templates/404_page.html
  9. +18 −0 templates/about.html
  10. +24 −7 templates/base.html
View
1 config
@@ -1,3 +1,4 @@
site_title: Derrick "Ac-town" Dymock
author: Derrick Dymock
url_pattern: /{category}/{slug}.html
+output_dir: /var/www/ac-town.com/htdocs/
View
@@ -0,0 +1,5 @@
+title: Page not found.
+type: 404_page
+url: /404.html
+---
+These are not the html you are looking for.
View
@@ -1,5 +1,5 @@
title: About
-type: home
+type: about
url: /about.html
---
View
@@ -21,9 +21,13 @@ body{
}
/* Links */
-a, a:visited{
- color: #33FF00;
- text-decoration: none;
+a:link{
+ color: #67E667;
+ text-decoration: none;
+}
+a:visited{
+ color: #008500;
+ text-decoration: none;
}
a:hover{
color: #FF0000;
@@ -88,6 +92,10 @@ h3{
display: table-cell;
text-align: left;
}
+#footer #powered_by{
+ display: table-cell;
+ text-align: center;
+}
#footer #copyright{
display: table-cell;
text-align: right;
View
@@ -1,106 +0,0 @@
-/* Base CSS styles for robmd.net
- *
- * Color scheme based on main photo's average color:
- * http://colorschemedesigner.com/#3D21T7tE0w0w0
- */
-
-/* Main */
-#body_wrapper{
- width: 960px;
- margin: 25px auto;
-
- /* Main text styles */
- color: #4B4742;
- font-size: 14px;
- font-family: "Veranda", lucida, tahoma, helvetica, arial, sans-serif;
- line-height: 1.4em;
-}
-
-/* Links */
-a, a:visited{
- color: #31527D;
- text-decoration: none;
-}
-a:hover{
- color: #97A9C0;
-}
-
-/* Headings */
-h1, h2, h3{
- font-weight: normal;
- margin: 0px;
-}
-h1{ font-size: 2em }
-h2{ font-size: 1.5em }
-h3{
- font-size: 1em
- font-weight: bold;
-}
-
-/* Header */
-#header{
- display: table;
- width: 100%;
- margin-bottom: 20px;
- font-family: "Orbitron", sans-serif;
- border-bottom: solid 1px #777;
- padding-bottom: 2px;
-}
-#header h1{
- display: table-cell;
- font-size: 2.5em;
-}
-
-/* Menu */
-#menu{
- display: table-cell;
- font-size: 1.2em;
- text-align: right;
-}
-#menu a{
- margin-left: 20px;
-}
-#menu .selected{
- border-top: solid 1px #777;
-}
-
-#header #title a{
- color: #4B4742;
-}
-
-/* Content */
-#content{
- margin: 0px 0px;
-}
-
-/* Footer */
-#footer{
- display: table;
- width: 100%;
- border-top: solid 1px #777;
- margin-top: 20px;
-}
-#footer #about_site{
- display: table-cell;
- text-align: left;
-}
-#footer #copyright{
- display: table-cell;
- text-align: right;
-}
-
-/* Misc */
-.small_text{
- font-size: 0.8em;
-}
-
-.light_text{
- color: #777;
-}
-
-.caption{
- line-height: 0px;
- text-align: right;
- margin-top: 5px;
-}
-
View
@@ -1,110 +0,0 @@
-/* Base CSS styles for robmd.net
- *
- * Color scheme based on main photo's average color:
- * http://colorschemedesigner.com/#3D21T7tE0w0w0
- */
-
-/* Main */
-#body_wrapper{
- width: 960px;
- margin: 25px auto;
-
- /* Main text styles */
- color: #00FF00;
- font-size: 14px;
- font-family: "Veranda", lucida, tahoma, helvetica, arial, sans-serif;
- line-height: 3em;
-}
-
-body{
- background-color: #000000;
-}
-
-/* Links */
-a, a:visited{
- color: #33FF00;
- text-decoration: none;
-}
-a:hover{
- color: #FF0000;
-}
-
-/* Headings */
-h1, h2, h3{
- font-weight: normal;
- margin: 0px;
-}
-h1{ font-size: 2em }
-h2{ font-size: 1.5em }
-h3{
- font-size: 1em
- font-weight: bold;
-}
-
-/* Header */
-#header{
- display: table;
- width: 100%;
- margin-bottom: 20px;
- font-family: "Orbitron", sans-serif;
- border-bottom: solid 1px #777;
- padding-bottom: 2px;
-}
-#header h1{
- display: table-cell;
- font-size: 2.5em;
-}
-
-/* Menu */
-#menu{
- display: table-cell;
- font-size: 1.2em;
- text-align: right;
-}
-#menu a{
- margin-left: 20px;
-}
-#menu .selected{
- border-top: solid 1px #777;
-}
-
-#header #title a{
- color: #00FF00;
-}
-
-/* Content */
-#content{
- margin: 0px 0px;
-}
-
-/* Footer */
-#footer{
- display: table;
- width: 100%;
- border-top: solid 1px #777;
- margin-top: 20px;
-}
-#footer #about_site{
- display: table-cell;
- text-align: left;
-}
-#footer #copyright{
- display: table-cell;
- text-align: right;
-}
-
-/* Misc */
-.small_text{
- font-size: 0.8em;
-}
-
-.light_text{
- color: #777;
-}
-
-.caption{
- line-height: 0px;
- text-align: right;
- margin-top: 5px;
-}
-

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -0,0 +1,16 @@
+{# Template for the home page #}
+{% extends "base.html" %}
+
+{% block js_doc_ready %}
+{% endblock %}
+
+{% block content %}
+ <!-- page title -->
+ <h1 id='page_title'>{{ page.title }}</h1>
+
+ <!-- main content title -->
+ <div id='404_content'>
+ {{ page.content }}
+ </div>
+
+{% endblock %}
View
@@ -0,0 +1,18 @@
+{# Template for the home page #}
+
+{% extends "base.html" %}
+
+{% block js_doc_ready %}
+ menu_highlight('about');
+{% endblock %}
+
+{% block content %}
+ <!-- page title -->
+ <h1 id='page_title'>{{ page.title }}</h1>
+
+ <!-- main content title -->
+ <div id='about_content'>
+ {{ page.content }}
+ </div>
+
+{% endblock %}
View
@@ -12,15 +12,15 @@
rel='stylesheet' type='text/css'>
<!-- base CSS includes -->
- <link rel="stylesheet" type='text/css' href='css/base.css'/>
-
+ <link rel="stylesheet" type='text/css' href='/css/base.css'/>
+ <link rel="stylesheet" type='text/css' href='/css/pygments.css'/>
<!-- JavaScript -->
- <script type="text/javascript" src="/js/jquery-1.6.1.min.js"></script>
+ <script type="text/javascript" src="/js/jquery-1.7.1.min.js"></script>
<script type="text/javascript">
$(function(){
// Document ready
function menu_highlight(menu_id){
- $("#menu #"+menu_id).addClass('selected');
+ $("#menu #"+menu_id).attr('class', 'selected');
}
{% block js_doc_ready %}{% endblock %}
@@ -30,6 +30,20 @@
</script>
{% block head %}{% endblock %}
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-247112-10']);
+ _gaq.push(['_setDomainName', 'ac-town.com']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
</head>
<body>
@@ -63,10 +77,13 @@ <h1 id='title'>
<!-- Footer -->
<div id="footer" class="small_text">
<div id="about_site">
- This site uses <a href="https://github.com/mythmon/wok">wok</a>.
- </div>
+ This site uses <a href="https://github.com/mythmon/wok">wok</a>.
+ </div>
+ <div id="powered_by">
+ Powered by: <a href="http://www.gentoo.org/">Gentoo</a> & <a href="http://www.nginx.com/">nginx 1.1.17</a>
+ </div>
<div id="copyright">
- &copy; Copyright <a href="http://ac-town.com/">Derrick Dymock</a>
+ &copy; Copyright <a href="https://ac-town.com/">Derrick Dymock</a>
</div>
</div>

0 comments on commit 37e4dcf

Please sign in to comment.