2 files changed, 26 insertions, 5 deletions
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index dc75d5cb..f5f22ee8 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -240,7 +240,25 @@ Doc.prototype = {
         });
     });
     text = parts.join('');
-    text = markdown.makeHtml(text);
+
+    function prepareClassName(text) {
+      return text.toLowerCase().replace(/[_\W]+/g, '-');
+    };
+
+    var pageClassName, suffix = '-page';
+    if(this.name) {
+      var split = this.name.match(/^\s*(.+?)\s*:\s*(.+)/);
+      if(split && split.length > 1) {
+        var before = prepareClassName(split[1]);
+        var after = prepareClassName(split[2]);
+        pageClassName = before + suffix + ' ' + before + '-' + after + suffix;
+      }
+    }
+    pageClassName = pageClassName || prepareClassName(this.name || 'docs') + suffix;
+
+    text = '<div class="' + pageClassName + '">' + 
+             markdown.makeHtml(text) +
+           '</div>';
     text = text.replace(/(?:<p>)?(REPLACEME\d+)(?:<\/p>)?/g, function(_, id) {
       return placeholderMap[id];
     });
diff --git a/docs/src/templates/css/docs.css b/docs/src/templates/css/docs.css
index 01aa2376..a34a197f 100644
--- a/docs/src/templates/css/docs.css
+++ b/docs/src/templates/css/docs.css
@@ -293,13 +293,16 @@ ul.events > li > h3 {
   z-index:1031;
 }
 
+.tutorial-index-page,
+.tutorial-the-end-page {
+  padding-top:50px;
+}
+
 .tutorial-page {
   position:relative;
 }
-.tutorial-page-no-nav {
-  padding-top:50px;
-}
-.tutorial-page-no-nav .improve-docs {
+
+.tutorial-page .improve-docs {
   position:absolute;
   top:0;
   right:0;