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

# Conflicts: # src/components/page/templates/native.tsx # src/pages/installation/cli.md # src/pages/theming/color-generator.md
ionic-jp · Jul 1, 2019 · 1d7618d · 1d7618d
2 parents 38223d1 + a9f7c68
commit 1d7618d
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 16 deletions.
diff --git a/scripts/build-pages/page-types/api.ts b/scripts/build-pages/page-types/api.ts
@@ -23,7 +23,7 @@ async function getAPIPages(): Promise<Page[]> {
     return {
       title,
       path,
-      demoUrl,
+      ...demoUrl,
       body: markdownRenderer(readme, path),
       usage: renderUsage(usage, path),
       props: renderDocsKey(props, path),
@@ -51,6 +51,9 @@ const getDemoUrl = async (component) => {
   const demoPath = `api/${component.tag.slice(4)}/index.html`;
   const hasDemo = await fs.pathExists(join(DEMOS_PATH, demoPath));
   if (hasDemo) {
-    return `/docs/demos/${demoPath}`;
+    return {
+      demoUrl: `/docs/demos/${demoPath}`,
+      demoSourceUrl: `https://github.com/ionic-team/ionic-docs/tree/master/src/demos/${demoPath}`
+    };
   }
 };
diff --git a/src/assets/img/appflow/ss-profiles-ios-app-id.png b/src/assets/img/appflow/ss-profiles-ios-app-id.png
diff --git a/src/assets/img/appflow/ss-profiles-ios-cert-1.png b/src/assets/img/appflow/ss-profiles-ios-cert-1.png
diff --git a/src/assets/img/appflow/ss-profiles-ios-device-register-1.png b/src/assets/img/appflow/ss-profiles-ios-device-register-1.png
diff --git a/src/assets/img/appflow/ss-profiles-ios-pp-1.png b/src/assets/img/appflow/ss-profiles-ios-pp-1.png
diff --git a/src/components/demo/demo.css b/src/components/demo/demo.css
@@ -65,10 +65,14 @@
 }
 
 .docs-demo-source {
-  position: absolute;
-  top: 1rem;
-  right: 44px;
-  font-size: 24px;
+  align-items: center;
+  display: flex;
+  font-size: 13px;
+  justify-content: center;
+}
+
+.docs-demo-source > ion-icon {
+  margin-right: 5px;
 }
 
 @media (max-width: 1160px) {

diff --git a/src/components/demo/demo.tsx b/src/components/demo/demo.tsx
@@ -51,7 +51,7 @@ export class DocsDemo {
          class="docs-demo-source"
          target="_blank"
          title="Demo Source">
-        <ion-icon name="code"></ion-icon>
+        <ion-icon name="open"/> View Source
       </a> : null;
   }
 
@@ -84,9 +84,9 @@ export class DocsDemo {
     }
 
     return [
-      this.renderSourceLink(),
       this.renderModeToggle(),
-      this.renderDevice()
+      this.renderDevice(),
+      this.renderSourceLink()
     ];
   }
 }
diff --git a/src/components/page/page.tsx b/src/components/page/page.tsx
@@ -134,7 +134,7 @@ export class DocsPage {
 
     if (hasDemo) {
       content.push(
-        <docs-demo url={page.demoUrl}/>
+        <docs-demo url={page.demoUrl} source={page.demoSourceUrl}/>
       );
     }
 

diff --git a/src/pages/faq/glossary.md b/src/pages/faq/glossary.md
@@ -106,7 +106,7 @@ nextUrl: '/docs/faq/build'
 
   <section id="karma">
     <a href="#karma"><h3>Karma</h3></a>
-    <p><a href="https://karma-runner.github.io/0.13/index.html" target="_blank">Karma</a> is a test runner that will run an app's test inside a real browser. It executes test cases, written in any testing framework, in a real browser. Karma was originally written for use with Angular 1.</p>
+    <p><a href="https://karma-runner.github.io/latest/index.html" target="_blank">Karma</a> is a test runner that will run an app's test inside a real browser. It executes test cases, written in any testing framework, in a real browser. Karma was originally written for use with Angular 1.</p>
   </section>
 
   <section id="module">

diff --git a/src/pages/installation/cli.md b/src/pages/installation/cli.md
@@ -20,9 +20,7 @@ Ionicアプリは、主にIonic CLI（[command-line-interface](/docs/faq/glossar
 $ npm install -g ionic
 ```
 
-<blockquote>
-  <p>`-g`のオプションは、グローバルインストールを意味します。Windowの場合は、コマンドプロンプトで実行することをお勧めします。Mac/Linuxの場合は、`sudo` コマンドをつけて実行してください。</p>
-</blockquote>
+> The `-g` option means _install globally_. When packages are installed globally, permission errors can occur. Consider [setting up npm](https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally) to operate globally without elevated permissions. Running the command prompt as an Admin (or using `sudo` for Mac & Linux) with npm is not recommended.
 
 ## アプリケーションの起動
 

diff --git a/src/pages/publishing/play-store.md b/src/pages/publishing/play-store.md
@@ -22,7 +22,7 @@ An Ionic app will have preset default values in this file but this can be change
 ## APKへの署名
 
 First, the unsigned APK must be signed. If a signing key has already been generated, skip these steps and use that one instead.
-Generate a private key using the keytool command that comes with the the Android SDK:
+Generate a private key using the keytool command that comes with the Android SDK:
 
 ```shell
 $ keytool -genkey -v -keystore my-release-key.keystore -alias alias_name -keyalg RSA -keysize 2048 -validity 10000

diff --git a/src/pages/theming/color-generator.md b/src/pages/theming/color-generator.md
@@ -12,6 +12,7 @@ contributors:
 
 # カラージェネレーター
 
-アプリのUI用にカスタムカラーパレットが利用できます。16進数の色番号を更新し、右側にあるデモアプリを確認して、それでよければ生成されたコードをコピーして直接Ionicプロジェクトに貼り付けます。
+
+アプリのUI用にカスタムカラーパレットを作成します。16進数の色番号を更新し、右側のデモアプリを確認して確認し、生成されたコードをコピーしてIonicプロジェクトに直接貼り付けます（プロジェクトのテーマフォルダーにある `variables.scss` ファイルなど）。
 
 <color-generator mode="md" no-prerender></color-generator>