Modified:
/trunk/pirate-politics/new_templates/_solution.html
/trunk/pirate-politics/static/style.css
=======================================
--- /trunk/pirate-politics/new_templates/_solution.html Mon Jan 31 18:54:01
2011
+++ /trunk/pirate-politics/new_templates/_solution.html Mon Jan 31 19:27:56
2011
@@ -28,13 +28,7 @@
</div>
<div class="issueback">
- <div class="bullet_">
-
- {% pp_consensus_get object=iss_obj.id
user=request.user %}
- {% include '_voting_iss_obj.html' %}
- {% endpp_consensus_get %}
-
-</div>
+
<a href="{% pp_url template='solution_detail.html' object=iss_obj %}">
{{iss_obj.name}} </a>
<div class="iss_col3">
{% pp_comment_count
object=iss_obj.id %}
@@ -42,9 +36,17 @@
submitted by <a href="{% pp_url template='user_profile.html'
object=iss_obj.user%}"> {{iss_obj.user.username}} </a> on
{{iss_obj.submit_date|date:"(d/m/Y h:sA)"}} | {{ pp_comment.count }}
comment{{ pp_comment.count|pluralize}} | {{iss_obj.arguments}}
argument{{iss_obj.arguments|pluralize}}
{% endpp_comment_count %}
- </div>
-
- </div>
+ </div> </div>
+
+ <div class="bullet_">
+
+ {% pp_consensus_get object=iss_obj.id
user=request.user %}
+ {% include '_voting_iss_obj.html' %}
+ {% endpp_consensus_get %}
+
+ </div>
+
+
</div>
</div>
=======================================
--- /trunk/pirate-politics/static/style.css Mon Jan 31 18:54:01 2011
+++ /trunk/pirate-politics/static/style.css Mon Jan 31 19:27:56 2011
@@ -26,7 +26,8 @@
}
.voting {
- margin-left:10%;
+ float:right;
+ left:10%;
}
.pagehead {
@@ -398,14 +399,11 @@
.issue .issueback {
- position:absolute;
+ float:left;
+ position:relative;
width:90%;
- top:-25%;
- left:60px;
font-size:150%;
font-style:bold;
- min-width:20%;
- height:native;
background-color:#BDC4C8;
border:10px solid #BDC4C8;
border-radius: 10px; /*css3 only*/
@@ -496,12 +494,14 @@
}
.bullet {
+ position:relative;
+ float:left;
width:64px;
height:64px;
background-color:#7EB2CC;
/*background: url('/static/Bullet.png') no-repeat scroll;*/
color:black;
- bottom:1.5%;
+ top:1%;
padding:0px 0px 0px 0px;
overflow:visible;
border-radius: 5px;
@@ -513,7 +513,7 @@
content:"interest";
position: relative;
width: 45px;;
- top: -30px;
+ top: -40px;
left: 10px;
font-size: small;
}
@@ -550,14 +550,9 @@
text-align:center;
border:0;
position:relative;
- left:0px;
- bottom:+2px;
+ bottom:20%;
overflow:visible;
}
-
-.bullet h1 {
- width: 45px;
-}
.issue .bullet {
position:relative;
@@ -575,28 +570,9 @@
}
.bullet_ {
- right:1%;
- position:absolute;
- width:31%;
- bottom:-50%;
- padding:0px 0px 0px 0px;
- }
-
-.bullet2_ {
- font-size:75%;
- position:absolute;
- top:+100px;
- left:-99px;
- padding:0px 0px 0px 0px;
- margin:10px 10px 0px 0px;
- }
-
-.bullet3_ {
- font-size:75%;
- position:absolute;
- padding:0px 0px 0px 0px;
- left:+82%;
- top:-20%;
+ float:right;
+ position:relative;
+ width:100%;
}
.add_tag {
@@ -608,7 +584,6 @@
float:left;
width:100%;
font-size:85%; /* width of whole page */
-
border-bottom:3px solid #989898;
padding-bottom: 3px;
top: -3px;
@@ -629,7 +604,6 @@
position:relative;
overflow:hidden;
}
-
.sourcetags .sources {
position:relative;
@@ -660,7 +634,6 @@
.iss_col2 {
float:right;
}
-
.threecol a:link, .threecol a:visited {
color:black;