Merge branch 'master' of github.com:ionic-team/ionic-docs

# Conflicts:
#	src/pages/building/android.md

Author: rdlabo

scripts/build-pages/page-types/native.ts

@@ -19,7 +19,7 @@ async function getNativePages(): Promise<Page[]> {
     return {
       title,
       path,
-      body: description,
+      body: renderMarkdown(description),
       repo,
       platforms,
       usage: usage ? renderMarkdown(usage) : null,

src/components.d.ts

@@ -140,9 +140,11 @@ export namespace Components {
 
   interface ContributorList {
     'contributors': string[];
+    'link': any;
   }
   interface ContributorListAttributes extends StencilHTMLAttributes {
     'contributors'?: string[];
+    'link'?: any;
   }
 
   interface DocsDemo {

src/components/button/button.css

@@ -4,6 +4,7 @@ docs-button {
   color: var(--accent-color);
   display: inline-block;
   font-weight: 600;
+  white-space: nowrap;
 }
 
 docs-button a,

src/components/contributor-list/contributor-list.tsx

@@ -6,6 +6,7 @@ import { Component, Prop } from '@stencil/core';
 })
 export class ContributorList {
   @Prop() contributors: string[] = [];
+  @Prop() link = (contributor: string) => `https://github.com/${contributor}`;
 
   render() {
     if (this.contributors.length === 0) {
@@ -16,7 +17,7 @@ export class ContributorList {
       <ul>
         {this.contributors.reverse().map(contributor => (
           <li>
-            <a target="_blank" href={`https://github.com/${contributor}`}>
+            <a target="_blank" href={this.link(contributor)}>
               <img src={`https://github.com/${contributor}.png?size=90`} title={`Contributor ${contributor}`}/>
             </a>
           </li>

src/components/dropdown/dropdown.css

@@ -8,6 +8,7 @@
   background: none;
   border: none;
   color: inherit;
+  font-family: inherit;
   font-size: inherit;
   font-weight: inherit;
   line-height: inherit;

src/components/header/header.css

@@ -17,13 +17,21 @@ docs-header {
   z-index: 2;
 }
 
-.Layout:not(.is-collapsed) docs-header.hidden {
-  transform: translateY(-100%);
+@media (min-width: 768px) {
+  .Layout:not(.is-menu-toggled) docs-header.hidden {
+    transform: translateY(-100%);
+  }
+}
+
+@media (max-width: 768px) {
+  .Layout.is-menu-toggled docs-header.hidden {
+    transform: translateY(-100%);
+  }
 }
 
 docs-header header {
   height: var(--header-height);
-  padding: 0 1.5rem;
+  padding: 0 1.4rem 0 0.8rem;
 }
 
 docs-header header,

src/components/menu/menu.css

@@ -19,7 +19,7 @@ docs-menu > header {
   display: flex;
   flex: none;
   height: var(--header-height);
-  padding: 0 1.5rem;
+  padding: 0 1.4rem 0 0.8rem;
   user-select: none;
 }
 

src/components/nav/nav.css

@@ -74,3 +74,15 @@ docs-nav a {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+@media (max-width: 768px), (pointer: coarse) {
+  .Nav {
+    --item-spacing: 12px;
+    font-size: 15px;
+  }
+
+  .Nav-subnav {
+    --item-spacing: 6px;
+    font-size: 14px;
+  }
+}

src/components/page-footer/page-footer.tsx

@@ -31,9 +31,10 @@ export class DocsPageFooter {
     const editHref = `https://github.com/ionic-team/ionic-docs/edit/master/${path}`;
     const updatedHref = `https://github.com/ionic-team/ionic-docs/commits/master/${path}`;
     const updatedText = new Date(lastUpdated).toISOString().slice(0, 10);
+    const contributorHref = (contributor) => `${updatedHref}?author=${contributor}`;
 
     return [
-      contributors.length ? <contributor-list contributors={contributors}/> : null,
+      contributors.length ? <contributor-list contributors={contributors} link={contributorHref}/> : null,
       <docs-button round href={editHref}>Edit this page <ForwardArrow/></docs-button>,
       <a class="last-updated" href={updatedHref}>Updated {updatedText}</a>
     ];

src/components/page/page.tsx

@@ -48,7 +48,7 @@ export class DocsPage {
 
   @Watch('page')
   setScrollPosition() {
-    if (this.isServer) {
+    if (this.isServer || this.history.location.hash) {
       return;
     }