Bladeren bron

Fix up header styling when logged in.

master
Ben Kurtovic 6 jaren geleden
bovenliggende
commit
90874b72c3
8 gewijzigde bestanden met toevoegingen van 34 en 22 verwijderingen
  1. +1
    -0
      calefaction/__init__.py
  2. +19
    -10
      static/main.css
  3. +2
    -2
      static/styles/amarr.css
  4. +2
    -2
      static/styles/caldari.css
  5. +2
    -2
      static/styles/gallente.css
  6. +2
    -2
      static/styles/minmatar.css
  7. +1
    -1
      templates/_base.mako
  8. +5
    -3
      templates/_default.mako

+ 1
- 0
calefaction/__init__.py Bestand weergeven

@@ -7,6 +7,7 @@ baseLogger = logging.getLogger("calefaction")
del logging

def enable_logging():
"""Set up calefaction's logger to print out all logs to stderr."""
import logging

fmt = "%(asctime)s [%(levelname)s] %(name)s: %(message)s"


+ 19
- 10
static/main.css Bestand weergeven

@@ -48,7 +48,6 @@ main {
}

header {
font-size: 120%;
border-bottom-width: 1px;
border-bottom-style: solid;
}
@@ -114,15 +113,6 @@ header > div > div {
}
}

header a {
color: #EAEAEA;
}

header a:hover {
color: #BABABA;
text-decoration: none;
}

header .aligned {
vertical-align: middle;
}
@@ -132,6 +122,11 @@ header .spacer {
visibility: hidden;
}

header nav {
display: inline-block;
margin-left: 1.5em;
}

footer ul {
margin: 0;
padding: 0;
@@ -151,8 +146,22 @@ footer ul li:not(:last-child):after {
margin-right: 0.25em;
}

#corp-title {
font-size: 120%;
color: #EAEAEA;
}

#corp-title:hover {
color: #BABABA;
text-decoration: none;
}

#character-portrait {
height: 32px;
margin-right: 0.25em;
box-sizing: border-box;
border-width: 1px;
border-style: solid;
}

#flashes {


+ 2
- 2
static/styles/amarr.css Bestand weergeven

@@ -1,8 +1,8 @@
body {
background-image: url("/static/images/amarr.jpg");
background-image: url("/static/images/amarr.jpg?v=1");
}

main, header, footer {
main, header, footer, #character-portrait {
border-color: #5F4A26;
}



+ 2
- 2
static/styles/caldari.css Bestand weergeven

@@ -1,8 +1,8 @@
body {
background-image: url("/static/images/caldari.jpg");
background-image: url("/static/images/caldari.jpg?v=1");
}

main, header, footer {
main, header, footer, #character-portrait {
border-color: #364A5F;
}



+ 2
- 2
static/styles/gallente.css Bestand weergeven

@@ -1,8 +1,8 @@
body {
background-image: url("/static/images/gallente.jpg");
background-image: url("/static/images/gallente.jpg?v=1");
}

main, header, footer {
main, header, footer, #character-portrait {
border-color: #365F4A;
}



+ 2
- 2
static/styles/minmatar.css Bestand weergeven

@@ -1,8 +1,8 @@
body {
background-image: url("/static/images/minmatar.jpg");
background-image: url("/static/images/minmatar.jpg?v=1");
}

main, header, footer {
main, header, footer, #character-portrait {
border-color: #5F3C42;
}



+ 1
- 1
templates/_base.mako Bestand weergeven

@@ -29,7 +29,7 @@
<a href="${url_for('index')}">
<img id="corp-masthead" class="aligned" title="Home" alt="Home" src="${g.eve.image.corp(g.config.get('corp.id'), 256)}"/>
</a>
<a href="${url_for('index')}" class="aligned">${g.config.get("corp.name") | h}</a>
<a id="corp-title" class="aligned" href="${url_for('index')}">${g.config.get("corp.name") | h}</a>
</%block>
</div>
<div class="right">


+ 5
- 3
templates/_default.mako Bestand weergeven

@@ -1,13 +1,15 @@
<%inherit file="_base.mako"/>
<%block name="lefthead">
${parent.lefthead()}
<nav>
<nav class="aligned">
Campaign: XYZ | Map | Intel | Members...
</nav>
</%block>
<%block name="righthead">
<img id="character-portrait" class="aligned" title="${g.auth.get_character_prop('name')}" alt="" src="${g.eve.image.character(g.auth.get_character_id(), 256)}"/>
${g.auth.get_character_prop("name")}
[<a title="Log out" href="${url_for('logout')}">logout</a>] <!-- JS switch to a POST form -->
<span class="aligned">
${g.auth.get_character_prop("name")}
[<a title="Log out" href="${url_for('logout')}">logout</a>] <!-- ... JS switch to a POST form -->
</span>
</%block>
${next.body()}

Laden…
Annuleren
Opslaan