Skip to content
Snippets Groups Projects
Commit c204fc99 authored by Ben Adida's avatar Ben Adida
Browse files

updates for UI

parent 7c270e33
Branches
Tags
No related merge requests found
Subproject commit a36515a2df818322ad77b38daf12c677cc28d727
Subproject commit 65e40d871c9e2db1e330d40ed6345b1cee4537d3
Subproject commit 5cc69b1bf1f3af9d2c833051af7bc4bfe0c78494
Subproject commit b1780c138b143bc3386a397466ca8c1ad279c632
......@@ -47,10 +47,8 @@ body {
text-decoration: underline;
}
#page h2 {
background: #fc9;
border-bottom: 1px solid #666;
padding: 5px 0px 2px 5px;
#contentbody h2 {
margin-bottom:2px;
}
#election_info {
......@@ -83,3 +81,20 @@ table.pretty th, td {
-moz-border-radius-topleft:5px;
-moz-border-radius-topright:5px;
}
.adminaction {
font-size: 9pt;
font-weight: normal;
background:#ddd;
padding: 2px 6px 1px 6px;
color: black;
border: 1px solid #888;
-moz-border-radius-bottomleft:3px;
-moz-border-radius-bottomright:3px;
-moz-border-radius-topleft:3px;
-moz-border-radius-topright:3px;
}
.adminaction a {
color: black;
}
\ No newline at end of file
......@@ -14,12 +14,17 @@
-->
<link rel="stylesheet" type="text/css" media="screen" href="/static/main.css">
<link rel="stylesheet" type="text/css" href="/static/helios/css/ui-lightness/jquery-ui-1.8.1.custom.css">
<!--[if IE]>
<link rel="stylesheet" type="text/css" media="screen, projection" href="{{ MEDIA_URL }}ie.css">
<![endif]-->
{% endblock %}
<script language="javascript" src="/static/helios/helios/jquery-1.2.2.min.js"></script>
<script language="javascript" src="/static/helios/js/jquery-1.4.2.min.js"></script>
<script language="javascript" src="/static/helios/js/jquery-ui-1.8.1.custom.min.js"></script>
<script language="javascript" src="/static/helios/js/jqsplitdatetime.js"></script>
<script language="javascript" src="/static/helios/helios/jquery.json.min.js"></script>
{% block js %}
......@@ -36,12 +41,6 @@
{% endblock %}
</div>
<div id="contentbody">
{% if admin_p %}
<div style="float:right; border-left: 1px dashed black; padding: 0px 20px 5px 20px; width: 250px;">
<h3>Administration</h3>
{% block admin %}{% endblock %}
</div>
{% endif %}
{% block content %}{% endblock %}
</div>
<div id="footer">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment