From 46dd7c736d0efb268eca03167b474f06db5f6845 Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Mon, 27 Oct 2014 10:17:08 -0700 Subject: [PATCH] Lots of fixes, including adding the logo --- docs/client/basic/basic-content.html | 10 ++++++--- docs/client/basic/introduction.html | 3 --- docs/client/docs.less | 32 +++++++++++++++++++++++++++ docs/client/full-api/docs.js | 2 -- docs/client/layout.html | 5 +++-- docs/client/layout.js | 6 ++++- docs/public/logo.png | Bin 0 -> 6160 bytes 7 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 docs/public/logo.png 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 @@