Permalink
Browse files

Merge branch 'master' of github.com:pydanny/isthisfor

  • Loading branch information...
2 parents d234085 + 21a814e commit df864e5c3de7695fd8776536ebb77ba0cc293d39 @audreyr audreyr committed Feb 11, 2012
View
@@ -72,9 +72,9 @@ class Comment(models.Model):
"""
VOTE_CHOICES = (
+ (1, 'ROCKS!'),
+ (0, "Meh"),
(-1, "SUCKS!"),
- (0, "No vote"),
- (1, "ROCKS!"),
)
comment = models.TextField(null=True, blank=True)
user = models.CharField(_("Your name"), max_length=128, help_text="Be an uber-troll and use your real world name!")
@@ -0,0 +1,66 @@
+.vote
+{
+ width: 15px;
+ float: left; clear: left;
+}
+
+.vote img
+{
+ display: block;
+ float: none; clear: both;
+ padding-top: 2px;
+}
+
+.user {
+ font-weight: 700;
+}
+
+.pub-date {
+ font-weight: 700;
+}
+
+#pitch-list{
+ padding-top:30px;
+ padding-left:0;
+ margin-left:0;
+ width:800px;
+}
+
+#pitch-list li{
+ display:block;
+ float:left;
+ list-style-type:none;
+ width:100%;
+ padding-left:0px;
+ margin-left:0;
+ border-bottom:1px solid rgba(0,0,0,.2);
+ margin-bottom:15px;
+}
+
+#pitch-list li h2{
+ font-size:24px;
+ font-weight:bold;
+}
+
+#pitch-list li p{
+
+}
+
+.prepend-top{margin-top:12px;}
+.prepend-top2{margin-top:24px;}
+
+span.score{font-size:24px;line-height:36px;float:left;width:40px;}
+span.score.neutral{color:#333;}
+span.score.negative{color:#c00}
+span.score.positive{color:#0c0}
+
+
+.pitch-container{
+ padding-bottom:10px;
+}
+
+.comments-container{
+ padding-top:15px;
+}
+
+.pitch-container .pitch{font-size:24px;padding-top:10px;}5B
@@ -54,5 +54,20 @@ span.score.neutral{color:#333;}
span.score.negative{color:#c00}
span.score.positive{color:#0c0}
+
+.pitch-container{
+ padding-bottom:10px;
+}
+
+.comments-container{
+ padding-top:15px;
+}
+
+.pitch-container .pitch{font-size:24px;padding-top:10px;}
+
#tagline{font-size:46px;line-height:50px;}
-#explanation{font-size:18px;margin-top:10px;}
+#explanation{font-size:18px;margin-top:10px;}
+
+
+.comment-list p{font-size:15px}
+.comment-list{padding-bottom:15px;padding-top:15px;border-bottom:1px solid rgba(0,0,0,.2)}
@@ -24,9 +24,12 @@
{% for field in form %}
{% include "core/_field.html" %}
{% endfor %}
- </fieldset>
- <button type="submit" class="btn">Add comment</button>
+ </fieldset>
+
+ <button type="submit" class="btn btn-primary">Add comment</button>
</form>
+
+
</div>
</div>
@@ -39,3 +42,8 @@
});
</script>
{% endblock %}
+
+
+(1, 'ROCKS!'),
+(0, "No vote"),
+(-1, "SUCKS!"),
@@ -5,15 +5,10 @@
{% endblock %}
{% block content %}
-<div class="row">
+<div class="row pitch-container">
<div class="span16">
- <h1>{{ pitch.name }}</h1>
-
- <p class="prepend-top">
- Published on {{ pitch.pub_date }}.
- </p>
-
- <p>
+ <h1 class='pitch-name'>{{ pitch.name }}</h1>
+ <p class='pitch'>
{% if pitch.pitch %}
{{ pitch.pitch }}
{% else %}
@@ -23,7 +18,7 @@
</div>
</div>
-<div class="row">
+<div class="row comments-container">
<div class="span16">
<h3>Comments</h3>
</div>
@@ -34,7 +29,8 @@
<div class="vote-result span1">
{% if comment.vote == 1 %}
<img src="{{ STATIC_URL }}img/pro-60x60.png" />
- {% else %}
+ {% endif %}
+ {% if comment.vote == -1 %}
<img src="{{ STATIC_URL }}img/con-60x60.png" />
{% endif %}
</div>
View
@@ -5,4 +5,4 @@ django-debug-toolbar==0.8.5
South==0.7.3
requests==0.10.1
django-floppyforms==0.4.7
-Pillow==1.7.6
+#Pillow==1.7.6

0 comments on commit df864e5

Please sign in to comment.