From 8bc64429f9679947a6769ca607d827e3be7b3fba Mon Sep 17 00:00:00 2001
From: raybchoi <raybchoi@gmail.com>
Date: Fri, 6 Oct 2017 15:38:37 -0700
Subject: [PATCH 1/4] Inconsistent Sidebar Styles

---
 .../assets/stylesheets/administration_structure.css.scss  | 4 ++--
 themes/bootstrap-2/stylesheets/style.css                  | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/publify_core/app/assets/stylesheets/administration_structure.css.scss b/publify_core/app/assets/stylesheets/administration_structure.css.scss
index b2ffa560d..971c9ab9e 100644
--- a/publify_core/app/assets/stylesheets/administration_structure.css.scss
+++ b/publify_core/app/assets/stylesheets/administration_structure.css.scss
@@ -235,5 +235,5 @@ twitter-typeahead {
 
 .tt-hint {
   z-index: -1;
-  
-}
\ No newline at end of file
+
+}
diff --git a/themes/bootstrap-2/stylesheets/style.css b/themes/bootstrap-2/stylesheets/style.css
index fc7c7e6d1..ddde163b1 100644
--- a/themes/bootstrap-2/stylesheets/style.css
+++ b/themes/bootstrap-2/stylesheets/style.css
@@ -76,12 +76,8 @@ body {
 
 #sidebar {
   padding-top: 24px;
+  font-family: monospace
 }
-
-#sidebar .sidebar-title {
-  font-family: monospace;
-}
-
-#sidebar .sidebar-body li {
+li {
   list-style-type: circle;
 }

From 5762f31743ea8e77fd3322a5fe9e6136d07ddd5b Mon Sep 17 00:00:00 2001
From: raybchoi <raybchoi@gmail.com>
Date: Fri, 6 Oct 2017 15:50:27 -0700
Subject: [PATCH 2/4] fixed the Unnecessary file changes

---
 .../app/assets/stylesheets/administration_structure.css.scss     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/publify_core/app/assets/stylesheets/administration_structure.css.scss b/publify_core/app/assets/stylesheets/administration_structure.css.scss
index 971c9ab9e..073223d87 100644
--- a/publify_core/app/assets/stylesheets/administration_structure.css.scss
+++ b/publify_core/app/assets/stylesheets/administration_structure.css.scss
@@ -235,5 +235,4 @@ twitter-typeahead {
 
 .tt-hint {
   z-index: -1;
-
 }

From f08676f7b256011ce830db3bb87ac0ea5decd1be Mon Sep 17 00:00:00 2001
From: raybchoi <raybchoi@gmail.com>
Date: Fri, 6 Oct 2017 16:01:35 -0700
Subject: [PATCH 3/4] reverted the bootstrap-2 changes back to before while
 fixing the classes on the sidebar

---
 publify_core/app/views/archives_sidebar/_content.html.erb | 4 ++--
 themes/bootstrap-2/stylesheets/style.css                  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/publify_core/app/views/archives_sidebar/_content.html.erb b/publify_core/app/views/archives_sidebar/_content.html.erb
index 540bd21f7..7f5e3a88e 100644
--- a/publify_core/app/views/archives_sidebar/_content.html.erb
+++ b/publify_core/app/views/archives_sidebar/_content.html.erb
@@ -1,6 +1,6 @@
 <% unless sidebar.archives.blank? %>
-  <h3 class="sidebar_title"><%= sidebar.title %></h3>
-  <div class="sidebar_body">
+  <h3 class="sidebar-title"><%= sidebar.title %></h3>
+  <div class="sidebar-body">
     <ul id="archives">
       <% sidebar.archives.each do |month| %>
         <% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
diff --git a/themes/bootstrap-2/stylesheets/style.css b/themes/bootstrap-2/stylesheets/style.css
index ddde163b1..220d824d1 100644
--- a/themes/bootstrap-2/stylesheets/style.css
+++ b/themes/bootstrap-2/stylesheets/style.css
@@ -76,8 +76,12 @@ body {
 
 #sidebar {
   padding-top: 24px;
-  font-family: monospace
+
 }
-li {
+#sidebar .sidebar-title {
+  font-family: monospace;
+ }
+
+ #sidebar .sidebar-body li {
   list-style-type: circle;
 }

From 995c6715cea9cef50518868b5d8fbfe55e402838 Mon Sep 17 00:00:00 2001
From: raybchoi <raybchoi@gmail.com>
Date: Fri, 6 Oct 2017 16:21:19 -0700
Subject: [PATCH 4/4] fixed the inconsistent_sidebar_styles and squashing all
 commits

---
 .../assets/stylesheets/administration_structure.css.scss    | 3 +--
 publify_core/app/views/archives_sidebar/_content.html.erb   | 4 ++--
 themes/bootstrap-2/stylesheets/style.css                    | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/publify_core/app/assets/stylesheets/administration_structure.css.scss b/publify_core/app/assets/stylesheets/administration_structure.css.scss
index b2ffa560d..073223d87 100644
--- a/publify_core/app/assets/stylesheets/administration_structure.css.scss
+++ b/publify_core/app/assets/stylesheets/administration_structure.css.scss
@@ -235,5 +235,4 @@ twitter-typeahead {
 
 .tt-hint {
   z-index: -1;
-  
-}
\ No newline at end of file
+}
diff --git a/publify_core/app/views/archives_sidebar/_content.html.erb b/publify_core/app/views/archives_sidebar/_content.html.erb
index 540bd21f7..7f5e3a88e 100644
--- a/publify_core/app/views/archives_sidebar/_content.html.erb
+++ b/publify_core/app/views/archives_sidebar/_content.html.erb
@@ -1,6 +1,6 @@
 <% unless sidebar.archives.blank? %>
-  <h3 class="sidebar_title"><%= sidebar.title %></h3>
-  <div class="sidebar_body">
+  <h3 class="sidebar-title"><%= sidebar.title %></h3>
+  <div class="sidebar-body">
     <ul id="archives">
       <% sidebar.archives.each do |month| %>
         <% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
diff --git a/themes/bootstrap-2/stylesheets/style.css b/themes/bootstrap-2/stylesheets/style.css
index fc7c7e6d1..220d824d1 100644
--- a/themes/bootstrap-2/stylesheets/style.css
+++ b/themes/bootstrap-2/stylesheets/style.css
@@ -76,12 +76,12 @@ body {
 
 #sidebar {
   padding-top: 24px;
-}
 
+}
 #sidebar .sidebar-title {
   font-family: monospace;
-}
+ }
 
-#sidebar .sidebar-body li {
+ #sidebar .sidebar-body li {
   list-style-type: circle;
 }