Merge branch 'processed_tasks' into production

Victor Costa
2 parents 67e29ed1 05361395
Showing 2 changed files with 10 additions and 1 deletions Show diff stats
app/views/tasks/processed.html.erb
public/stylesheets/tasks.css
@@ -35,7 +35,7 @@
 <% else %>
   <ul class="task-list">
     <% @tasks.each do |item| %>
-      <li class="task">
+      <li class="task status-<%= item.status%>">
         <div class="title">
           <strong><%= task_information(item) %></strong> <br/>
         </div>
@@ -103,6 +103,15 @@
   padding: 12px;
 }
+.task-processed .task.status-3 {
+  background-color: rgb(255, 203, 203);
+}
+
+.task-processed .task.status-2 {
+  background-color: rgb(205, 252, 218);
+}
+
+
 .task-processed ul {
   padding: 0;
 }
	@@ -35,7 +35,7 @@		@@ -35,7 +35,7 @@
35	<% else %>	35	<% else %>
36	<ul class="task-list">	36	<ul class="task-list">
37	<% @tasks.each do \|item\| %>	37	<% @tasks.each do \|item\| %>
38	- <li class="task">	38	+ <li class="task status-<%= item.status%>">
39	<div class="title">	39	<div class="title">
40	<strong><%= task_information(item) %></strong> <br/>	40	<strong><%= task_information(item) %></strong> <br/>
41	</div>	41	</div>
	@@ -103,6 +103,15 @@		@@ -103,6 +103,15 @@
103	padding: 12px;	103	padding: 12px;
104	}	104	}
105		105
		106	+.task-processed .task.status-3 {
		107	+ background-color: rgb(255, 203, 203);
		108	+}
		109	+
		110	+.task-processed .task.status-2 {
		111	+ background-color: rgb(205, 252, 218);
		112	+}
		113	+
		114	+
106	.task-processed ul {	115	.task-processed ul {
107	padding: 0;	116	padding: 0;
108	}	117	}