Permalink
Browse files

some layout progress...

  • Loading branch information...
1 parent 59cddca commit 7545d38e2f01dea9f7fcb2d9dcb4ef6538b66143 @tvon committed Mar 1, 2011
View
@@ -7,16 +7,15 @@ Mixture of html5boilerplate Wordpress and BreakFast theme from http://www.openso
*/
/*
-http://css-tricks.com/box-sizing/
-Force <textarea> to have padding and border that cut into it’s 100% width instead of expanding it.
+ http://css-tricks.com/box-sizing/
+ Force <textarea> to have padding and border that cut into it’s 100% width instead of expanding it.
*/
textarea {
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; /* Opera/IE 8+ */
}
-
* {
/* Enable kerning and ligatures: http://www.aestheticallyloyal.com/public/optimize-legibility/ */
text-rendering: optimizeLegibility;
@@ -84,8 +83,8 @@ a:hover {
/* We'll underline the paragraph links. */
p a, p a:active, p a:visited {
border-bottom: 1px solid transparent;
- -webkit-transition: border-color .65s;
- font-weight: 500;
+ -webkit-transition: border-color .65s;
+ font-weight: 500;
}
p a:hover {
@@ -236,7 +235,7 @@ body#home header {
header #logo {
float: left;
- min-width: 280px;
+ padding: 0 5%;
}
header #logo h1 {
@@ -245,6 +244,10 @@ header #logo h1 {
font-size: 182%;
}
+header #logo h1 a:hover {
+ color: #444;
+}
+
header #logo h2 {
text-align: center;
font-size: 80%;
@@ -257,7 +260,6 @@ header nav {
}
header nav ul {
- float: right;
list-style: none;
}
@@ -281,6 +283,11 @@ header nav ul a:hover {
background: #3b3b3b;
}
+header nav ul li.active a {
+ color: #fff;
+ background: #3b3b3b;
+}
+
#content {
float: left;
width: 490px;
@@ -293,6 +300,26 @@ header nav ul a:hover {
padding: 20px;
}
+body#home #sidebar ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
+body#home #sidebar ul li a,
+body#home #sidebar ul li a:hover {
+ color: #fff;
+}
+
+#sidebar h3 {
+ height: 17px;
+ padding: 0 10px;
+ background: #3b3b3b;
+ color: #fff;
+ font-size: 100%;
+ font-weight: normal;
+}
+
/* Home */
#splash {
width: 770px;
@@ -349,15 +376,10 @@ textarea#comment {
width:100%;
}
-/* HERE */
-
/* Sections and articles layouts */
-
article,
section.post {
margin: 0px;
- padding: 40px 0;
- /* border-bottom: 1px solid #eee; */
}
article header,
section.post header {
@@ -368,8 +390,7 @@ article header h1 {
}
article footer,
-section.post footer
-{
+section.post footer {
padding: 3px 0px;
border-bottom: 1px solid #eee;
border-top: 1px solid #eee;
@@ -397,7 +418,6 @@ article header time {
article section > p:last-of-type:after {
margin-left: 5px;
- content: "";
color: #444;
}
@@ -437,14 +457,28 @@ section.image cite {
}
/* Forms */
+form table td,
+form table th {
+ margin: 0;
+ padding: 6px;
+ vertical-align: top;
+}
+
+form table th {
+ text-align: right;
+ background: #fff;
+ border-right: 1px #bfbfbf solid;
+}
+
label {
display: block;
- margin-top: 1em;
- font-weight: 500;
+ font-weight: bold;
}
input[type=text] {
- width: 63%;
+ width: 98%;
+ padding: 2px;
+ border: 1px #bfbfbf solid;
}
#breadcrumb-menu ul {
View
@@ -76,7 +76,7 @@
<footer id="footer">
<p class="mezzanine">
{% trans "Powered by" %}
- <a href="http://mezzanine.jupo.org">Mezzanine</a><br />
+ <a href="http://mezzanine.jupo.org" target="_blank">Mezzanine</a><br />
<a href="{% url set_device "mobile" %}?next={{ request.path }}">{% trans "View Mobile Site." %}</a>
</p>
</footer>
@@ -87,7 +87,7 @@ <h2 class="blog-post-title">
{% endblock %}
-{% block right_panel %}
+{% block sidebar %}
{% include "blog/includes/filter_panel.html" %}
{% endblock %}
@@ -10,9 +10,12 @@
{% else %}
{{ posted_comment_form.as_table }}
{% endif %}
- <tr><td colspan="2">
- <input class="button" type="submit" value="{% trans "Comment" %}" />
- </td></tr>
+ <tr>
+ <th style="border: none; background: #fff;">&nbsp;</th>
+ <td>
+ <input class="button" type="submit" value="{% trans "Comment" %}" />
+ </td>
+ </tr>
</table>
</form>
@@ -16,8 +16,8 @@
<h3>{% trans "Archive" %}</h3>
{% for month in months %}
{% ifchanged month.year %}{% if not forloop.first %}</ul>{% endif %}<h4>{{ month.year }}</h4><ul>{% endifchanged %}
-<li><a href="{% url blog_post_list_month year=month.year month=month.month %}"
- >{{ month|date:"F" }}</a></li>
+<li><a href="{% url blog_post_list_month year=month.date.year month=month.date.month %}"
+ >{{ month.date|date:"F" }}</a></li>
{% endfor %}
</ul>
{% endif %}
@@ -46,15 +46,15 @@
{% blog_authors as authors %}
{% if authors %}
+{% if authors.count > 1 %}
<h3>{% trans "Authors" %}</h3>
{% for author in authors %}
<a href="{% url blog_post_list_author author.username %}"
>{{ author.get_full_name|default:author.username }}</a>
{% endfor %}
{% endif %}
+{% endif %}
<h3>{% trans "Feeds" %}</h3>
<a href="{% url blog_post_feed "rss" %}">{% trans "RSS" %}</a> /
-<a href="{% url blog_post_feed "atom" %}">{% trans "Atom" %}</a>
-
-
+<a href="{% url blog_post_feed "atom" %}">{% trans "Atom" %}</a>
@@ -24,8 +24,10 @@
<ul>
{% for post in recent_posts %}
<li>
- <h3>date</h3>
- <a href="{% url blog_post_detail post.slug %}">{{ post.title }}</a></li>
+ <h3><a href="{% url blog_post_detail post.slug %}">{{ post.title }}</a></h3>
+ <p>
+ </p>
+ </li>
{% endfor %}
</ul>
</div>
@@ -14,8 +14,16 @@
{# endeditable #}
<form method="post" class="form"{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
{% csrf_token %}
- <ul>{{ form.as_ul }}</ul>
- <input class="button" type="submit" value="{{ page.form.button_text }}" />
+ <table>
+ {{ form.as_table }}
+
+ <tr>
+ <th style="border: none; background: #fff;">&nbsp;</th>
+ <td>
+ <input class="button" type="submit" value="{{ page.form.button_text }}" />
+ </td>
+ </tr>
+ </table>
</form>
{% endif %}

0 comments on commit 7545d38

Please sign in to comment.