From 12c9278d44a63d868e54b1f568fc05f59623c6d2 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 15 Jan 2016 15:05:24 -0800
Subject: [PATCH] Add SM info to splash

---
 console/src/splash.css  | 13 ++++++-
 console/src/splash.html | 82 ++++++++++++++++++++++-------------------
 2 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/console/src/splash.css b/console/src/splash.css
index d4b0eb214a..9c39c1717a 100644
--- a/console/src/splash.css
+++ b/console/src/splash.css
@@ -11,6 +11,7 @@ body {
     color: #414141;
     -webkit-touch-callout: none;
     -webkit-user-select: none;
+    cursor: default;
 }
 
 * {
@@ -74,8 +75,9 @@ p {}
 }
 
 .column.right {
+    z-index: -1;
     float: right;
-    padding-top: 67px;
+    padding-top: 16px;
     padding-left: 60px;
     position: absolute;
     right: -30px;
@@ -105,6 +107,15 @@ p {}
     /* padding-top: 34px; */
 }
 
+#main-content {
+    height: 350px;
+    border-bottom: 2px solid #F5F6F6;
+}
+
+#existing-resources-area {
+    padding-top: 20px;
+}
+
 .footer {
     padding-top: 34px;
 }
diff --git a/console/src/splash.html b/console/src/splash.html
index e50be32473..567c09f88e 100644
--- a/console/src/splash.html
+++ b/console/src/splash.html
@@ -15,47 +15,55 @@
             </div>
         </div>
         <div class="middle content">
-            <div class="column left">
-                <p>
-                    <h2>What now?</h2>
-                    The Server Console is your personal domain server in High Fidelity. It allows your local machine to manage 4000 cubic kilometers of space, ready for you to build, explore, and share however you like. To start you off, we've put a few things in your space to play around with and to learn the ropes.
-                </p>
+            <div id="main-content">
+                <div class="column left">
+                    <p>
+                        <h2>What now?</h2>
+                        The Server Console is your personal domain server in High Fidelity. It allows your local machine to manage 4000 cubic kilometers of space, ready for you to build, explore, and share however you like. To start you off, we've put a few things in your space to play around with and to learn the ropes.
+                    </p>
 
-                <p>
-                    <em>To find out more about uploading your own models and scripts, and how to add items from the Market,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/the-basics">check out 'The Basics'</a>
-                </p>
+                    <p>
+                        <em>To find out more about uploading your own models and scripts, and how to add items from the Market,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/the-basics">check out 'The Basics'</a>
+                    </p>
+                </div>
+                <div class="column center">
+                    <p>
+                        <h2>How do I use it?</h2>
+                        Console is your personal domain server in High Fidelity.
+                        It allows your local machine to manage your server by clicking on the
+                        High Fidelity icon in your ... In the menu that opens, you can:
+                    </p>
+
+                    <p>
+                        <ul>
+                            <li>go to your 'Home,' automatically launching High Fidelity</li>
+                            <li>administer basic function like starting and stopping your server</li>
+                            <li>access your server's settings and logs</li>
+                        </ul>
+                    </p>
+
+                    <p>
+                        <em>For more information on managing your server,</em> <a target="_blank" href="https://docs.highfidelity.com/">visit our documentation</a>
+                    </p>
+                </div>
+                <div class="column right">
+                    <script>
+                        var osType = require('os').type();
+                        menuBarImageURL = '';
+                        if (osType = 'Windows_NT') {
+                            menuBarImageURL = "images/console-menubar-windows-2x.png";
+                        } else {
+                            menuBarImageURL = "images/console-menubar-osx-2x.png";
+                        }
+                        document.write('<img src="' + menuBarImageURL + '" width=384px/>');
+                    </script>
+                </div>
             </div>
-            <div class="column center">
+            <div id="existing-resources-area">
                 <p>
-                    <h2>How do I use it?</h2>
-                    Console is your personal domain server in High Fidelity.
-                    It allows your local machine to manage your server by clicking on the
-                    High Fidelity icon in your ... In the menu that opens, you can:
+                  <h2>Your existing Stack Manager content is safe.</h2>
+                    Server Console comes with demo content but does not overwrite your data. To import content you previously managed with Stack Manager, <a target="_blank" href="https://docs.highfidelity.com/docs/the-basics">see our guide to migrating content</a>.
                 </p>
-
-                <p>
-                    <ul>
-                        <li>go to your 'Home,' automatically launching High Fidelity</li>
-                        <li>administer basic function like starting and stopping your server</li>
-                        <li>access your server's settings and logs</li>
-                    </ul>
-                </p>
-
-                <p>
-                    <em>For more information on managing your server,</em> <a target="_blank" href="https://docs.highfidelity.com/">visit our documentation</a>
-                </p>
-            </div>
-            <div class="column right">
-                <script>
-                    var osType = require('os').type();
-                    menuBarImageURL = '';
-                    if (osType = 'Windows_NT') {
-                        menuBarImageURL = "images/console-menubar-osx.png";
-                    } else {
-                        menuBarImageURL = "images/console-menubar-osx.png";
-                    }
-                    document.write('<img src="' + menuBarImageURL + '" width=320px/>');
-                </script>
             </div>
         </div>
         <div class="bottom">