From 7f8c5d8a28e9cee804c0edc2565084504413aef8 Mon Sep 17 00:00:00 2001
From: logan <loganmerriam@gmail.com>
Date: Sat, 3 Sep 2016 20:54:58 -0400
Subject: [PATCH 1/2] Tweaked trackable styles for drag n drop

---
 frontend/app/styles/components/checkin/trackables-step.scss | 3 +--
 frontend/app/styles/components/tracked-level.scss           | 4 ++--
 frontend/app/styles/global.scss                             | 5 ++---
 frontend/app/styles/variables.scss                          | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/app/styles/components/checkin/trackables-step.scss b/frontend/app/styles/components/checkin/trackables-step.scss
index 67a904ac4..78031efba 100644
--- a/frontend/app/styles/components/checkin/trackables-step.scss
+++ b/frontend/app/styles/components/checkin/trackables-step.scss
@@ -14,8 +14,7 @@
     }
     .draggable-item {
       &.activated {
-        border-radius: 5px;
-        border: 3px dashed $primary;
+        box-shadow: 0 10px 0 5px lightgrey;
       }
     }
   }
diff --git a/frontend/app/styles/components/tracked-level.scss b/frontend/app/styles/components/tracked-level.scss
index 3e79f0fd1..5dc483c46 100644
--- a/frontend/app/styles/components/tracked-level.scss
+++ b/frontend/app/styles/components/tracked-level.scss
@@ -3,7 +3,6 @@
     li {
       position: relative;
       display: inline-block;
-      margin-right: 4px;
       border-radius: 5px;
       width: 15%;
       max-width: 50px;
@@ -75,6 +74,7 @@
   }
   h4 {
     position: relative;
-    display: inline;
+    display: inline-block;
+    margin-bottom: 10px;
   }
 }
diff --git a/frontend/app/styles/global.scss b/frontend/app/styles/global.scss
index 7be87c9d0..9d9ea8c83 100644
--- a/frontend/app/styles/global.scss
+++ b/frontend/app/styles/global.scss
@@ -25,7 +25,7 @@
 }
 
 .x-to-remove {
-  color: $primary;
+  color: $grey;
   margin-left: 5px;
   &:hover {
     color: $base-font-color;
@@ -99,9 +99,8 @@ input[type="submit"] {
     font-size: 1.1em;
   }
   .subtitle {
-    color: $primary;
+    color: $grey;
     font-size: 0.8em;
-    font-style: italic;
   }
 }
 
diff --git a/frontend/app/styles/variables.scss b/frontend/app/styles/variables.scss
index 51c0941b9..906fb6dc5 100644
--- a/frontend/app/styles/variables.scss
+++ b/frontend/app/styles/variables.scss
@@ -2,6 +2,7 @@
 $background: #F2EEE8;
 $primary: #73C1BA;
 $lightgrey: #F1EEEE;
+$grey: #CACACA;
 $indianred: #CD5C5C;
 $shadow: #E1D8C8;
 $dark-shadow: #C3B399;

From 7223fa20275d7d5efb9778e7430e0ab44cb60a1a Mon Sep 17 00:00:00 2001
From: logan <loganmerriam@gmail.com>
Date: Sat, 3 Sep 2016 21:24:40 -0400
Subject: [PATCH 2/2] Active draggable styles

---
 .../styles/components/checkin/trackables-step.scss  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/app/styles/components/checkin/trackables-step.scss b/frontend/app/styles/components/checkin/trackables-step.scss
index 78031efba..cc61ce405 100644
--- a/frontend/app/styles/components/checkin/trackables-step.scss
+++ b/frontend/app/styles/components/checkin/trackables-step.scss
@@ -2,19 +2,22 @@
   .trackable-row {
     .draggable-dropzone {
       height: 1.5em;
+      overflow: visible;
       &.activated {
         height: 5em;
-        background-color: $lightgrey;
-        border-radius: 5px;
-        border: 3px dashed $primary;
+        background-color: lighten($primary,20%);
+        border: 2px dashed $primary;
       }
       &.deactivated {
-        background-color: white;
+        background-color: transparent;
       }
     }
     .draggable-item {
       &.activated {
-        box-shadow: 0 10px 0 5px lightgrey;
+        background: white;
+        position: relative;
+        outline: 1px solid $grey;
+        box-shadow: 0 2px 10px rgba(0,0,0,0.3);
       }
     }
   }