Просмотр исходного кода

Minor styling/CSS tweaks.

master
Ben Kurtovic 8 лет назад
Родитель
Сommit
631a7432c0
5 измененных файлов: 27 добавлений и 20 удалений
  1. +15
    -11
      static/main.css
  2. +4
    -1
      static/main.js
  3. +4
    -4
      templates/_base.mako
  4. +3
    -3
      templates/_default.mako
  5. +1
    -1
      templates/landing.mako

+ 15
- 11
static/main.css Просмотреть файл

@@ -117,14 +117,12 @@ header > div > div {
header nav {
display: inline-block;
margin-left: 1.5em;
}

header .aligned {
vertical-align: middle;
}

header .spacer {
height: 32px;
vertical-align: middle;
visibility: hidden;
}

@@ -147,22 +145,25 @@ footer ul li:not(:last-child):after {
}

#corp-masthead {
height: 32px;
margin-right: 0.25em;
color: #EAEAEA;
}

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

#corp-title {
#corp-masthead img {
height: 32px;
margin-right: 0.25em;
}

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

#corp-title:hover {
color: #BABABA;
text-decoration: none;
#corp-masthead > * {
vertical-align: middle;
}

#flashes {
@@ -191,10 +192,12 @@ footer ul li:not(:last-child):after {
margin-right: 0.25em;
box-sizing: border-box;
border-width: 1px;
vertical-align: middle;
}

#character-summary {
font-size: 90%;
vertical-align: middle;
}

#character-options {
@@ -268,6 +271,7 @@ footer ul li:not(:last-child):after {
#login-button {
height: 30px;
padding-bottom: 2px;
vertical-align: middle;
}

#logout-form {


+ 4
- 1
static/main.js Просмотреть файл

@@ -29,7 +29,10 @@ $(function() {
}
});
}
}).css("cursor", "pointer");
}).keypress(function (e) {
if (e.which === 13)
$(this).click();
}).css("cursor", "pointer").prop("alt", "Options").prop("tabindex", 0);

// Switch style immediately without reloading the page:
$("#style-options form").submit(function() {


+ 4
- 4
templates/_base.mako Просмотреть файл

@@ -25,15 +25,15 @@
<div>
<div class="left">
<%block name="lefthead">
<a id="corp-masthead-link" 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 id="corp-masthead" title="Home" href="${url_for('index')}">
<img alt="Logo" src="${g.eve.image.corp(g.config.get('corp.id'), 256)}"/>
<span>${g.config.get("corp.name") | h}</span>
</a>
<a id="corp-title" class="aligned" href="${url_for('index')}">${g.config.get("corp.name") | h}</a>
</%block>
</div>
<div class="right">
<%block name="righthead">
<img class="spacer aligned" alt="" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="/>
<img class="spacer" alt="" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="/>
</%block>
</div>
</div>


+ 3
- 3
templates/_default.mako Просмотреть файл

@@ -1,12 +1,12 @@
<%inherit file="_base.mako"/>
<%block name="lefthead">
${parent.lefthead()}
<nav class="aligned">
<nav>
Campaign: XYZ | Map | Intel | Members...
</nav>
</%block>
<%block name="righthead">
<img id="character-portrait" class="styled-border aligned" alt="" src="${g.eve.image.character(g.auth.get_character_id(), 256)}"/>
<img id="character-portrait" class="styled-border" alt="Portrait" src="${g.eve.image.character(g.auth.get_character_id(), 256)}"/>
<div id="character-options" class="styled-border">
<div id="style-options">
<% cur_style = g.auth.get_character_prop("style") or g.config.get("style.default") %>
@@ -22,7 +22,7 @@
% endfor
</div>
</div>
<span id="character-summary" class="aligned">
<span id="character-summary">
${g.auth.get_character_prop("name")}
<span class="sep">[</span><a id="logout" title="Log out" href="${url_for('logout')}">log out</a><span class="sep">]</span>
</span>


+ 1
- 1
templates/landing.mako Просмотреть файл

@@ -1,7 +1,7 @@
<%inherit file="_base.mako"/>
<%block name="righthead">
<a href="${g.auth.make_login_link()}">
<img id="login-button" class="aligned" title="Log in with EVE Online" alt="Log in with EVE Online" src="${url_for('staticv', filename='images/eve-login.png')}"/>
<img id="login-button" title="Log in with EVE Online" alt="Log in with EVE Online" src="${url_for('staticv', filename='images/eve-login.png')}"/>
</a>
</%block>
<div id="welcome">


Загрузка…
Отмена
Сохранить