Merge pull request #113 from tgrauer/master

Prefs, mobile padding fix, etc
OrlandoSentinel · Jan 13, 2016 · 7e3a57e · 7e3a57e
2 parents 6ad1dc2 + c35d89f
commit 7e3a57e
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 45 deletions.
diff --git a/static/css/main.css b/static/css/main.css
@@ -75,7 +75,7 @@ body {
 /* line 61, main.scss */
 h1, h2, h3, h4, h5, h6 {
   color: #444;
-  font-family: 'Georgia, serif';
+  font-family: 'Georgia', serif;
 }
 
 /* line 66, main.scss */
@@ -290,21 +290,22 @@ p.party.democrat {
   color: #eee;
   padding: 3px 5px 3px 10px;
   margin-bottom: 20px;
+  font-size: 28px;
 }
 
-/* line 240, main.scss */
+/* line 241, main.scss */
 input.form-control {
   height: 40px;
 }
 
-/* line 244, main.scss */
+/* line 245, main.scss */
 div.divider {
   border-bottom: 2px solid #ddd;
   padding-bottom: 20px;
   margin-bottom: 20px;
 }
 
-/* line 251, main.scss */
+/* line 252, main.scss */
 .bill_details h4, .cur_session_bill h4 {
   background: #eee;
   border: 1px solid #ddd;
@@ -319,24 +320,24 @@ div.divider {
   font-weight: 600;
 }
 
-/* line 265, main.scss */
+/* line 266, main.scss */
 .spn_leg_bill_type h5 {
   font-size: 18px;
   font-weight: 600;
 }
-/* line 270, main.scss */
+/* line 271, main.scss */
 .spn_leg_bill_type .btn {
   margin-top: 10px;
   margin-bottom: 20px;
 }
 
-/* line 276, main.scss */
+/* line 277, main.scss */
 .bill_detail_title {
   font-size: 25px;
   font-weight: 600;
 }
 
-/* line 281, main.scss */
+/* line 282, main.scss */
 .heading {
   background: #eee;
   border: 1px solid #ddd;
@@ -348,27 +349,26 @@ div.divider {
   margin-bottom: 20px;
 }
 
-/* line 290, main.scss */
+/* line 291, main.scss */
 .vote_result {
   text-align: center;
   padding: 3px 5px;
   width: 80px;
 }
-/* line 295, main.scss */
+/* line 296, main.scss */
 .vote_result.vote_pass {
   color: #fff;
   background: #2bc77c;
 }
-/* line 300, main.scss */
+/* line 301, main.scss */
 .vote_result.vote_fail {
   color: #fff;
   background: #e64242;
 }
 
-/* line 306, main.scss */
-.glossary {
+/* line 307, main.scss */
+div.glossary {
   margin-top: 40px;
-  /*padding: 20px;*/
   background: #fff;
   border: 1px solid #ddd;
   -moz-box-shadow: 0 3px 10px #c4c4c4;
@@ -456,92 +456,112 @@ div.divider {
   margin-top: 20px;
 }
 
+/* line 393, main.scss */
+.selectFix select {
+  max-width: 100%;
+}
+
 @media handheld, only screen and (max-width: 767px) {
-  /* line 395, main.scss */
+  /* line 400, main.scss */
   .billboard {
     min-height: 500px;
   }
 
-  /* line 399, main.scss */
+  /* line 404, main.scss */
   .billboard form {
     padding: 20px;
   }
 
-  /* line 403, main.scss */
+  /* line 408, main.scss */
   .billboard h2 {
     font-size: 40px;
     text-align: center;
     line-height: 1.8em;
   }
-  /* line 407, main.scss */
+  /* line 412, main.scss */
   .billboard h2 span {
     font-size: 65px;
   }
 
-  /* line 412, main.scss */
+  /* line 417, main.scss */
   .billboard .container {
     padding: 20px;
   }
 }
 @media handheld, only screen and (max-width: 497px) {
-  /* line 419, main.scss */
+  /* line 426, main.scss */
+  .container {
+    padding: 0;
+  }
+
+  /* line 429, main.scss */
+  .navbar .container {
+    padding: 0 15px;
+  }
+
+  /* line 433, main.scss */
   .billboard {
     min-height: 430px;
   }
 
-  /* line 421, main.scss */
+  /* line 435, main.scss */
   .billboard h2 {
     line-height: 1.7em;
   }
-  /* line 424, main.scss */
+  /* line 438, main.scss */
   .billboard h2 span {
     font-size: 50px;
   }
 
-  /* line 429, main.scss */
+  /* line 443, main.scss */
   h2.intro {
     font-size: 25px;
   }
 
-  /* line 433, main.scss */
+  /* line 447, main.scss */
   .navbar-brand {
     padding: 10px 5px 5px;
   }
-  /* line 435, main.scss */
+  /* line 449, main.scss */
   .navbar-brand img {
     max-width: 240px;
     height: auto;
   }
 
-  /* line 441, main.scss */
+  /* line 455, main.scss */
   .row {
     margin-left: 15px;
     margin-right: 15px;
   }
 
-  /* line 446, main.scss */
+  /* line 460, main.scss */
   .billboard h2 {
     font-size: 30px;
     text-align: center;
   }
 
-  /* line 451, main.scss */
+  /* line 465, main.scss */
   .reg_form {
     padding: 0;
   }
 
-  /* line 455, main.scss */
+  /* line 469, main.scss */
   .billboard .container {
     padding: 10px;
   }
 
-  /* line 460, main.scss */
+  /* line 474, main.scss */
   .cur_session_bill h4 {
     font-size: 18px;
   }
 
-  /* line 463, main.scss */
+  /* line 477, main.scss */
   .bill_detail_title {
     font-size: 20px;
   }
+
+  /* line 481, main.scss */
+  .centered_form h2 {
+    font-size: 20px;
+  }
 }
diff --git a/static/css/main.scss b/static/css/main.scss
@@ -60,7 +60,7 @@ body{
 
 h1,h2,h3,h4,h5,h6{
 	color: #444;
-	font-family: 'Georgia, serif';
+	font-family: 'Georgia', serif;
 }
 
 h1,h2,h3{
@@ -234,6 +234,7 @@ p.party{
 		color: #eee;
 		padding: 3px 5px 3px 10px;
 		margin-bottom: 20px;
+		font-size: 28px;
 	}
 }
 
@@ -303,7 +304,7 @@ div.divider{
 	}
 }
 
-.glossary{
+div.glossary{
 	margin-top: 40px;
 	background: #fff;
 	border: 1px solid #ddd;
@@ -388,6 +389,11 @@ div.divider{
 	}
 }
 
+.selectFix{
+	select{
+		max-width: 100%;
+	}
+}
 
 @media handheld, only screen and (max-width: 767px) {
 
@@ -411,9 +417,18 @@ div.divider{
 	.billboard .container{
 		padding: 20px;
 	}
+
+
 }
 
 @media handheld, only screen and (max-width: 497px) {
+
+	.container{
+		padding: 0;
+	}
+	.navbar .container{
+		padding: 0 15px;
+	}
 
 	.billboard{min-height: 430px;}
 
@@ -462,6 +477,10 @@ div.divider{
 	.bill_detail_title{
 		font-size: 20px;
 	}
+
+	.centered_form h2{
+		font-size: 20px;
+	}
 
 }
 
diff --git a/templates/base.html b/templates/base.html
@@ -9,6 +9,7 @@
         <link href="{% static 'css/custom.css' %}" rel="stylesheet" media="screen"/>
         <link href="{% static 'css/main.css' %}" rel="stylesheet" media="screen"/>
         <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
+        <link rel="icon" type="image/png" href="{% url 'latest' %}static/img/favicon.png" />
         <script type="text/javascript" src="{% static 'js/jquery-1.11.3.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'bootstrap-3.3.5/js/bootstrap.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/glossary.js' %}"></script>
@@ -71,7 +72,6 @@
                   </ul>
                 </li>
                   {% endif %}
-                </li>
               </ul>
             </div><!-- /.navbar-collapse -->
           </div><!-- /.container-fluid -->

diff --git a/templates/bills/all.html b/templates/bills/all.html
@@ -15,7 +15,7 @@
             <h2>{{ current_session }}</h2>
 
             <form action="" method="get" role="form">
-                <div> Filter by {{ sorter_type }} 
+                <div class="form-group selectFix"> Filter by {{ sorter_type }} 
 
                         <select multiple name="bill_sorters" class="form-control prefs-multiple">
                             {% for sorter in sorters %}

diff --git a/templates/bills/latest_actions.html b/templates/bills/latest_actions.html
@@ -36,7 +36,7 @@ <h2 class="text-center intro">Welcome to Tabs on Tallahassee</h2>
 <div class="col-sm-7">
     {% include "bills/bill_selection_form.html" %}
 </div>
-<div class="col-sm-4 col-sm-offset-1 news">
+<!-- <div class="col-sm-4 col-sm-offset-1 news">
     <h4>News</h4>
     <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis qui quidem, officiis optio assumenda in blanditiis voluptates laudantium eos iure eaque quasi nihil consectetur architecto quam totam porro, nemo dolorem.</p>
 
@@ -47,7 +47,7 @@ <h4>News</h4>
     <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis qui quidem, officiis optio assumenda in blanditiis voluptates laudantium eos iure eaque quasi nihil consectetur architecto quam totam porro, nemo dolorem.</p>
 
     <a class="btn btn-primary" role="button" href="{% url 'current_session' %}">Jump to the latest news</a>
-</div>
+</div> -->
 
 {% else %}
     <h2>Latest Bill Activity</h2>

diff --git a/templates/glossary/glossary.html b/templates/glossary/glossary.html
@@ -2,7 +2,7 @@
 {% block colclass %} col-md-12 glossary {% endblock %}
 {% block content %}
 
-<h1>Glossary</h1>
+<h2>Glossary</h2>
 <table class="table table-striped">
     <caption>A glossary of terms related to the FL Legislature</caption>
     <thead>

diff --git a/templates/home_base.html b/templates/home_base.html
@@ -8,6 +8,7 @@
         <link href="{% static 'bootstrap-3.3.5/css/bootstrap.min.css' %}" rel="stylesheet" media="screen"/>
         <link href="{% static 'css/custom.css' %}" rel="stylesheet" media="screen"/>
         <link href="{% static 'css/main.css' %}" rel="stylesheet" media="screen"/>
+        <link rel="icon" type="image/png" href="{% url 'latest' %}static/img/favicon.png" />
         <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
         <script type="text/javascript" src="{% static 'js/jquery-1.11.3.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'bootstrap-3.3.5/js/bootstrap.min.js' %}"></script>
@@ -71,7 +72,7 @@
                   </ul>
                 </li>
                   {% endif %}
-                </li>
+
               </ul>
             </div><!-- /.navbar-collapse -->
           </div><!-- /.container-fluid -->

diff --git a/templates/preferences/preferences.html b/templates/preferences/preferences.html
@@ -45,6 +45,7 @@
 {% endblock %}
 
 {% block title %}User Preferences{% endblock title %}
+{% block colclass %} col-md-6 {% endblock %}
 {% block subtitle %}Enter your address to track your Senator and Representative, and select which other Senators, Representatives, locations, and subjects you'd like to follow.{% endblock subtitle %}
 
 {% block content %}
@@ -61,7 +62,7 @@
     {% else %}
 
     <div class="col-md-4">
-        <div id="map" style="margin-left:100px;"></div>
+        <div id="map" style="margin-left:0px;"></div>
     </div>
 
     <div class="col-md-4">
@@ -149,7 +150,7 @@
 
         <div class="row">
             <div class="col-md-12">
-                <input type="submit"/>
+                <input class="btn" type="submit"/>
             </div>
         </div>
     </form>