Merge pull request jdorn#89 from jdorn/bootstrap3_fixes

A couple bootstrap 3.0 fixes
hellifiknow · Sep 11, 2013 · 2d1f331 · 2d1f331
2 parents ad411e3 + 0e20191
commit 2d1f331
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/public/css/report_list.css b/public/css/report_list.css
@@ -19,14 +19,6 @@
     position: fixed;
     overflow-y: auto;
 }
-@media (max-width: 979px) {
-    #table_of_contents {
-	position: absolute;
-	top: 60px;
-	bottom: auto;
-	height: auto;
-    }
-}
 #report_list {
     padding-bottom: 400px;
-}
+}
diff --git a/public/css/typeahead.js-bootstrap.css b/public/css/typeahead.js-bootstrap.css
@@ -1,3 +1,7 @@
+.navbar-form[role="search"] > .form-group {
+	width: 240px;
+}
+
 .twitter-typeahead {
     width: 100%;
     position: relative;

diff --git a/templates/default/html/chart_report.twig b/templates/default/html/chart_report.twig
@@ -56,7 +56,8 @@
 				{% endif %}
 				displayAnnotations: true,
                 series: series_{{chart.num}},
-				colors: []
+				colors: [],
+				wmode: 'transparent'
 			};
 			
 			{% for color in chart.colors %}

diff --git a/templates/default/html/report_list.twig b/templates/default/html/report_list.twig
@@ -6,7 +6,7 @@
 
 {% block stylesheets %}
 	{{ parent() }}
-	<!-- <link rel="stylesheet" href="{{base}}/public/css/report_list.css" /> -->
+	<link rel="stylesheet" href="{{base}}/public/css/report_list.css" />
 {% endblock %}
 
 {% block header %}
@@ -24,7 +24,7 @@
 	{% endblock %}
 	</div>
 
-	<div id="report_list" class="col-lg-10 col-md-9 col-xs-12">
+	<div id="report_list" class="col-lg-10 col-md-9 col-xs-12 col-lg-offset-2 col-md-offset-3">
         <h1 class="visible-phone">All Reports</h1>
 		{% block report_errors %}
 			{% if report_errors is not empty %}