From 5363fc32b0d026b0382e6195650df79dcd6e082d Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 16 Dec 2016 21:05:34 -0500 Subject: [PATCH] Add style to config; minor tweaks. --- calefaction/__init__.py | 2 +- config/config.yml.sample | 7 ++++++- static/main.css | 9 +++++---- templates/_base.mako | 5 ++++- templates/error.mako | 1 - 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/calefaction/__init__.py b/calefaction/__init__.py index a4e2017..1f7f0b3 100644 --- a/calefaction/__init__.py +++ b/calefaction/__init__.py @@ -1 +1 @@ -__version__ = "0.1" +__version__ = "0.1.dev0" diff --git a/config/config.yml.sample b/config/config.yml.sample index 2eb0ec1..e8aad92 100644 --- a/config/config.yml.sample +++ b/config/config.yml.sample @@ -1,12 +1,17 @@ # This is a sample config file for Calefaction. # Copy this to config.yml and modify it to set up your website. +# You must restart the server after making any changes. corp: # Find your corp's ID at, e.g., https://zkillboard.com/corporation/917701062/ id: 123456789 - # Full corp name (doesn't need to match in-game name exactly, but should) + # Full corp name (doesn't need to match in-game name exactly, but it should) name: My Corp Name Here +# Default stylesheet from static/styles/*.css: +# one of "amarr", "caldari", "gallente", "minmatar", or add your own +style: null + welcome: |- (If you are seeing this message on the public internet, someone forgot to configure their website. Whoops!) diff --git a/static/main.css b/static/main.css index 931b006..8229421 100644 --- a/static/main.css +++ b/static/main.css @@ -36,13 +36,13 @@ a:hover { } main, header, footer { - background-color: rgba(0, 0, 0, 0.8); + background-color: rgba(0, 0, 0, 0.75); border-color: #4A4A4A; } main { margin: 2em auto; - padding: 0 1em; + padding: 0.5em 1.5em; border-width: 1px; border-style: solid; } @@ -95,7 +95,8 @@ header a { } header a:hover { - color: #CACACA; + color: #BABABA; + text-decoration: none; } header .aligned { @@ -104,7 +105,7 @@ header .aligned { #corp-masthead { height: 30px; - margin-right: 0.5em; + margin-right: 0.25em; } #login-button { diff --git a/templates/_base.mako b/templates/_base.mako index c671c4f..c670b92 100644 --- a/templates/_base.mako +++ b/templates/_base.mako @@ -6,7 +6,10 @@ <%block name="title">${g.config.get("corp.name") | h} - + % if g.config.get("style"): + <% stylesheet = "styles/{}.css".format(g.config.get("style")) %> + + % endif % for size in g.eve.image.corp_widths: % endfor diff --git a/templates/error.mako b/templates/error.mako index b59ccd7..8397ff4 100644 --- a/templates/error.mako +++ b/templates/error.mako @@ -2,7 +2,6 @@ <%block name="title"> Error – ${g.config.get("corp.name") | h} -<%block name="header"/>

Error!

You may report the following information to the developers: