Fix #139 -- avoid conflict between reST and hyde’s sidebar

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 2, 2018 · b2dcfc6 · b2dcfc6
1 parent 70b1106
commit b2dcfc6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/v7/hyde/README.md b/v7/hyde/README.md
@@ -12,6 +12,8 @@ That changes the color scheme, replace 08 with one of 09, 0a, 0b, 0c, 0d, 0e, 0f
 
 You can read a tutorial about how to create/port new theme [at Nikola's site](https://getnikola.com/creating-a-theme.html)
 
+(*Note:* The `.sidebar` class was renamed to `.hsidebar` to avoid conflicts with reST.)
+
 License is MIT
 
 Known Issues:

diff --git a/v7/hyde/assets/css/hyde.css b/v7/hyde/assets/css/hyde.css
@@ -53,7 +53,7 @@ html {
  * out above content in mobile and later moves to the side with wider viewports.
  */
 
-div.sidebar, .sidebar {
+div.hsidebar, .hsidebar {
   padding: 2rem 1rem;
   color: rgba(255,255,255,.5);
   background-color: #202020;
@@ -63,7 +63,7 @@ div.sidebar, .sidebar {
 }
 
 @media (min-width: 48em) {
-div.sidebar, .sidebar {
+div.hsidebar, .hsidebar {
     position: fixed;
     text-align: left;
     top: 0;
@@ -74,7 +74,7 @@ div.sidebar, .sidebar {
 }
 
 /* Sidebar images */
-div.sidebar img, .sidebar img {
+div.hsidebar img, .hsidebar img {
   display: block;
   margin-left: auto;
   margin-right: auto;
@@ -86,7 +86,7 @@ img#logo {
 }
 
 /* Sidebar links */
-div.sidebar a, .sidebar a {
+div.hsidebar a, .hsidebar a {
   color: #fff;
 }
 
@@ -192,7 +192,7 @@ a.sidebar-nav-item:focus {
  */
 
 @media (min-width: 48em) {
-  .layout-reverse .sidebar {
+  .layout-reverse .hsidebar {
     left: auto;
     right: 0;
   }
@@ -221,7 +221,7 @@ a.sidebar-nav-item:focus {
 /* Base16 (http://chriskempson.github.io/base16/#default) */
 
 /* Red */
-.theme-base-08 .sidebar {
+.theme-base-08 .hsidebar {
   background-color: #ac4142;
 }
 .theme-base-08 .content a,
@@ -230,7 +230,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Orange */
-.theme-base-09 .sidebar {
+.theme-base-09 .hsidebar {
   background-color: #d28445;
 }
 .theme-base-09 .content a,
@@ -239,7 +239,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Yellow */
-.theme-base-0a .sidebar {
+.theme-base-0a .hsidebar {
   background-color: #f4bf75;
 }
 .theme-base-0a .content a,
@@ -248,7 +248,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Green */
-.theme-base-0b .sidebar {
+.theme-base-0b .hsidebar {
   background-color: #90a959;
 }
 .theme-base-0b .content a,
@@ -257,7 +257,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Cyan */
-.theme-base-0c .sidebar {
+.theme-base-0c .hsidebar {
   background-color: #75b5aa;
 }
 .theme-base-0c .content a,
@@ -266,7 +266,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Blue */
-.theme-base-0d .sidebar {
+.theme-base-0d .hsidebar {
   background-color: #6a9fb5;
 }
 .theme-base-0d .content a,
@@ -275,7 +275,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Magenta */
-.theme-base-0e .sidebar {
+.theme-base-0e .hsidebar {
   background-color: #aa759f;
 }
 .theme-base-0e .content a,
@@ -284,7 +284,7 @@ a.sidebar-nav-item:focus {
 }
 
 /* Brown */
-.theme-base-0f .sidebar {
+.theme-base-0f .hsidebar {
   background-color: #8f5536;
 }
 .theme-base-0f .content a,

diff --git a/v7/hyde/templates/base.tmpl b/v7/hyde/templates/base.tmpl
@@ -13,7 +13,7 @@
 <body class="{{ hyde_subtheme }}">
     <a href="#content" class="sr-only sr-only-focusable">{{ messages("Skip to main content") }}</a>
 
-    <div class="sidebar">
+    <div class="hsidebar">
         <div class="container sidebar-sticky">
             <div class="sidebar-about">
               <h1>