diff --git a/pages/bash.mako b/pages/bash.mako index fc42c50..7dbd4ee 100644 --- a/pages/bash.mako +++ b/pages/bash.mako @@ -6,12 +6,10 @@ ] %>\ <%def name="bash()">${choice(bashes)}\ -<%include file="/support/header.mako" args="environ=environ, title='Home'"/> -
- -
+<%include file="/support/header.mako" args="environ=environ, title='Bash'"/> +
    + % for bash in bashes: +
  1. ${bash}
    2. + % endfor +
<%include file="/support/footer.mako" args="environ=environ"/> diff --git a/pages/copyvios.mako b/pages/copyvios.mako new file mode 100644 index 0000000..e87d001 --- /dev/null +++ b/pages/copyvios.mako @@ -0,0 +1,2 @@ +<%include file="/support/header.mako" args="environ=environ, title='Copyvio Detector'"/> +<%include file="/support/footer.mako" args="environ=environ"/> diff --git a/pages/debug.mako b/pages/debug.mako index 84bf980..c7ed5e0 100644 --- a/pages/debug.mako +++ b/pages/debug.mako @@ -1,9 +1,9 @@ -<%include file="/support/header.mako" args="environ=environ, title='Home'"/> -
- % for key, value in environ.items(): - % if key != "PATH": -

${key}: ${value}

- % endif - % endfor -
+<%include file="/support/header.mako" args="environ=environ, title='Debug'"/> + <%include file="/support/footer.mako" args="environ=environ"/> diff --git a/pages/index.mako b/pages/index.mako index ce84f05..b380f20 100644 --- a/pages/index.mako +++ b/pages/index.mako @@ -1,4 +1,2 @@ -<%include file="/support/header.mako" args="environ=environ, title='Home'"/> -
-
+<%include file="/support/header.mako" args="environ=environ, title='Home', slug='home'"/> <%include file="/support/footer.mako" args="environ=environ"/> diff --git a/pages/support/header.mako b/pages/support/header.mako index 1064c25..1689430 100644 --- a/pages/support/header.mako +++ b/pages/support/header.mako @@ -1,10 +1,13 @@ -<%page args="environ, title"/>\ +<%page args="environ, title, slug=None"/>\ <%! from os import path %>\ <% root = path.dirname(environ["SCRIPT_NAME"]) + this = environ["PATH_INFO"] pretty = path.split(root)[0] + if not slug: + slug = path.split(this)[1] %>\ @@ -14,4 +17,8 @@ +
\ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css index 670c198..f6dfc70 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -2,19 +2,26 @@ body { font-family: helvetica, arial, clean, sans-serif; font-size: 14px; color: #000; - background-color: #EEE; + background-color: #E0E0E0; } -div#container { - width: 800px; - margin: 20px auto 90px auto; +ul, ol { + line-height: 1.75; +} + +div#header { + margin: 20px; + padding: 2px 15px 2px 15px; border: 1px solid #999; - border-radius: 10px; background-color: #FFF; } -div#content { +div#container { + line-height: 1.5; + margin: 0 20px 90px 20px; padding: 2px 15px 2px 15px; + border: 1px solid #999; + background-color: #FFF; } div#footer { @@ -39,17 +46,34 @@ div#foot-divider { border-bottom: 1px solid #999; } +h1#head { + font-size: 3em; + margin: 15px 0 12px 0; +} + +h2#links { + font-size: 1.75em; + margin: 8px 0 8px 0; +} + table#footer-box { width: 100%; height: 100%; } -a:link { color: #373; text-decoration: none; } +span.light { color: #CCC; } + +a:link { color: #373; text-decoration: none; } a:visited { color: #373; text-decoration: none; } -a:hover { color: #040; text-decoration: underline; } -a:active { color: #404; text-decoration: underline; } +a:hover { color: #040; text-decoration: underline; } +a:active { color: #404; text-decoration: underline; } + +a.dark:link { color: #777; } +a.dark:visited { color: #777; } +a.dark:hover { color: #555; } +a.dark:active { color: #333; } -a.incognito:link { color: #000; text-decoration: none; } -a.incognito:visited { color: #000; text-decoration: none; } -a.incognito:hover { color: #000; text-decoration: underline; } -a.incognito:active { color: #000; text-decoration: none; } +a.mid:link { color: #AAA; } +a.mid:visited { color: #AAA; } +a.mid:hover { color: #888; } +a.mid:active { color: #666; }