From 318711571a4af7f3219184e8c211caafa5792266 Mon Sep 17 00:00:00 2001
From: "huanqing.shao" <shaohq@foxmail.com>
Date: Sun, 13 Oct 2019 21:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AdSensePageBottomInline.vue    | 12 ++++++----
 .vuepress/components/AdSenseRightSide.vue     |  2 +-
 .vuepress/components/AdSenseTitle.vue         | 23 ++++++++-----------
 .vuepress/theme/components/Page.vue           | 11 +++++----
 .vuepress/theme/layouts/LearningLayout.vue    |  1 +
 support/change-log/change-log-on-the-way.md   | 13 ++++++++++-
 support/change-log/v1.0.x.md                  | 12 ++++++++++
 7 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/.vuepress/components/AdSensePageBottomInline.vue b/.vuepress/components/AdSensePageBottomInline.vue
index 2d08f54..e66095e 100644
--- a/.vuepress/components/AdSensePageBottomInline.vue
+++ b/.vuepress/components/AdSensePageBottomInline.vue
@@ -3,9 +3,11 @@
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
     <!-- PageBottomInline -->
     <ins class="adsbygoogle"
-        style="display:inline-block;min-width:200px;max-width:1000px;width:100%;height:160px"
+        style="display:block"
         data-ad-client="ca-pub-3313149841665250"
-        data-ad-slot="8977269331"></ins>
+        data-ad-slot="8977269331"
+        data-ad-format="auto"
+        data-full-width-responsive="true"></ins>
     <script>
         (adsbygoogle = window.adsbygoogle || []).push({});
     </script>
@@ -20,8 +22,8 @@ export default {
 
 <style scoped>
 .adsense-page-bottom-inline {
-  border: 1px solid #d7dae2;
-  max-height: 160px;
-  overflow: hidden;
+  /* border: 1px solid #d7dae2; */
+  /* max-height: 160px;
+  overflow: hidden; */
 }
 </style>
diff --git a/.vuepress/components/AdSenseRightSide.vue b/.vuepress/components/AdSenseRightSide.vue
index f400bad..619e6d8 100644
--- a/.vuepress/components/AdSenseRightSide.vue
+++ b/.vuepress/components/AdSenseRightSide.vue
@@ -33,7 +33,7 @@ export default {
   position: fixed;
   bottom: 80px;
   right: 10px;
-  background-color: grey;
+  /* background-color: grey; */
 }
 
 </style>
diff --git a/.vuepress/components/AdSenseTitle.vue b/.vuepress/components/AdSenseTitle.vue
index db6b988..d69f65c 100644
--- a/.vuepress/components/AdSenseTitle.vue
+++ b/.vuepress/components/AdSenseTitle.vue
@@ -5,19 +5,9 @@
     </p>
     <slot></slot>
     <div class="adsense-page-top">
-      <!-- <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-      <ins class="adsbygoogle"
-          style="display:block; text-align:center;"
-          data-ad-layout="in-article"
-          data-ad-format="fluid"
-          data-ad-client="ca-pub-3313149841665250"
-          data-ad-slot="6968314981"></ins>
-      <script>
-          (adsbygoogle = window.adsbygoogle || []).push({});
-      </script> -->
       <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
       <ins class="adsbygoogle"
-          style="display:block"
+          style="display:block;"
           data-ad-format="fluid"
           data-ad-layout-key="-h2+d+5c-9-3e"
           data-ad-client="ca-pub-3313149841665250"
@@ -25,6 +15,14 @@
       <script>
           (adsbygoogle = window.adsbygoogle || []).push({});
       </script>
+      <!-- <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+      <ins class="adsbygoogle"
+          style="display:inline-block;width:320px;height:50px"
+          data-ad-client="ca-pub-3313149841665250"
+          data-ad-slot="7680268021"></ins>
+      <script>
+          (adsbygoogle = window.adsbygoogle || []).push({});
+      </script> -->
     </div>
   </div>
 </template>
@@ -38,10 +36,9 @@ export default {
 <style scoped>
 .adsense-page-top {
   /* background-color: green; */
-  cursor: pointer;
   padding-right: 2px;
   border: 1px solid #d7dae2;
-  height: 124px !important;
+  max-height: 120px !important;
   overflow: hidden;
 }
 </style>
diff --git a/.vuepress/theme/components/Page.vue b/.vuepress/theme/components/Page.vue
index c47bbe2..c5b5441 100644
--- a/.vuepress/theme/components/Page.vue
+++ b/.vuepress/theme/components/Page.vue
@@ -8,9 +8,7 @@
 
     <Content class="theme-default-content" style="padding-top: 0; margin-top: 0; padding-bottom: 1rem;"/>
 
-    <div class="page-nav" style="max-width: 1000px; padding-top:0;">
-      <AdSensePageBottomInline/>
-    </div>
+    
     <!-- <el-divider>加入 Kuboard 社群</el-divider> -->
 
     <div style="margin: auto; width: 182px;">
@@ -22,12 +20,15 @@
       </p>
     </div>
 
-    <div style="text-align: center; margin-bottom: 10px;" v-if="$page.path.indexOf('/learning/') === 0">
+    <div class="page-nav" style="max-width: 1000px; padding-top:0;">
+      <AdSensePageBottomInline/>
+    </div>
+    <!-- <div style="text-align: center; margin-bottom: 10px;" v-if="$page.path.indexOf('/learning/') === 0">
       <a href="https://github.com/eip-work/kuboard-press" target="_blank">如果您觉得 Kubernetes教程 有帮到您，点击此处，给个 Github Star，谢谢！</a>
     </div>
     <div style="text-align: center; margin-bottom: 10px;" v-else>
       <a href="https://github.com/eip-work/kuboard-press" target="_blank">如果您觉得这篇文档有帮到您，点击此处，给个 Github Star，谢谢！</a>
-    </div>
+    </div> -->
     <!-- <Valine></Valine> -->
     <footer class="page-edit" style="max-width: 1000px;">
       <div
diff --git a/.vuepress/theme/layouts/LearningLayout.vue b/.vuepress/theme/layouts/LearningLayout.vue
index fd6232f..7f219af 100644
--- a/.vuepress/theme/layouts/LearningLayout.vue
+++ b/.vuepress/theme/layouts/LearningLayout.vue
@@ -34,6 +34,7 @@
       <div class="tip custom-block" style="padding: 10px 20px; margin-top: 0;">
         <div style="display: inline-block; vertical-align: top;">
           <li><span style="color: red; font-weight: 500;">免费</span> Kubernetes 教程，绝不降低品质</li>
+          <li><a href="https://github.com/eip-work/kuboard-press" target="_blank" @click="$sendGaEvent('GithubStar', '页头求GitHubStar', 'GitHubStar: ' + $page.path)">给一个 Github Start</a> 是对作者最好的鼓励</li>
           <!-- <li><Qq></Qq> <span style="color: red; font-weight: 500;">在线答疑</span>，也可以扫描本文末尾的二维码加群</li> -->
         </div>
       </div>
diff --git a/support/change-log/change-log-on-the-way.md b/support/change-log/change-log-on-the-way.md
index 87e96c7..27f8e49 100644
--- a/support/change-log/change-log-on-the-way.md
+++ b/support/change-log/change-log-on-the-way.md
@@ -1,7 +1,19 @@
 Kuboard v1.0.x 的更新说明
 
 
+## v1.0.4-beta.3
 
+**发布日期**
+
+2019年10月13日
+
+**新特性**
+
+**优化**
+
+* 工作负载的名称前缀为可选添加
+* 存储类列表为空时，提示当前没有存储类
+* 集群中事件过多时，名称空间页面渲染时间过长
 
 **BUG 修复**
 
@@ -12,7 +24,6 @@ Kuboard v1.0.x 的更新说明
 * HostAliases
 
 * 容器组列表，筛选结果为空时，提示筛选 “其他”
-* 存储类列表为空时，提示当前无内容，请创建
 
 * https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
 
diff --git a/support/change-log/v1.0.x.md b/support/change-log/v1.0.x.md
index b5ad19f..d7d9622 100644
--- a/support/change-log/v1.0.x.md
+++ b/support/change-log/v1.0.x.md
@@ -9,6 +9,18 @@ description: 本文描述了Kuboard_v1.0.x的版本变更说明
 
 Kuboard v1.0.x 的更新说明
 
+## v1.0.4-beta.3
+
+**发布日期**
+
+2019年10月13日
+
+**优化**
+
+* 工作负载的名称前缀为可选添加
+* 存储类列表为空时，提示当前没有存储类
+* 集群中事件过多时，名称空间页面渲染时间过长
+
 ## v1.0.4-beta.2
 
 **发布日期**