From 47aff2704c062929fe1163b137cde4cea07dc1b9 Mon Sep 17 00:00:00 2001
From: Braulio Bhavamitra <braulio@eita.org.br>
Date: Fri, 2 Oct 2015 17:19:15 -0300
Subject: [PATCH] Merge tasks.css file

---
 public/stylesheets/tasks.css  | 55 -------------------------------------------------------
 public/stylesheets/tasks.scss | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 55 deletions(-)
 delete mode 100644 public/stylesheets/tasks.css

diff --git a/public/stylesheets/tasks.css b/public/stylesheets/tasks.css
deleted file mode 100644
index 714947d..0000000
--- a/public/stylesheets/tasks.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.task_box {
-  position: relative;
-  border: 1px solid #888;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-  -khtml-border-radius: 10px;
-  border-radius: 10px;
-  padding: 6px 4px 9px 4px;
-  margin-top: 5px;
-  background: #EEE;
-}
-
-.task_title {
-  margin: 0px;
-  display: block;
-  line-height: 28px;
-  font-size: 120%;
-}
-
-.task_date {
-  color: gray;
-  font-size: 12px;
-}
-
-.task_icon {
-  float: left;
-  margin-right: 10px;
-  width: 50px;
-  height: 50px;
-  text-align: center;
-}
-
-.task_decisions {
-  float: right;
-  padding-right: 5px;
-}
-
-.task_information {
-  line-height: 18px;
-  padding: 2px 0px;
-  clear: right;
-}
-
-.task_information p {
-  margin: 0px;
-}
-
-.task_target {
-  text-decoration: underline;
-  font-weight: bold;
-}
-
-.task_responsible {
-  text-align: right;
-}
diff --git a/public/stylesheets/tasks.scss b/public/stylesheets/tasks.scss
index 2716fc7..dd25798 100644
--- a/public/stylesheets/tasks.scss
+++ b/public/stylesheets/tasks.scss
@@ -25,3 +25,59 @@ div.pending-tasks {
   padding-left: 0px;
   list-style-type: none;
 }
+
+.task_box {
+  position: relative;
+  border: 1px solid #888;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  -khtml-border-radius: 10px;
+  border-radius: 10px;
+  padding: 6px 4px 9px 4px;
+  margin-top: 5px;
+  background: #EEE;
+}
+
+.task_title {
+  margin: 0px;
+  display: block;
+  line-height: 28px;
+  font-size: 120%;
+}
+
+.task_date {
+  color: gray;
+  font-size: 12px;
+}
+
+.task_icon {
+  float: left;
+  margin-right: 10px;
+  width: 50px;
+  height: 50px;
+  text-align: center;
+}
+
+.task_decisions {
+  float: right;
+  padding-right: 5px;
+}
+
+.task_information {
+  line-height: 18px;
+  padding: 2px 0px;
+  clear: right;
+}
+
+.task_information p {
+  margin: 0px;
+}
+
+.task_target {
+  text-decoration: underline;
+  font-weight: bold;
+}
+
+.task_responsible {
+  text-align: right;
+}
--
libgit2 0.21.2