Move incidents in past week to left column below alerts and increase …

…font size
ministryofjustice · Jun 12, 2015 · eee1741 · eee1741
1 parent c8febcd
commit eee1741
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/public/css/app.css b/public/css/app.css
@@ -137,4 +137,8 @@ ul.contact-methods li.contact-method {
 .duty_manager {
     background-color: #0070f0;
     color: #fff;
-}
+}
+
+#past_week {
+    font-size: 3rem;
+}
diff --git a/views/alerts.erb b/views/alerts.erb
@@ -1,4 +1,4 @@
-<div id="alerts" class="column">
+<div id="alerts">
   <h2>Alerts</h2>
     <ul>
     <%if @alerts.any? %>
@@ -7,4 +7,4 @@
       <li class="good"> No alerts to report </li>
     </ul>
   <% end %>
-</div>
+</div>
diff --git a/views/index.erb b/views/index.erb
@@ -2,17 +2,19 @@
 <html lang=en-us>
 
 <head>
-  <meta http-equiv="refresh" content="5">
+  <%#<meta http-equiv="refresh" content="5">%>
   <link rel="stylesheet" href="css/app.css" media="screen">
 </head>
 
 <body class="<%unless @alerts.empty? %>alert<% end %>
  <%if @incident_mode %>incident-mode<% end %>">
   <div class="container">
-    <%= partial(:incident_mode) %>
-    <%= partial(:alerts) %>
+  <%= partial(:incident_mode) %>
+    <div class="column">
+      <%= partial(:alerts) %>
+      <%= partial(:past_week) %>
+    </div>
     <%= partial(:persons) %>
-    <%= partial(:past_week) %>
   </div>
 </body>
 

diff --git a/views/past_week.erb b/views/past_week.erb
@@ -1,4 +1,4 @@
-<div id="past_week" class="column">
+<div id="past_week">
   <h2>Past week</h2>
   <%= @incidents_in_past_week %> incidents
 </div>