From 595d501589b7122ba382d9673c703740ec493998 Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Mon, 25 Mar 2013 17:41:49 -0400 Subject: [PATCH] Clean up the rest of the main index style issues. I will need to make "table-hover" class additions to all the tables that need their backgrounds changed upon hover. --- xonstat/static/css/app.css | 77 ++++++++++++++++++++++ xonstat/templates/main_index.mako | 105 ++++++++++++++++-------------- 2 files changed, 133 insertions(+), 49 deletions(-) diff --git a/xonstat/static/css/app.css b/xonstat/static/css/app.css index eb71103..c0f438d 100644 --- a/xonstat/static/css/app.css +++ b/xonstat/static/css/app.css @@ -17,6 +17,74 @@ body { color: #D0D0D0; font-family: "XoloniumNormal", "Helvetica Neue", Helvetica, Arial, sans-serif; } +h1 small, +h2 small, +h3 small, +h4 small, +h5 small, +h6 small { + font-weight: normal; + color: #999999; +} +h1 { + font-size: 30px; + line-height: 36px; +} +h1 small { + font-size: 18px; +} +h2 { + font-size: 24px; + line-height: 36px; +} +h2 small { + font-size: 18px; +} +h3 { + line-height: 27px; + font-size: 18px; +} +h3 small { + font-size: 14px; +} +h4, h5, h6 { + line-height: 18px; +} +h4 { + font-size: 14px; +} +h4 small { + font-size: 12px; +} +h5 { + font-size: 12px; +} +h6 { + font-size: 11px; + color: #999999; + text-transform: uppercase; +} +table { + background: rgb(0, 0, 0); /* IE Fallback */ + background: none repeat scroll 0 0 rgba(0, 0, 0, 0.7); + border: 1px solid #436688; +} +table th { border: 1px solid #436688; background-color: #001021; } +table td { + border: 1px solid #436688; + font-size: 10px; +} +.table-hover > tbody > tr:hover > td, +.table-hover > tbody > tr:hover > th { + background-color: #222; +} +.table td { + vertical-align: middle; +} +.table .tdcenter { text-align: center; } + + +/* One-off elements */ #statline { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; @@ -31,6 +99,14 @@ body { margin-left: 0px; padding: 20px; } +#title { + color: #0088CC; + font-size: 30px; + margin-bottom: 15px; + position: relative; + text-align: center; + text-shadow: 2px 2px 3px #333; +} /* Navigation bar */ @@ -56,6 +132,7 @@ body { width: 100px; } + /* Desktop-specific stuff */ @media (min-width: 768px) { .navbar-form { diff --git a/xonstat/templates/main_index.mako b/xonstat/templates/main_index.mako index e310f8c..62d9887 100644 --- a/xonstat/templates/main_index.mako +++ b/xonstat/templates/main_index.mako @@ -5,74 +5,76 @@ Leaderboard <%block name="css"> - ${parent.css()} - + ${parent.css()} + <%block name="hero_unit"> -
- - % if summary_stats is None: -

Tracking Xonotic statistics since October 2011.

- % else: -

Tracking ${summary_stats.total_players} players, ${summary_stats.total_games} games (${summary_stats.duel_games} duel, ${summary_stats.ctf_games} ctf, ${summary_stats.dm_games} dm), and ${summary_stats.total_servers} servers since October 2011.

- % endif -
+
+ + % if summary_stats is None: +

Tracking Xonotic statistics since October 2011.

+ % else: +

Tracking ${summary_stats.total_players} players, ${summary_stats.total_games} games (${summary_stats.duel_games} duel, ${summary_stats.ctf_games} ctf, ${summary_stats.dm_games} dm), and ${summary_stats.total_servers} servers since October 2011.

+ % endif +
+##### RANKS ##### % if len(ranks) < 3: -
-
-

You don't seem to have any ranks yet.

-
-
-% else: -
-% for rs in ranks[:3]: - % if len(rs) > 0: -
+
+
+

You don't seem to have any ranks yet.

+
+
- % if rs[0].game_type_cd == 'duel': -

Duel Ranks

- % elif rs[0].game_type_cd == 'ctf': -

CTF Ranks

- % elif rs[0].game_type_cd == 'dm': -

DM Ranks

- % endif +% else: +
+ % for rs in ranks[:3]: + % if len(rs) > 0: +
+ % if rs[0].game_type_cd == 'duel': +

Duel Ranks

+ % elif rs[0].game_type_cd == 'ctf': +

CTF Ranks

+ % elif rs[0].game_type_cd == 'dm': +

DM Ranks

+ % endif - - - - - - - - - - <% i = 1 %> - % for r in rs: +
#NickElo
+ + + + + + + + + <% i = 1 %> + % for r in rs: <% i = i+1 %> - % endfor - -
#NickElo
${i} ${r.nick_html_colors()|n} ${round(r.elo, 3)}
-

More...

-
+ % endfor + + +

More...

+
% endif -% endfor + % endfor
% endif +##### ACTIVE PLAYERS #####

Most Active Players

- +
@@ -99,9 +101,11 @@ Leaderboard

*Most active stats are from the past 7 days

+ +##### ACTIVE SERVERS #####

Most Active Servers

-
#
+
@@ -127,9 +131,11 @@ Leaderboard
#
+ +##### ACTIVE MAPS #####

Most Active Maps

- +
@@ -156,11 +162,13 @@ Leaderboard + +##### RECENT GAMES ##### % if len(recent_games) > 0:

Recent Games

-
#
+
@@ -175,7 +183,6 @@ Leaderboard % for rg in recent_games: - -- 2.39.2
view ${rg.server_name} ${rg.map_name}