Skip to content

Commit

Permalink
Replace the table-based sidebar and contents by divs
Browse files Browse the repository at this point in the history
  • Loading branch information
nekohayo committed Nov 8, 2010
1 parent 9a00d42 commit 942d7d6
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 33 deletions.
55 changes: 34 additions & 21 deletions site_media/css/screen.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
html, body {
background-color: #4e6960;
font-size: 0.95em;
margin: 0;
padding: 0;
body{
margin:0px;
font-family:Liberation Sans, sans-serif;
}
h1{
text-shadow: 2px 2px 0px #FFF; /* 2px right, 2px below, 0px blur */
}

a img {
Expand All @@ -14,20 +15,10 @@ a, a:link, a:hover, a:active, a:visited {
text-decoration: underline;
}

h1 {
color: #d3643b;
font-family: Trebuchet MS, Calibri, Verdana, Arial, sans-serif;
}

.clear {
clear: both;
}

#body {
background-color: #94c7b6;
padding: 10px;
}

#header {
width: 100%;
border-spacing: 10px;
Expand Down Expand Up @@ -104,11 +95,33 @@ table#content-container {
/*text-decoration:underline;*/
}

#content {
padding: 12px 12px 12px 24px;
background-color: #edece6;
vertical-align: top;
font-family: Candara, Verdana, Tahmoa, Arial, sans-serif;
#main{
/* margin-top:3em;*/
width:75%;
border:2px solid #ffcc33;
background-color:#FFE596;
float:left;
border-radius:1em;
background:-webkit-gradient(
linear,
left bottom,
left top,
color-stop(0.95, rgb(255,229,150)),
color-stop(0.70, rgb(255,255, 255))
);
background:-moz-linear-gradient(
center bottom,
rgb(255,229,150) 95%,
rgb(255,255,255) 70%
);
}
#main-toolbar{
padding-left:1em;
padding-right:1em;
border-bottom:1px solid black;
}
#main-content{
padding:1em;
}

#content h1 {
Expand All @@ -121,7 +134,7 @@ table#content-container {
}

table#content-layout {
width: 75%;
/*width: 75%;*/
}

#footer {
Expand Down
21 changes: 9 additions & 12 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,22 @@ <h3>
</td>
</tr>
</table>
{% block content-container %}
<table id="content-container" cellspacing="0" cellpadding="0">
<tr>

{% block sidebar-container %}
<td id="sidebar-container">
<div id="sidebar">
{% block sidebar %}
<div id="sidebar"></div>
{% endblock %}
</div>
</td>
{% endblock %}
<td id="content">


{% block content-container %}
<div id="main">
{% block content %}
<div id="main-content"></div>
{% endblock %}
</td>
</tr>
</table>
</div>
{% endblock %}
</div>


<div id="footer">
{% block footer %}
Expand Down

0 comments on commit 942d7d6

Please sign in to comment.