[pirate-politics] r530 committed - General css updates to lots of places
pirate-...@googlecode.com
Author: andru...@gmail.com
Date: Thu Jan 27 20:02:47 2011
Log: General css updates to lots of places
http://code.google.com/p/pirate-politics/source/detail?r=530
Modified:
/trunk/pirate-politics/new_templates/_solution.html
/trunk/pirate-politics/new_templates/_tutorial.html
/trunk/pirate-politics/new_templates/base.html
/trunk/pirate-politics/new_templates/submit_solution.html
/trunk/pirate-politics/new_templates/user_profile.html
/trunk/pirate-politics/static/style.css
=======================================
--- /trunk/pirate-politics/new_templates/_solution.html Thu Jan 27 01:48:18
2011
+++ /trunk/pirate-politics/new_templates/_solution.html Thu Jan 27 20:02:47
2011
@@ -28,7 +28,6 @@
</div>
<div class="issueback">
<a href="{% pp_url template='solution_detail.html' object=iss_obj %}">
{{iss_obj.name}} </a>
-
<div class="threecol">
<div class="colmid">
<div class="colleft">
=======================================
--- /trunk/pirate-politics/new_templates/_tutorial.html Wed Jan 26 19:21:55
2011
+++ /trunk/pirate-politics/new_templates/_tutorial.html Thu Jan 27 20:02:47
2011
@@ -1,11 +1,12 @@
<div class="tutorial">
- <p>
- <br><br><br>
- Use ==== or ---- below a line of text for a header<br><br>
- Use **word** to emphasize it.<br><br>
- --- for horizontal lines<br><br>
- Use:<br>
- ><br>><br>><br> for block quotes
-
- </p>
+ <a href="#" class="tutorialLink"
onClick="$('#tutorialTable').slideToggle('slow');">formatting assistance</a>
+ <div id="tutorialTable" onClick="$(this).slideToggle('slow');">
+ <table>
+ <tr><th>Typing this</th><th>Results in this</th></tr>
+ <tr><td>Header<br>----</td><td><h2>Header</h2></td></tr>
+ <tr><td>*italicize*</td><td><i>italicize</i></td></tr>
+ <tr><td>Horizontal line<br><br>---</td><td>Horizontal line<hr></td></tr>
+ <tr><td>>Block<br>>quotes<br></td><td><blockquote>Block
quote</blockquote></td</tr>
+ </table>
+ </div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/base.html Thu Jan 27 01:48:18 2011
+++ /trunk/pirate-politics/new_templates/base.html Thu Jan 27 20:02:47 2011
@@ -128,7 +128,7 @@
{% if request.user.username %}
{% pp_get_reputation user=request.user %}
<ul>hello
- <li> {{request.user.username}}</li> |
+ <li><a href="{% pp_url template='user_profile.html'
object=request.user%}">{{request.user.username}}</a></li> |
<li>rep: {{ pp_reputation.reputation }}</li> |
<li><a STYLE="text-decoration:none" href="/logout/">logout</a></li>
{% endpp_get_reputation %}
=======================================
--- /trunk/pirate-politics/new_templates/submit_solution.html Tue Jan 25
15:15:31 2011
+++ /trunk/pirate-politics/new_templates/submit_solution.html Thu Jan 27
20:02:47 2011
@@ -10,7 +10,7 @@
{% block content%}
<div class="stage">
- <div class="issuemask">
+ <div clre,sexyass="issuemask">
<div class="submissionbound">
{% pp_solution_form POST=request.POST path=request.path
object=request.object request=request %}
<div class="add">
=======================================
--- /trunk/pirate-politics/new_templates/user_profile.html Tue Jan 25
15:15:31 2011
+++ /trunk/pirate-politics/new_templates/user_profile.html Thu Jan 27
20:02:47 2011
@@ -26,12 +26,29 @@
{% pp_get_reputation user=request.object %}
-
<h2>{{request.object.username}}:{{pp_reputation.reputation}}</h2>
- {% endpp_get_reputation %}
+ <fieldset class="username">
+ <legend>Username</legend>
+ {{request.object.username}}
+ </fieldset>
+ <fieldset class="reputation">
+ <legend>Reputation</legend>
+ {{pp_reputation.reputation}}
+ </fieldset>
+ {% endpp_get_reputation %}
{% if pp_profile.profile %}
- Date of Birth: {{pp_profile.profile.birth_date|
date:"m/d/Y"}}<br><br>
- Bio: {{pp_profile.profile.bio}}
-
+ <fieldset class="memberSince">
+ <legend>Member since</legend>
+ MM/DD/YY
+ </fieldset>
+ <fieldset class="dateOfBirth">
+ <legend>Date of birth</legend>
+ {{pp_profile.profile.birth_date|date:"m/d/Y"}}<br><br>
+ </fieldset>
+ <fieldset class="bio">
+ <legend>Bio</legend>
+ {{pp_profile.profile.bio}}
+ </fieldset>
+
{% else %}
{% ifequal request.user request.object %}
{% if request.user.is_authenticated %}
=======================================
--- /trunk/pirate-politics/static/style.css Wed Jan 26 22:18:11 2011
+++ /trunk/pirate-politics/static/style.css Thu Jan 27 20:02:47 2011
@@ -1,13 +1,79 @@
-ohtml, body { margin: 0; padding: 0; }
+html, body { margin: 0; padding: 0; }
body{
font-family: sans-serif;
background:#eee;
}
-a { text-decoration: none; color: #91534D; }
-a:hover { color: #45211E; }
+a { text-decoration: none; color: #494E7A; }
+a:hover { color: #1D2130; }
pre { background: #fff; width: 460px; padding: 10px 20px; border-left: 5px
solid #ccc; margin: 0 0 20px; }
input { margin: 0; padding: 0; }
+hr {
+ border: none;
+ height: 2px;
+ background: black;
+ width: 95%;
+ -border-radius: 1px;
+}
+
+.tutorialLink {
+ margin-left: 15px;
+}
+
+#tutorialTable {
+ display: none;
+}
+
+.voting {
+ margin-left:10%;
+}
+
+.pagehead {
+ position:relative; /* This fixes the IE7 overflow hidden bug */
+ float:left;
+ width:68%;
+ font-size:140%; /* width of whole page */
+ font-weight:bold;
+ overflow:hidden;
+
+}
+
+.stage {
+ width:100%;
+ position:relative;
+ /*border:3px solid red;*/
+ float:left;
+ }
+
+.issuemask {
+ position:relative;
+ width:100%;
+ /*position:left;*/
+ float:left;
+ /*border:2px dashed #67A3E4;*/
+
+ }
+
+.issuebound {
+ position:relative;
+ width:67%;
+ /*position:left;*/
+ float:left;
+ /*border:2px dashed #67A3E4;*/
+ }
+
+.submissionbound {
+ position:relative;
+ width:60%;
+ /*position:left;*/
+ float:left;
+ /*border:2px dashed #67A3E4;*/
+ }
+
+.submissionbound form {
+ padding-left: 5%;
+
+}
#header {
width:100%;
background-color:#2B3332;
@@ -114,9 +180,47 @@
}
.tutorial {
- font-size:80%;
- float:right;
- width:35%;
+ font-size:80%;
+ width:35%;
+ margin-left: 5%;
+}
+
+.tutorial th {
+ background: #FAEAD4;
+ font-weight: bold;
+ padding: 5px;
+}
+
+.tutorial table {
+ border-collapse: collapse;
+}
+
+.tutorial table td {
+ background: #E5E3F5;
+ padding: 10px;
+ width: 100px;
+ border-left: 1px solid;
+}
+
+.tutorial table tr {
+ border: 1px solid;
+ min-height: 20px;
+}
+
+.tutorial table hr {
+ border: none;
+ height: 2px;
+ background: black;
+ width: 95%;
+ -border-radius: 1px;
+}
+
+.tutorialLink {
+ margin-left: 15px;
+}
+
+#tutorialTable {
+ display: none;
}
.voting {
@@ -165,6 +269,15 @@
/*border:2px dashed #67A3E4;*/
}
+.submissionbound form {
+ padding-left: 5%;
+
+}
+
+.submissionbount button {
+ clear: left;
+ }
+
.issuecol {
position:relative;
width:100%;
@@ -337,6 +450,43 @@
border-bottom:0;
margin-top:8px;
}
+
+
+.username {
+ width: 200px;
+ float: left;
+ text-align: center;
+}
+
+.username legend {
+ font-weight: normal;
+ text-align: left;
+}
+
+.reputation {
+ width: 120px;
+ float: right;
+ text-align: center;
+}
+
+.dateOfBirth {
+ width: 120px;
+ float: left;
+}
+
+.memberSince {
+ width: 120px;
+ float: left;
+}
+
+.username, .reputation, .dateOfBirth, .memberSince {
+ height: 30px;
+}
+
+.bio {
+ clear: both;
+ min-height: 100px;
+}
.issue. issueback2 .userinfo {
width:native;
@@ -382,8 +532,23 @@
padding:5px;
}
-.collapsible_comments { padding: 0; margin: 0; }
-
+#collapsible_comments {
+ list-style-type: none;
+ border-left: 1px solid #ccc;
+ padding: 0;
+ margin: 0;
+ margin-left: 5px;
+}
+
+#collapsible_comments li ul {
+ list-style-type: none;
+ border-left: 1px solid #ccc;
+ margin-left: 50px;
+}
+
+#collapsible_comments li ul li {
+ margin-left: -40px;
+}
.bullet h1, .bullet p {
color:black;