From fa1c9643bd1af8dbab1de1da76629b52abfe1711 Mon Sep 17 00:00:00 2001
From: Rieko Tsunoda <r.tsunoda@cns.s.u-tokyo.ac.jp>
Date: Thu, 18 Jul 2019 21:19:00 +0900
Subject: [PATCH] [fix] sidebar topics can be shown, [add]sidebar css file #11

---
 themes/cns_hp_theme/layouts/index.html        |  6 ++--
 .../layouts/partials/sidebar.html             | 16 ++++++----
 themes/cns_hp_theme/static/css/sidebar.css    | 31 +++++++++++++++++++
 .../static/css/split_container.css            | 31 -------------------
 4 files changed, 44 insertions(+), 40 deletions(-)
 create mode 100644 themes/cns_hp_theme/static/css/sidebar.css

diff --git a/themes/cns_hp_theme/layouts/index.html b/themes/cns_hp_theme/layouts/index.html
index ee394f0..4e01b97 100644
--- a/themes/cns_hp_theme/layouts/index.html
+++ b/themes/cns_hp_theme/layouts/index.html
@@ -62,12 +62,12 @@
       <a href="#">次へ</a>
     </nav>
 
-  </div>
+  </div><!--top menu-->
 
 
-  {{ partial "sidebar.html" }}
+  {{ partial "sidebar.html" .}}
 
-  </div>
+</div> <!--container-->
 
 {{ partial "footer.html" . }}
 
diff --git a/themes/cns_hp_theme/layouts/partials/sidebar.html b/themes/cns_hp_theme/layouts/partials/sidebar.html
index 176f89a..95f79ed 100644
--- a/themes/cns_hp_theme/layouts/partials/sidebar.html
+++ b/themes/cns_hp_theme/layouts/partials/sidebar.html
@@ -1,7 +1,10 @@
+<!--This page: Side bar of container -->
+<link rel="stylesheet" href="{{ .Site.BaseURL }}css/sideba.css">
+
 <div class="sidebar">
-  <div class="topics">
-    This is the sidebar__item
 
+<!-- Topics (future :from Event pages)-->
+  <div class="topics">
   {{/* <h3>セクションを持たない記事ページ一覧（タイトル順）</h3>
       <ol>
         {{ range (where $.Site.RegularPages "Section" "").ByTitle }}
@@ -10,7 +13,7 @@
         {{ end }}
       </ol>
   */}}
-
+<article>
   <h3>Featureされたサイト内ページだけの配列</h3>
   <ol>
     {{ range .Pages }}
@@ -24,12 +27,13 @@
         {{ end }}
       {{ end }}
     {{ end }}
-  </ol>
-  </div>
+  </ol> 
+ </div>
 
+<!-- Link -->
   <div class="links">
-    <h3>関連リンク</h3>
     <a href="https://www.u-tokyo.ac.jp/"><img class="links" src="img/utokyo.jpg" width=180px height=auto></a>
     <a href="https://www.s.u-tokyo.ac.jp/"><img class="links" src="img/sos_utokyo.jpg" width=230px height=auto></a>
+    <a href=""><h3>関連リンク</h3></a>
   </div>
 </div>
diff --git a/themes/cns_hp_theme/static/css/sidebar.css b/themes/cns_hp_theme/static/css/sidebar.css
new file mode 100644
index 0000000..d3edc03
--- /dev/null
+++ b/themes/cns_hp_theme/static/css/sidebar.css
@@ -0,0 +1,31 @@
+/*
+ css file for sidebar
+ layouts/partial/sidebar.html
+ */
+
+.sidebar {
+  display: block;
+  position: -webkit-sticky;
+  position: sticky;
+  top: 200px;
+  width: 320px;
+  height: 600px;
+  right: 15px;
+  color: #000;
+}
+/*
+.sidebar__item {
+  border: solid 8px red;
+  box-sizing: border-box;
+}
+.sidebar__item--fixed {
+  border: solid 8px red;
+  box-sizing: border-box;
+
+}
+.links {
+  border: solid 8px red;
+  box-sizing: border-box;
+
+}
+*/
diff --git a/themes/cns_hp_theme/static/css/split_container.css b/themes/cns_hp_theme/static/css/split_container.css
index 1027e5d..6388700 100644
--- a/themes/cns_hp_theme/static/css/split_container.css
+++ b/themes/cns_hp_theme/static/css/split_container.css
@@ -10,35 +10,4 @@
   width: 100%;
   text-align: center;
 }
-/*
-.sidebar {
-  width: 320px;
-}
-*/
-
-.sidebar {
-  display: block;
-  position: -webkit-sticky;
-  position: sticky;
-  top: 200px;
-  width: 320px;
-  height: 600px;
-  right: 15px;
-  color: #000;
-}
-/*
-.sidebar__item {
-  border: solid 8px red;
-  box-sizing: border-box;
-}
-.sidebar__item--fixed {
-  border: solid 8px red;
-  box-sizing: border-box;
-
-}
-.links {
-  border: solid 8px red;
-  box-sizing: border-box;
 
-}
-*/
-- 
GitLab