Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

WIP: bills page

  • Loading branch information...
commit 37606a1a7e1c18ba304dddb6c7acbfab0ba76a21 1 parent 480f923
Stefan Crain authored September 17, 2012
56  src/main/webapp/mockups/css/style.css
@@ -529,6 +529,62 @@ ul.actions li,ul.actions{
529 529
 .gold-icon{
530 530
 	color:#e09c27;
531 531
 }
  532
+.newline{
  533
+	text-align:left;
  534
+	display:block;
  535
+	
  536
+}
  537
+.inline{
  538
+	display:inline;
  539
+}
  540
+.subnav {
  541
+	 width: 100%;
  542
+	 height: 36px;
  543
+	 background: #ffffff;
  544
+	 border: 1px solid #e5e5e5;
  545
+
  546
+}
  547
+.subnav .title {
  548
+    color: #777777;
  549
+    display: block;
  550
+    float: left;
  551
+    font-size: 20px;
  552
+    font-weight: 200;
  553
+    margin-left: -10px;
  554
+    padding: 8px 20px;
  555
+    text-shadow: 0 1px 0 #FFFFFF;
  556
+}
  557
+/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
  558
+@media (min-width: 980px) {
  559
+	 .subnav-fixed {
  560
+	   position: fixed;
  561
+	   top: 90px;
  562
+	   left: 0;
  563
+	   right: 0;
  564
+	   z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
  565
+	   border-color: #d5d5d5;
  566
+	   border-width: 0 0 1px; /* drop the border on the fixed edges */
  567
+	   -webkit-border-radius: 0;
  568
+	      -moz-border-radius: 0;
  569
+	           border-radius: 0;
  570
+	   -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
  571
+	      -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
  572
+	           box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
  573
+	   filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
  574
+	 }
  575
+	 
  576
+	 .subnav-fixed .nav {
  577
+	   width: 938px;
  578
+	   margin: 0 auto;
  579
+	   padding: 0 1px;
  580
+	 }
  581
+	 .subnav .nav > li:first-child > a,
  582
+	 .subnav .nav > li:first-child > a:hover {
  583
+	   -webkit-border-radius: 0;
  584
+	      -moz-border-radius: 0;
  585
+	           border-radius: 0;
  586
+	 }
  587
+}
532 588
 @media (max-width: 480px) {
533 589
 	.pagebox{
534 590
 		padding-left:0px;
21  src/main/webapp/mockups/js/app.js
@@ -38,4 +38,25 @@ $(function() {
38 38
 
39 39
  	console.log('step 4 done');
40 40
  	
  41
+ 	
  42
+// fix subnav on scroll
  43
+    var $win = $(window)
  44
+      , $nav = $('.subnav')
  45
+      , navTop = $('.subnav').length && $('.subnav').offset().top - 90
  46
+      , isFixed = 0
  47
+
  48
+    processScroll()
  49
+
  50
+    $win.on('scroll', processScroll)
  51
+
  52
+    function processScroll() {
  53
+      var i, scrollTop = $win.scrollTop()
  54
+      if (scrollTop >= navTop && !isFixed) {
  55
+        isFixed = 1
  56
+        $nav.addClass('subnav-fixed')
  57
+      } else if (scrollTop <= navTop && isFixed) {
  58
+        isFixed = 0
  59
+        $nav.removeClass('subnav-fixed')
  60
+      }
  61
+    }
41 62
  });
48  src/main/webapp/mockups/templates/bill.jsp
... ...
@@ -1,14 +1,26 @@
1  
-<div class="page-header">
  1
+<div class="subnav" id="top">
  2
+	<ul class="nav nav-pills">
  3
+		<li class='title'>S35-2011</li>
  4
+		<li><a href="#top">Bill Meta</a></li>
  5
+		<li><a href="#actions">Actions</a></li>
  6
+		<li><a href="#memo">Memo</a></li>
  7
+		<li><a href="#bill_head bill">Bill</a></li>  			 
  8
+	</ul>
  9
+</div>
  10
+
  11
+<hr/>
  12
+<div >
  13
+
  14
+<div class="page-header" >
2 15
     <h1>  S35-2011:<small> Lowers the annual candidate contribution limit from $150,000 to $75,000 </small></h1>
3  
-    <div style="font-size: 24px;">
4  
-   		<i class="icon-camera-retro"></i> icon-camera-retro
5  
-    </div>
6 16
  </div>
  17
+ 
7 18
   
8 19
 
  20
+
9 21
 <div class="bill">
10 22
 <div class='row'>
11  
-	<div class='billmeta'>
  23
+	<div class='billmeta' >
12 24
 		<div class='span12'>
13 25
 		  	Lowers the annual candidate contribution limit from $150,000 to $75,000. <hr/>
14 26
 		</div>
@@ -17,32 +29,20 @@
17 29
 		  	<b>Committee:</b> <a href="/legislation/committee/ELECTIONS" class="sublink">ELECTIONS</a><br/>
18 30
 		  	<b>Law Section:</b> <a href="/legislation/search/?term=lawsection%3A%22Election+Law%22" class="sublink">Election Law</a><br/>
19 31
 		  	<b>Law:</b> Amd S14-114, El L
20  
-		  	<br><br>
21  
-		  	<b>Jump To:</b>
22  
-		  	<br>
23  
-		  	<a href="#memo" class='super_alert'>Memo</a>
24  
-		  	<br>
25  
-		  	<a href="#bill_head bill">Bill</a>
26  
-		  	<br>
27  
-		  	<a href="#comments">Comments</a>
28  
-		  	<br><br>
29  
-		  	<br>
30  
-		</div>	
  32
+		</div>
  33
+ 
31 34
 		<div class='span4'>
32 35
 		  	<b>Same as: </b> <a>Versions: S21-2011</a>
33  
-		  	<!-- <br /><br />
34  
-		  	<a>Print HTML Page</a> / <a>Print Original Bill Format</a>
35  
-		  	<br />
36  
-		  	<a>ShareThis</a> / <a>Read or Leave Comments</a>-->
37 36
 		</div>
38  
-		<div class='span12'>
  37
+		<div class='span12' id="actions">
39 38
 		  	<hr>
40 39
 			<h3>S35-2011 Actions</h3>
  40
+					 
41 41
 			    <ul class="actions icons">
42  
-			    	<li><i class="icon-legal green-icon"></i> Jan 4, 2012: REFERRED TO COMMERCE, ECONOMIC DEVELOPMENT AND SMALL BUSINES</li>
43  
-				    <li><i class="icon-external-link green-icon"></i> Jan 4, 2012: REFERRED TO COMMERCE, ECONOMIC DEVELOPMENT AND SMALL BUSINESS</li>
  42
+			    	<li><i class="icon-legal green-icon icon-large"></i><small>Jan 4, 2012:</small> REFERRED TO COMMERCE, ECONOMIC DEVELOPMENT AND SMALL BUSINES </li>
44 43
 				    <li><i class="icon-group "></i> Apr 5, 2011: NOTICE OF COMMITTEE CONSIDERATION - REQUESTED</li>
45  
-				    <li><i class="icon-certificate gold-icon"></i>  Mar 14, 2011: PRINT NUMBER 39A</li>
  44
+				    <li><i class="icon-remove red-icon"></i>Mar 29, 2011: DEFEATED IN COMMERCE, ECONOMIC DEVELOPMENT AND SMALL BUSINESS</li>
  45
+				    <li><i class="icon-file"></i>  Mar 14, 2011: PRINT NUMBER 39A</li>
46 46
    				    <li><i class="icon-retweet "></i>  Mar 14, 2011: AMEND AND RECOMMIT TO INVESTIGATIONS AND GOVERNMENT OPERATIONS</li>
47 47
    				    <li><i class="icon-share-alt "></i> Jan 5, 2011: REFERRED TO COMMERCE, ECONOMIC DEVELOPMENT AND SMALL BUSINESS</li>
48 48
       				<li><i class="icon-group "></i> Jan 5, 2011: REFERRED TO ENVIRONMENTAL CONSERVATION</li>

0 notes on commit 37606a1

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