Lots of fixes, including adding the logo

docs/client/basic/basic-content.html

@@ -4,10 +4,14 @@
   {{> basicPackages}}
 
   {{#markdown}}
-# Now read the full documentation
+# Check out the Full API Docs
 
-Congratulations, you're at the end of the Meteor basic docs. For some more
-advanced features and more detailed explanations, check out the [Full API
+Congratulations, you're at the end of the Meteor basic documentation. For more
+advanced features and more specific explanations, check out the [Full API
 Docs](#/full/).
   {{/markdown}}
+
+  <a href="http://meteor.com">
+    <img src="/logo.png" style="width: 100%; max-width: 300px" />
+  </a>
 </template>

docs/client/basic/introduction.html

@@ -2,7 +2,6 @@
 <div id="introduction">
 <!-- clicking this anchor in the left bar should scroll to top of doc,
 not here -->
-<!-- XXX by: (three headshot thumbnails w names) -->
 
 {{#markdown}}
 
@@ -29,8 +28,6 @@ endpoints in the cloud, or manage a database, or wrangle an ORM layer,
 or swap back and forth between JavaScript and Ruby, or broadcast data
 invalidations to clients.
 
-**XXX Link to gallery here - see what people have done with it!**
-
 {{> quickStart}}
 
 {{> principles}}

docs/client/docs.less

@@ -421,6 +421,29 @@ pre {
     margin: 10px 0;
 }
 
+#nav {
+    h1 {
+        margin-top: 1em;
+        font-size: 1.3em;
+
+        a {
+            text-decoration: none;
+            color: black;
+
+            &:hover {
+                background: none;
+                text-decoration: underline;
+            }
+        }
+    }
+
+    .logo {
+        width: 90%;
+        margin-bottom: 10px;
+    }
+}
+
+
 .top-bar {
     position: absolute;
     background: white;
@@ -444,6 +467,15 @@ pre {
         text-align: center;
         font-size: 25px;
         padding: 0;
+        margin-top: 8px;
+
+        .logo {
+            display: inline;
+            height: 1.1em;
+            vertical-align: baseline;
+            margin-bottom: 1px;
+            margin-right: 3px;
+        }
     }
 
     .open-sidebar {

docs/client/full-api/docs.js

@@ -1,5 +1,3 @@
-release = Meteor.release ? "0.9.4" : "(checkout)";
-
 Meteor.startup(function () {
   // mixpanel tracking
   mixpanel.track('docs');

docs/client/layout.html

@@ -31,7 +31,8 @@
   <div id="nav-inner">
     <h1>
       <a href="{{topLink}}">
-        Meteor 0.9.4
+        <img src="/logo.png" class="logo" alt="Meteor" />
+        1.0 Documentation
       </a>
     </h1>
 
@@ -49,7 +50,7 @@
   <div class="top-bar">
     <div class="open-sidebar">&#9776;</div>
     <h1> 
-      Meteor 1.0 Docs
+      <img src="/logo.png" class="logo" alt="Meteor" /> 1.0 Docs
     </h1>
   </div>
 </template>

docs/client/layout.js

@@ -1,3 +1,7 @@
+release = Meteor.release ? "0.9.4" : "(checkout)";
+
+Template.registerHelper("release", release);
+
 Template.registerHelper("fullApi", function () {
   return Session.get("fullApi");
 });
@@ -6,7 +10,7 @@ Template.basicOrFullSelect.events({
   "change .basic-or-full": function (event) {
     // XXX might not work in IE9?
     // Switch to the opposite docs type
-    navigate(!Session.get("fullApi") ? "#/full/" : "#/basic/");
+    navigate("#/" + event.target.value + "/");
   }
 });