From 383275cfcb67b8908ad33943b96f20ed1c09c529 Mon Sep 17 00:00:00 2001
From: Tommy Chen <tommy351@gmail.com>
Date: Wed, 2 Aug 2017 02:27:41 +0800
Subject: [PATCH] Modify Carbon Ads placement

---
 themes/navy/layout/page.swig                  |  1 +
 themes/navy/layout/partial/carbonads.swig     |  1 +
 themes/navy/layout/partial/sidebar.swig       |  1 -
 .../navy/source/css/_partial/carbonads.styl   | 32 +++++++++++++++++
 themes/navy/source/css/_partial/sidebar.styl  | 35 +------------------
 themes/navy/source/css/navy.styl              |  3 +-
 6 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 themes/navy/layout/partial/carbonads.swig
 create mode 100644 themes/navy/source/css/_partial/carbonads.styl

diff --git a/themes/navy/layout/page.swig b/themes/navy/layout/page.swig
index 12c887d6d8..e7ec4fb4d8 100644
--- a/themes/navy/layout/page.swig
+++ b/themes/navy/layout/page.swig
@@ -21,6 +21,7 @@
           </div>
           <aside id="article-toc" role="navigation">
             <div id="article-toc-inner">
+              {{ partial('partial/carbonads') }}
               <strong class="sidebar-title">{{ __('page.contents') }}</strong>
               {{ toc(page.content, {list_number: false}) }}
               <a href="#" id="article-toc-top">{{ __('page.back_to_top') }}</a>
diff --git a/themes/navy/layout/partial/carbonads.swig b/themes/navy/layout/partial/carbonads.swig
new file mode 100644
index 0000000000..6495ef5e7b
--- /dev/null
+++ b/themes/navy/layout/partial/carbonads.swig
@@ -0,0 +1 @@
+<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=carbonadsnet" id="_carbonads_js"></script>
\ No newline at end of file
diff --git a/themes/navy/layout/partial/sidebar.swig b/themes/navy/layout/partial/sidebar.swig
index 709280069b..a46f4afba3 100644
--- a/themes/navy/layout/partial/sidebar.swig
+++ b/themes/navy/layout/partial/sidebar.swig
@@ -1,6 +1,5 @@
 <aside id="sidebar" role="navigation">
   <div class="inner">
     {{ doc_sidebar('sidebar') }}
-    <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=carbonadsnet" id="_carbonads_js"></script>
   </div>
 </aside>
\ No newline at end of file
diff --git a/themes/navy/source/css/_partial/carbonads.styl b/themes/navy/source/css/_partial/carbonads.styl
new file mode 100644
index 0000000000..503a2da541
--- /dev/null
+++ b/themes/navy/source/css/_partial/carbonads.styl
@@ -0,0 +1,32 @@
+#carbonads
+  display: block
+  overflow: hidden
+  margin-top: 40px
+  max-width: 130px
+  text-align: left
+  font-size: 13px
+  line-height: 1.5
+  a
+    color: inherit
+    text-decoration: none
+  &:hover
+    color: inherit
+  span
+    display: block
+    overflow: hidden
+
+.carbon-img
+  display: block
+  margin: 0 auto 8px
+  line-height: 1
+
+.carbon-text
+  display: block
+  margin-bottom: 8px
+
+.carbon-poweredby
+  display: block
+  text-transform: uppercase
+  letter-spacing: 1px
+  font-size: 9px
+  line-height: 1
\ No newline at end of file
diff --git a/themes/navy/source/css/_partial/sidebar.styl b/themes/navy/source/css/_partial/sidebar.styl
index 5a74886234..d1aa8db874 100644
--- a/themes/navy/source/css/_partial/sidebar.styl
+++ b/themes/navy/source/css/_partial/sidebar.styl
@@ -33,37 +33,4 @@
   &.current
     color: color-link
   &:hover
-    color: color-link-hover
-
-#carbonads
-  display: block
-  overflow: hidden
-  margin-top: 40px
-  max-width: 130px
-  text-align: left
-  font-size: 13px
-  line-height: 1.5
-  a
-    color: inherit
-    text-decoration: none
-  &:hover
-    color: inherit
-  span
-    display: block
-    overflow: hidden
-
-.carbon-img
-  display: block
-  margin: 0 auto 8px
-  line-height: 1
-
-.carbon-text
-  display: block
-  margin-bottom: 8px
-
-.carbon-poweredby
-  display: block
-  text-transform: uppercase
-  letter-spacing: 1px
-  font-size: 9px
-  line-height: 1
\ No newline at end of file
+    color: color-link-hover
\ No newline at end of file
diff --git a/themes/navy/source/css/navy.styl b/themes/navy/source/css/navy.styl
index ea1e2f4a76..c4b520c45f 100644
--- a/themes/navy/source/css/navy.styl
+++ b/themes/navy/source/css/navy.styl
@@ -11,4 +11,5 @@
 @import "_partial/archive"
 @import "_partial/mobile_nav"
 @import "_partial/footer"
-@import "_partial/highlight"
\ No newline at end of file
+@import "_partial/highlight"
+@import "_partial/carbonads"
\ No newline at end of file