diff --git a/docs/client/basic/basic-content.html b/docs/client/basic/basic-content.html
index 67c95035ac..f9d97f0914 100644
--- a/docs/client/basic/basic-content.html
+++ b/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}}
+
+
+
+
diff --git a/docs/client/basic/introduction.html b/docs/client/basic/introduction.html
index 10251fa091..77782a0265 100644
--- a/docs/client/basic/introduction.html
+++ b/docs/client/basic/introduction.html
@@ -2,7 +2,6 @@
-
{{#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}}
diff --git a/docs/client/docs.less b/docs/client/docs.less
index bd12155ae6..14bdb8489e 100644
--- a/docs/client/docs.less
+++ b/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 {
diff --git a/docs/client/full-api/docs.js b/docs/client/full-api/docs.js
index 4a5076b335..e3cb001b3a 100644
--- a/docs/client/full-api/docs.js
+++ b/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');
diff --git a/docs/client/layout.html b/docs/client/layout.html
index 442303b433..0633b9e5d3 100644
--- a/docs/client/layout.html
+++ b/docs/client/layout.html
@@ -31,7 +31,8 @@
@@ -49,7 +50,7 @@
- Meteor 1.0 Docs
+
1.0 Docs
diff --git a/docs/client/layout.js b/docs/client/layout.js
index 464783f276..cb776e4f91 100644
--- a/docs/client/layout.js
+++ b/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 + "/");
}
});
diff --git a/docs/public/logo.png b/docs/public/logo.png
new file mode 100644
index 0000000000..0debca2f1b
Binary files /dev/null and b/docs/public/logo.png differ