Merge branch 'master' of github.com:angular/angular.io

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

public/docs/_examples/architecture/dart/.docsync.json

@@ -0,0 +1,4 @@
+{
+  "name": "Architecture overview",
+  "docHref": "https://angular.io/docs/dart/latest/guide/architecture.html"
+}

public/docs/_examples/dependency-injection/dart/.docsync.json

@@ -0,0 +1,4 @@
+{
+  "name": "Dependency injection",
+  "docHref": "https://angular.io/docs/dart/latest/guide/dependency-injection.html"
+}

public/docs/_examples/displaying-data/dart/.docsync.json

@@ -0,0 +1,4 @@
+{
+  "name": "Displaying data",
+  "docHref": "https://angular.io/docs/dart/latest/guide/displaying-data.html"
+}

public/docs/_examples/forms/dart/.docsync.json

@@ -0,0 +1,4 @@
+{
+  "name": "Forms",
+  "docHref": "https://angular.io/docs/dart/latest/guide/forms.html"
+}

public/docs/_examples/user-input/dart/.docsync.json

@@ -0,0 +1,4 @@
+{
+  "name": "User input",
+  "docHref": "https://angular.io/docs/dart/latest/guide/user-input.html"
+}

public/resources/css/module/_api.scss

@@ -159,9 +159,9 @@ input.api-filter {
     font-size: 14px;
     color: #1a2326;
 
-    // Override highlight.js
+    // the last .pln (white space) creates additional spacing between sections of the api doc. Remove it.
     &.no-pln {
-      .pln {
+      .pln:last-child {
         display: none;
       }
     }
@@ -169,6 +169,15 @@ input.api-filter {
 }
 
 @media screen and (max-width: 600px) {
+  .docs-content {
+    // Overrides display flex from angular material.
+    // This was added because Safari doesn't play nice with layout="column".
+    // Look of API doc in Chrome and Firefox remains the same, and is fixed for Safari.
+    .layout-xs-column {
+      display: block !important;
+    }
+  }
+
   code {
     font-size: 12px;
   }