Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

styling more

  • Loading branch information...
commit 5173cc56790bfbef825d41435f909d1bd011a54e 1 parent 4eb17a4
afelski authored June 20, 2012
2  site/media/main.css
@@ -188,7 +188,7 @@ header#mainHeader { background: url(images/bg_header.jpg) top left no-repeat; mi
188 188
 nav li { float: left; margin-right: 45px; min-width: 59px; text-align: center; padding-bottom: 21px;}
189 189
 nav li:hover { background: url(images/bg_nav.png) center 24px no-repeat; padding-bottom: 21px; }
190 190
 nav li.active { background: url(images/bg_navActive.png) center 24px no-repeat;  }
191  
-nav li.active a:link { color: #635F5C; }
  191
+nav li.active a:link, nav li.active a:visited, nav li.active a:active  { color: #635F5C; }
192 192
 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; }
193 193
 
194 194
 #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
@@ -8,7 +8,7 @@
8 8
 
9 9
 {% block content %}
10 10
         <div class="fullWidth mainModule">
11  
-            <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>.
  11
+            <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>.
12 12
             </span>
13 13
             <ol id="billAction">
14 14
                 {% for stage, text, date in bill.progress_data %}
@@ -72,19 +72,25 @@ <h2 class="withTimeline withTip">{{ metadata.name }} {{bill.type_string|title}}
72 72
              </dl>
73 73
              <div class="clear"></div>
74 74
         </div>
75  
-        <div class="medModule">
76  
-            {% if bill.versions %}
77  
-                <h3>Versions</h3><ul>
  75
+        {% if bill.versions %}
  76
+            <div class="module">
  77
+                <h3 class="moduleTitle">Versions</h3>
  78
+                <ul class="inlineThirds">
78 79
                 {% for version in bill.versions %}
79  
-                    <li><a href="{{version.url}}">{{ version.name }}</a>
80  
-                    {% if "+mimetype" in version %}[{{ version|plusfield:"mimetype"}}]{% endif %}
  80
+                    <li class={% cycle "one" "two" "three" %}>
  81
+                        <a href="{{version.url}}">{{ version.name }}</a>
  82
+                        {% if "+mimetype" in version %}[{{ version|plusfield:"mimetype"}}]{% endif %}
81 83
                     </li>
82  
-                {% endfor %}</ul>
83  
-            {% endif %}
84  
-        </div>
85  
-        <div class="medModule">
  84
+                {% endfor %}
  85
+                </ul>
  86
+                <div class="clear"></div>
  87
+            </div>
  88
+        {% endif %}
  89
+
  90
+        <div class="module">
  91
+            <h3 class="moduleTitle">Recent</h3>
86 92
             <div class="eightCol colLt">
87  
-                <h3>Recent Actions</h3>
  93
+                <h4>Recent Actions</h4>
88 94
                 <table class="normalTable">
89 95
                     <thead>
90 96
                         <tr id="titles">
@@ -110,11 +116,13 @@ <h2 class="withTimeline withTip">{{ metadata.name }} {{bill.type_string|title}}
110 116
                 </table>
111 117
             </div>
112 118
             <div class="fourCol colRt">
113  
-                <h3>Votes</h3>
  119
+                <h4>Votes</h4>
114 120
                 {% if bill.votes_manager.count %}
115 121
                 <ul class="largerList voteChart">
116 122
                     {% for vote in bill.votes_manager %}
  123
+                        <li>
117 124
                         {% include vote_preview_row_template %}
  125
+                        </li>
118 126
                     {% endfor %}
119 127
                 </ul>
120 128
                 {% else %}
@@ -123,54 +131,56 @@ <h2 class="withTimeline withTip">{{ metadata.name }} {{bill.type_string|title}}
123 131
             </div>
124 132
             <div class="clear"></div>
125 133
         </div>
  134
+        {% if bill.documents %}
  135
+            <div class="module">
  136
+                <h3 class="moduleTitle">Documents</h3>
  137
+                {% for document in bill.documents %}
  138
+                    <ul class="inlineThirds">
  139
+                        <li><a href="document.url">{{ document.name }}</a>
  140
+                        {% if "+mimetype" in document %}[{{ document|plusfield:"mimetype"}}]{% endif %}
  141
+                        </li>
  142
+                    </ul>
  143
+                {% endfor %}
  144
+                <div class="clear"></div>
  145
+            </div>
  146
+        {% endif %}
126 147
         
127 148
         {% with events=bill.events %}
128  
-        {% if events.count %}
129  
-        <div class="eightCol colLt">
130  
-            <h3>Events</h3>
131  
-            <table class="normalTable">
132  
-                <thead>
133  
-                    <tr id="titles">
134  
-                        <th>Date</th>
135  
-                        <th>Where</th>
136  
-                        <th>Description</th>
137  
-                        <th>Committees</th>
138  
-                    </tr>
139  
-                </thead>
140  
-                <tbody>
141  
-                    {% for event in bill.events %}
142  
-                    <tr class = 'odd' >
143  
-                        <td class="tip withTipSm"><a href = '/{{ event.state }}/event/{{ event.id }}'
144  
-                                >{{ event.when|date:"M j, Y"}}</a></td>
145  
-                        <td>{{ event.location }}</td>
146  
-                        <td>{{ event.description }}</td>
147  
-                        <td>
148  
-                            {% for committee in event.committees %}
149  
-                            <a href = '/{{ committee.state }}/committee/{{ committee.id}}/'
150  
-                                >{{committee.display_name}}</a>
151  
-                            {% endfor %}
152  
-                        </td>
153  
-                    </tr>
154  
-            {% endfor %}
155  
-            {% endif %}
156  
-            {% endwith %}
157  
-                </tbody>
158  
-            </table>
159  
-        {% sources bill %}
160  
-        <div class="clear"></div>
161  
-        </div>
162  
-{% endblock %}
163  
-
164  
-<div class="module">
165  
-    {% if bill.documents %}
166  
-        <div class="sixCol colRt">
167  
-            <h3>Documents</h3>
168  
-            {% for document in bill.documents %}<ul>
169  
-                <li><a href="document.url">{{ document.name }}</a>
170  
-                {% if "+mimetype" in document %}[{{ document|plusfield:"mimetype"}}]{% endif %}
171  
-                </li>
172  
-            {% endfor %}</ul>
173  
-        </div>
174  
-    {% endif %}
175  
-    {% sources bill %}
176  
-</div>    
  149
+            {% if events.count %}
  150
+            <div class="eightCol colLt">
  151
+                <h3>Events</h3>
  152
+                <table class="normalTable">
  153
+                    <thead>
  154
+                        <tr id="titles">
  155
+                            <th>Date</th>
  156
+                            <th>Where</th>
  157
+                            <th>Description</th>
  158
+                            <th>Committees</th>
  159
+                        </tr>
  160
+                    </thead>
  161
+                    <tbody>
  162
+                        {% for event in bill.events %}
  163
+                        <tr class = 'odd' >
  164
+                            <td class="tip withTipSm"><a href = '/{{ event.state }}/event/{{ event.id }}'
  165
+                                    >{{ event.when|date:"M j, Y"}}</a></td>
  166
+                            <td>{{ event.location }}</td>
  167
+                            <td>{{ event.description }}</td>
  168
+                            <td>
  169
+                                {% for committee in event.committees %}
  170
+                                <a href = '/{{ committee.state }}/committee/{{ committee.id}}/'
  171
+                                    >{{committee.display_name}}</a>
  172
+                                {% endfor %}
  173
+                            </td>
  174
+                        </tr>
  175
+                        {% endfor %}
  176
+                        {% endif %}
  177
+                        {% endwith %}
  178
+                    </tbody>
  179
+                </table>
  180
+                {% sources bill %}
  181
+                <div class="clear"></div>
  182
+            </div>
  183
+        {% endblock %}
  184
+        <div class="module">
  185
+            {% sources bill %}
  186
+        </div>
6  site/templates/billy/web/public/vote.html
@@ -8,9 +8,9 @@
8 8
 {% block content %}
9 9
         <div class="fullWidth mainModule">
10 10
             <div id="billState" class="passed">{{vote.passed|yesno:"Passed,Failed,Unknown"}}</div>
11  
-            <div class="smModule">
12  
-                <h2>{{metadata.name}} {{bill.type_string|title}} <a href={% url "bill" abbr bill.id %}>{{bill.bill_id}}</a></h2>
13  
-                <p class="tip">{{bill.title}}</p>
  11
+            <div class="medModule">
  12
+                <h2 class="withTip">{{metadata.name}} {{bill.type_string|title}} <a href={% url "bill" abbr bill.id %}>{{bill.bill_id}}</a></h2>
  13
+                <p class="tip tipSm">{{bill.title}}</p>
14 14
             </div>
15 15
             <div class="eightCol colLt clear">
16 16
                 <h3 class="h4">{{ vote.motion }}</h3>

0 notes on commit 5173cc5

Please sign in to comment.
Something went wrong with that request. Please try again.