Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

styling more

  • Loading branch information...
commit 5173cc56790bfbef825d41435f909d1bd011a54e 1 parent 4eb17a4
Ali Felski authored
2  site/media/main.css
View
@@ -188,7 +188,7 @@ header#mainHeader { background: url(images/bg_header.jpg) top left no-repeat; mi
nav li { float: left; margin-right: 45px; min-width: 59px; text-align: center; padding-bottom: 21px;}
nav li:hover { background: url(images/bg_nav.png) center 24px no-repeat; padding-bottom: 21px; }
nav li.active { background: url(images/bg_navActive.png) center 24px no-repeat; }
-nav li.active a:link { color: #635F5C; }
+nav li.active a:link, nav li.active a:visited, nav li.active a:active { color: #635F5C; }
nav { background: url(images/bg_secNav.png) center top no-repeat; width: 900px; padding: 13px 20px 0; font-family: Georgia, 'Times New Roman', Times, serif; }
#searchform button { background: url(images/btn_search.png) top left no-repeat; width: 45px; height: 36px; float: right;}
132 site/templates/billy/web/public/bill.html
View
@@ -8,7 +8,7 @@
{% block content %}
<div class="fullWidth mainModule">
- <span class="tip sources withTipSm"><a href="https://scout.sunlightfoundation.com/item/state_bill/{{ bill.id }}">Recieve alerts about {{bill.type_string|title}} {{ bill.bill_id }} from Scout</a>.
+ <span class="tip sources"><a href="https://scout.sunlightfoundation.com/item/state_bill/{{ bill.id }}">Recieve alerts about {{bill.type_string|title}} {{ bill.bill_id }} from Scout</a>.
</span>
<ol id="billAction">
{% for stage, text, date in bill.progress_data %}
@@ -72,19 +72,25 @@ <h2 class="withTimeline withTip">{{ metadata.name }} {{bill.type_string|title}}
</dl>
<div class="clear"></div>
</div>
- <div class="medModule">
- {% if bill.versions %}
- <h3>Versions</h3><ul>
+ {% if bill.versions %}
+ <div class="module">
+ <h3 class="moduleTitle">Versions</h3>
+ <ul class="inlineThirds">
{% for version in bill.versions %}
- <li><a href="{{version.url}}">{{ version.name }}</a>
- {% if "+mimetype" in version %}[{{ version|plusfield:"mimetype"}}]{% endif %}
+ <li class={% cycle "one" "two" "three" %}>
+ <a href="{{version.url}}">{{ version.name }}</a>
+ {% if "+mimetype" in version %}[{{ version|plusfield:"mimetype"}}]{% endif %}
</li>
- {% endfor %}</ul>
- {% endif %}
- </div>
- <div class="medModule">
+ {% endfor %}
+ </ul>
+ <div class="clear"></div>
+ </div>
+ {% endif %}
+
+ <div class="module">
+ <h3 class="moduleTitle">Recent</h3>
<div class="eightCol colLt">
- <h3>Recent Actions</h3>
+ <h4>Recent Actions</h4>
<table class="normalTable">
<thead>
<tr id="titles">
@@ -110,11 +116,13 @@ <h2 class="withTimeline withTip">{{ metadata.name }} {{bill.type_string|title}}
</table>
</div>
<div class="fourCol colRt">
- <h3>Votes</h3>
+ <h4>Votes</h4>
{% if bill.votes_manager.count %}
<ul class="largerList voteChart">
{% for vote in bill.votes_manager %}
+ <li>
{% include vote_preview_row_template %}
+ </li>
{% endfor %}
</ul>
{% else %}
@@ -123,54 +131,56 @@ <h2 class="withTimeline withTip">{{ metadata.name }} {{bill.type_string|title}}
</div>
<div class="clear"></div>
</div>
+ {% if bill.documents %}
+ <div class="module">
+ <h3 class="moduleTitle">Documents</h3>
+ {% for document in bill.documents %}
+ <ul class="inlineThirds">
+ <li><a href="document.url">{{ document.name }}</a>
+ {% if "+mimetype" in document %}[{{ document|plusfield:"mimetype"}}]{% endif %}
+ </li>
+ </ul>
+ {% endfor %}
+ <div class="clear"></div>
+ </div>
+ {% endif %}
{% with events=bill.events %}
- {% if events.count %}
- <div class="eightCol colLt">
- <h3>Events</h3>
- <table class="normalTable">
- <thead>
- <tr id="titles">
- <th>Date</th>
- <th>Where</th>
- <th>Description</th>
- <th>Committees</th>
- </tr>
- </thead>
- <tbody>
- {% for event in bill.events %}
- <tr class = 'odd' >
- <td class="tip withTipSm"><a href = '/{{ event.state }}/event/{{ event.id }}'
- >{{ event.when|date:"M j, Y"}}</a></td>
- <td>{{ event.location }}</td>
- <td>{{ event.description }}</td>
- <td>
- {% for committee in event.committees %}
- <a href = '/{{ committee.state }}/committee/{{ committee.id}}/'
- >{{committee.display_name}}</a>
- {% endfor %}
- </td>
- </tr>
- {% endfor %}
- {% endif %}
- {% endwith %}
- </tbody>
- </table>
- {% sources bill %}
- <div class="clear"></div>
- </div>
-{% endblock %}
-
-<div class="module">
- {% if bill.documents %}
- <div class="sixCol colRt">
- <h3>Documents</h3>
- {% for document in bill.documents %}<ul>
- <li><a href="document.url">{{ document.name }}</a>
- {% if "+mimetype" in document %}[{{ document|plusfield:"mimetype"}}]{% endif %}
- </li>
- {% endfor %}</ul>
- </div>
- {% endif %}
- {% sources bill %}
-</div>
+ {% if events.count %}
+ <div class="eightCol colLt">
+ <h3>Events</h3>
+ <table class="normalTable">
+ <thead>
+ <tr id="titles">
+ <th>Date</th>
+ <th>Where</th>
+ <th>Description</th>
+ <th>Committees</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for event in bill.events %}
+ <tr class = 'odd' >
+ <td class="tip withTipSm"><a href = '/{{ event.state }}/event/{{ event.id }}'
+ >{{ event.when|date:"M j, Y"}}</a></td>
+ <td>{{ event.location }}</td>
+ <td>{{ event.description }}</td>
+ <td>
+ {% for committee in event.committees %}
+ <a href = '/{{ committee.state }}/committee/{{ committee.id}}/'
+ >{{committee.display_name}}</a>
+ {% endfor %}
+ </td>
+ </tr>
+ {% endfor %}
+ {% endif %}
+ {% endwith %}
+ </tbody>
+ </table>
+ {% sources bill %}
+ <div class="clear"></div>
+ </div>
+ {% endblock %}
+ <div class="module">
+ {% sources bill %}
+ </div>
6 site/templates/billy/web/public/vote.html
View
@@ -8,9 +8,9 @@
{% block content %}
<div class="fullWidth mainModule">
<div id="billState" class="passed">{{vote.passed|yesno:"Passed,Failed,Unknown"}}</div>
- <div class="smModule">
- <h2>{{metadata.name}} {{bill.type_string|title}} <a href={% url "bill" abbr bill.id %}>{{bill.bill_id}}</a></h2>
- <p class="tip">{{bill.title}}</p>
+ <div class="medModule">
+ <h2 class="withTip">{{metadata.name}} {{bill.type_string|title}} <a href={% url "bill" abbr bill.id %}>{{bill.bill_id}}</a></h2>
+ <p class="tip tipSm">{{bill.title}}</p>
</div>
<div class="eightCol colLt clear">
<h3 class="h4">{{ vote.motion }}</h3>
Please sign in to comment.
Something went wrong with that request. Please try again.