[pypy-svn] r71254 - in codespeed/pyspeed: media/css templates
tobami at codespeak.net
tobami at codespeak.net
Tue Feb 16 12:46:28 CET 2010
Author: tobami
Date: Tue Feb 16 12:46:27 2010
New Revision: 71254
Added:
codespeed/pyspeed/media/css/main2.css
Modified:
codespeed/pyspeed/media/css/main.css
codespeed/pyspeed/templates/base.html
codespeed/pyspeed/templates/overview.html
Log:
style fixes
Modified: codespeed/pyspeed/media/css/main.css
==============================================================================
--- codespeed/pyspeed/media/css/main.css (original)
+++ codespeed/pyspeed/media/css/main.css Tue Feb 16 12:46:27 2010
@@ -1,35 +1,41 @@
-body {margin: 0; background-color: #2D2F32; }
+body { margin: 0; padding: 0; background-color: #2D2F32; }
h1 { margin: 0; }
div#containter { width: 74em; margin-left: auto; margin-right: auto; }
-div#header { margin: 0; }
+div#header { width: 100%; margin: 0; margin-bottom: 1.6em; float:left; }
div#title {
- margin-bottom: 1.6em; background-color: #FFFFFF; color: #000000;
+ width: 100%;
+ float: left;
+ background-color: #FFFFFF; color: #000000;
padding-bottom: 6px;
-moz-border-radius-bottomleft: 6px;
-moz-border-radius-bottomright: 6px;
-webkit-border-radius-bottomleft: 6px;
-webkit-border-radius-bottomright: 6px;
}
-div#subnavigation { width: 100%; clear: both; color: #FFFFFF;}
-div#subnavigation ul { display: inline; margin: 0; }
-div#subnavigation li {
- display: inline;
+div#title img { float: left; }
+div#title h1 { float: left; margin-top: 23px; }
+/* div#navigation { float: right; color: #222222; } */
+div#subnavigation { width: 100%; float: left; margin-bottom: 0.8em; }
+div#tabs { width: 100%; color: #FFFFFF; }
+div#tabs ul { margin: 0; padding: 0; font-weight: bold; }
+div#tabs li {
+ display: inline-block;
margin-left: 1.8em;
padding: 0.8em;
+ padding-bottom: 0.4em;
-moz-border-radius-topleft: 6px;
-moz-border-radius-topright: 6px;
-webkit-border-radius-topleft: 6px;
-webkit-border-radius-topright: 6px;
}
-div#subnavigation li.current { background-color: #E5E5E5; color: #000000;}
-div#subnavigation li.highlight { background-color: #FFFFFF; color: #2D2F32;}
+div#tabs li.current { background-color: #E5E5E5; color: #000000;}
+div#tabs li.highlight { background-color: #FFFFFF; color: #2D2F32;}
-div#wrapper { margin-top: 0; float:left; }
+div#wrapper { width: 100%; margin-top: 0; float:left; }
div#configbar {
width: 97.8%;
position: relative;
background-color: #E5E5E5;
- margin-bottom: 0.8em;
padding: 0.8em;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
@@ -165,4 +171,16 @@
table.tablesorter tbody tr.highlight td {
background-color: #9DADC6 !important;
cursor: pointer;
-}
\ No newline at end of file
+}
+
+/* new clearfix */
+.clearfix:after {
+ visibility: hidden;
+ display: block;
+ font-size: 0;
+ content: " ";
+ clear: both;
+ height: 0;
+ }
+* html .clearfix { zoom: 1; } /* IE6 */
+*:first-child+html .clearfix { zoom: 1; } /* IE7 */
Added: codespeed/pyspeed/media/css/main2.css
==============================================================================
--- (empty file)
+++ codespeed/pyspeed/media/css/main2.css Tue Feb 16 12:46:27 2010
@@ -0,0 +1,189 @@
+body { margin: 0; padding: 0; background-color: #FFFFFF; }
+h1 { margin: 0; }
+div#containter { width: 74em; margin-left: auto; margin-right: auto; }
+div#header { width: 100%; margin: 0; margin-bottom: 0.8em; float:left; }
+div#title {
+ width: 100%;
+ float: left;
+ background-color: #FFFFFF; color: #000000;
+ padding-bottom: 6px;
+ -moz-border-radius-bottomleft: 6px;
+ -moz-border-radius-bottomright: 6px;
+ -webkit-border-radius-bottomleft: 6px;
+ -webkit-border-radius-bottomright: 6px;
+}
+div#title img { float: left; }
+div#title h1 { float: left; margin-top: 23px; }
+/* div#navigation { float: right; color: #222222; } */
+div#subnavigation { width: 100%; float: left; margin-bottom: 0.8em; }
+div#tabs { width: 100%; color: #FFFFFF; }
+div#tabs ul { margin: 0; padding: 0; padding-left: 2em; font-weight: bold; }
+div#tabs li {
+ display: inline-block;
+ background-color: #F5F5F5;
+ color: #888888;
+ margin-left: 0.8em;
+ padding: 1em;
+ padding-top: 0.6em;
+ padding-bottom: 0.3em;
+ -moz-border-radius-topleft: 20px;
+ -moz-border-radius-topright: 20px;
+ -webkit-border-radius-topleft: 20px;
+ -webkit-border-radius-topright: 20px;
+}
+div#tabs li.current { background-color: #E5E5E5; color: #000000;}
+div#tabs li.highlight { background-color: #E5E5E5; color: #2D2F32;}
+
+div#wrapper { width: 100%; margin-top: 0; float:left; }
+div#configbar {
+ width: 97.8%;
+ position: relative;
+ background-color: #E5E5E5;
+ padding: 0.8em;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+}
+div#navbar {
+ float: left;
+ margin-right: 20px;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+}
+div#content {
+ float: right;
+ clear:right;
+/* padding: 0.8em; */
+ background-color: #FFFFFF;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+}
+
+.sidebox {
+ margin: 0;
+ margin-bottom: 2.2em;
+ width: 16em; /* ems so it will grow */
+/* background: url(sbbody-r.gif) no-repeat bottom right; */
+ font-size: 100%;
+}
+.boxhead {
+/* background: url(sbhead-r.gif) no-repeat top right; */
+ background-color: #9DADC6;
+ -moz-border-radius-topleft: 6px;
+ -moz-border-radius-topright: 6px;
+ -webkit-border-radius-topleft: 6px;
+ -webkit-border-radius-topright: 6px;
+ margin: 0;
+ padding: 0;
+ text-align: center;
+}
+.boxhead h2 {
+/* background: url(sbhead-l.gif) no-repeat top left; */
+ margin: 0;
+ padding: 0.5em 0.8em 0.3em;
+ color: white;
+ font-weight: bold;
+ font-size: 1.2em;
+ line-height: 1em;
+/* text-shadow: rgba(0,0,0,.4) 0px 2px 5px; /* Safari-only, but cool */ */
+}
+.boxbody {
+/* background: url(sbbody-l.gif) no-repeat bottom left; */
+ background-color: #E5E5E5;
+ -moz-border-radius-bottomleft: 6px;
+ -moz-border-radius-bottomright: 6px;
+ -webkit-border-radius-bottomleft: 6px;
+ -webkit-border-radius-bottomright: 6px;
+ margin: 0;
+ padding: 0.5em 0.8em 0.8em;
+/* padding: 5px 30px 31px; */
+}
+.boxbody ul {
+ list-style: none;
+ margin: 0;
+ padding: 0.2em;
+}
+
+/* tables */
+table.tablesorter {
+ width: 60em;
+ font-family:arial;
+/* margin:0.8em; */
+ font-size: 11pt;
+ text-align: left;
+ background-color: #fafafa;
+ border-collapse: collapse;
+ border-spacing: 0px;
+ border: 1px solid #CDCDCD;
+}
+table.tablesorter thead tr td{}
+table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+ background-color: #9DADC6;
+ border: 1px solid #CDCDCD;
+ font-size: 8pt;
+ padding: 4px;
+ width: 7em;
+}
+table.tablesorter thead tr .header {
+ background-image: url(/media/images/bg.gif);
+ background-repeat: no-repeat;
+ background-position: center right;
+ cursor: pointer;
+}
+table.tablesorter tbody td {
+ color: #3D3D3D;
+ padding: 4px;
+ background-color: #FFF;
+ border: 1px solid #CDCDCD;
+ vertical-align: top;
+ text-align: right;
+}
+table.tablesorter tbody tr.odd td {
+ background-color:#F0F0F6;
+}
+table.tablesorter thead tr .headerSortUp {
+ background-image: url(/media/images/asc.gif);
+}
+table.tablesorter thead tr .headerSortDown {
+ background-image: url(/media/images/desc.gif);
+}
+table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
+ background-color: #8dbdd8;
+}
+
+table.tablesorter tbody td.text {text-align: left;}
+
+table.tablesorter thead th.value {width: 450px;}
+table.tablesorter tbody td.value {
+ background-image: url(/media/images/gridline.gif);
+ background-repeat: repeat-x;
+ background-position: left top;
+ text-align: left;
+ padding: 0px;
+ border: none;
+ background-color:transparent;
+}
+td.value img {
+ vertical-align: middle;
+ margin: 5px 5px 5px 0;
+ border: none;
+}
+
+table.tablesorter tbody tr td.status-red { background-color: #FF4141; }
+table.tablesorter tbody tr td.status-green { background-color: #B7FFB8; }
+table.tablesorter tbody tr td.status-yellow { background-color: yellow; }
+table.tablesorter tbody tr.highlight td {
+ background-color: #9DADC6 !important;
+ cursor: pointer;
+}
+
+/* new clearfix */
+.clearfix:after {
+ visibility: hidden;
+ display: block;
+ font-size: 0;
+ content: " ";
+ clear: both;
+ height: 0;
+ }
+* html .clearfix { zoom: 1; } /* IE6 */
+*:first-child+html .clearfix { zoom: 1; } /* IE7 */
Modified: codespeed/pyspeed/templates/base.html
==============================================================================
--- codespeed/pyspeed/templates/base.html (original)
+++ codespeed/pyspeed/templates/base.html Tue Feb 16 12:46:27 2010
@@ -1,31 +1,32 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
-<title>{% block title %}PyPy Speed Center{% endblock %}</title>
+<title>{% block title %}PyPy Speed{% endblock %}</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-{% block script %}
- <link href="/media/css/main.css" rel="stylesheet" type="text/css" />
+
+ <link href="/media/css/main2.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"></script>
- <script type="text/javascript" src="/media/js/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="/media/js/codespeed.js"></script>
+{% block script %}
{% endblock %}
</head>
<body>
<div id="containter">
<div id="header">
-<div id="title"><h1><img src="/media/images/logo-pypy.png" hight="86" width="248" align="middle"/>SPEED CENTER</h1></div>
-<div id="navigation"></div>
+<div id="title"><img src="/media/images/logo-pypy.png" hight="86" width="248" align="middle"/><h1>SPEED CENTER</h1></div>
</div>
<div id="wrapper">
+{% block subnavigation %}<div id="subnavigation"></div>{% endblock %}
{% block body %}
<p>Start page</p>
{% endblock %}
</div>
{% block footer %}
{% endblock %}
+<div style="clear: both;">
</div>
</body>
</html>
Modified: codespeed/pyspeed/templates/overview.html
==============================================================================
--- codespeed/pyspeed/templates/overview.html (original)
+++ codespeed/pyspeed/templates/overview.html Tue Feb 16 12:46:27 2010
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-<div id="subnavigation"><ul><li class="current">Overview</li><li>Timeline</li></ul></div>
-{% block body %}
+{% block script %}
+<script type="text/javascript" src="/media/js/jquery.tablesorter.min.js"></script>
<script type="text/javascript">
$(function() {
$("#results > tbody > tr").each(function() {
@@ -32,7 +32,16 @@
});
});
</script>
-<div id="configbar">revision:</div>
+{% endblock %}
+
+{% block subnavigation %}
+<div id="subnavigation">
+ <div id="tabs"><ul><li class="current">Overview</li><li>Timeline</li></ul></div>
+ <div id="configbar">revision:</div>
+</div>
+{% endblock %}
+{% block body %}
+
<div id="navbar">
<div id="interpreter" class="sidebox">
<div class="boxhead"><h2>Interpreter</h2></div>
More information about the Pypy-commit
mailing list