From 20c7970250681bf99cd68d618f11083bf1acda04 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@ajax.org>
Date: Tue, 1 Mar 2016 23:22:07 +0000
Subject: [PATCH] Add guided tour

---
 package.json                                      | 3 ++-
 plugins/c9.ide.panels/skin.xml                    | 8 ++++----
 plugins/c9.ide.server/views/flat-load-screen.html | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e8c92084..b3507837 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,7 @@
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#0bd010d3dc",
-        "c9.ide.welcome": "#5b86c44e92"
+        "c9.ide.welcome": "#5b86c44e92",
+        "c9.ide.guide": "#5d5a7eb810"
     }
 }
\ No newline at end of file
diff --git a/plugins/c9.ide.panels/skin.xml b/plugins/c9.ide.panels/skin.xml
index 6289b7a2..33e4ba7c 100644
--- a/plugins/c9.ide.panels/skin.xml
+++ b/plugins/c9.ide.panels/skin.xml
@@ -20,7 +20,7 @@
                 z-index : 10000;
             }
             
-            .right .panelsbar{
+            .basic.right .panelsbar{
                 border-left : 0;
                 border-top : 0;
                 border-bottom : 1px solid @border-highlight;
@@ -31,14 +31,14 @@
                 top: 0;
             }
             
-            .left {
+            .basic.left {
                 box-shadow: 1px 0 0 @border-highlight;
             }
-            .right {
+            .basic.right {
                 box-shadow: 1px 0 0 @border-highlight inset;
             }
             
-            .left, .right{
+            .basic.left, .basic.right{
                 overflow : hidden;
                 z-index : 100000;
             }
diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html
index b6c5c8c8..964404a4 100644
--- a/plugins/c9.ide.server/views/flat-load-screen.html
+++ b/plugins/c9.ide.server/views/flat-load-screen.html
@@ -23,7 +23,7 @@
         "Each workspace is its own Ubuntu virtual machine.",
         "Run 'dpkg -l' in the terminal to see all packages installed.",
         "Remember to run your code on port 8080, 8081, or 8082.",
-        "Use the Collaborate panel when collaborationg for optimal teamwork.",
+        "Use the Collaborate panel when working together.",
         "It's better up here.",
         "Happy coding!",
         "Everything as you left it.",