From e07f92c4eefb8c4338cb85de690611871b10c0ba Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Fri, 26 Jul 2013 14:32:36 -0700
Subject: [PATCH] Pick colors for the cursors and volume bars

---
 .../stylesheets/collaboration.less            |  7 ---
 themes/atom-dark-ui/collaboration.less        | 45 +++++++++++++------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/packages/collaboration/stylesheets/collaboration.less b/src/packages/collaboration/stylesheets/collaboration.less
index 8b61dc441..e8c9d41a1 100644
--- a/src/packages/collaboration/stylesheets/collaboration.less
+++ b/src/packages/collaboration/stylesheets/collaboration.less
@@ -34,13 +34,6 @@
   }
 }
 
-.site-1, .site-2 {
-  background-color: @user-color;
-}
-.site-1.lighter, .site-2.lighter {
-  background-color: lighten(@user-color, 30%);
-}
-
 .collaboration-participant{
   bottom: 36px;
   right: 10px;
diff --git a/themes/atom-dark-ui/collaboration.less b/themes/atom-dark-ui/collaboration.less
index 810ff62b7..a63464a62 100644
--- a/themes/atom-dark-ui/collaboration.less
+++ b/themes/atom-dark-ui/collaboration.less
@@ -1,4 +1,32 @@
-@runningColor: #99CC99;
+@guest-color: #96cbfe;
+@running-color: #99cc99;
+
+@site-1-color: #4dd157;
+@site-2-color: #3facc1;
+@site-3-color: #db2ff4;
+@site-4-color: #f4541e;
+
+.site-colors(@site, @color) {
+  .site-@{site} {
+    background-color: @color;
+    &.lighter {
+      background-color: lighten(@color, 30%);
+    }
+  }
+  .editor .selection.site-@{site} .region {
+    background-color: darken(@color, 30%);
+  }
+}
+
+.site-colors(1, @site-1-color);
+.site-colors(2, @site-2-color);
+.site-colors(3, @site-3-color);
+.site-colors(4, @site-4-color);
+
+.site-colors(5, @site-1-color);
+.site-colors(6, @site-2-color);
+.site-colors(7, @site-3-color);
+.site-colors(8, @site-4-color);
 
 .collaboration-status{
 
@@ -7,18 +35,7 @@
   }
 
   .running {
-    color: @runningColor;
-
-    &:hover {
-      color: lighten(@runningColor, 15%);
-    }
+    color: @running-color;
+    &:hover { color: lighten(@running-color, 15%); }
   }
 }
-
-.collaboration {
-  background: #1b1c1e;
-  box-shadow:
-    1px 0 0 #131516,
-    inset -1px 0 0 rgba(255, 255, 255, 0.02),
-    1px 0 3px rgba(0, 0, 0, 0.2);
-}