From d65a8eaf496fb5efc43f9810a56b21f286b33d0a Mon Sep 17 00:00:00 2001
From: kranjbar <YOUR_GITHUB_EMAIL_ADDRESS>
Date: Fri, 5 Feb 2016 10:23:17 -0800
Subject: [PATCH 1/4] Fixed inconsistent sidebar styles bug

---
 app/views/admin/sidebar/_target_sidebar.html.erb              | 2 +-
 .../app/views/archives_sidebar/_content.html.erb              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/sidebar/_target_sidebar.html.erb b/app/views/admin/sidebar/_target_sidebar.html.erb
index 62a6a9ca8..671075100 100644
--- a/app/views/admin/sidebar/_target_sidebar.html.erb
+++ b/app/views/admin/sidebar/_target_sidebar.html.erb
@@ -1,4 +1,4 @@
-<li id="sidebar_<%= sidebar.id %>" class="sidebar_item" data-sortable="sidebar_<%= sidebar.id %>" >
+<li id="sidebar_<%= sidebar.id %>" class="sidebar-item" data-sortable="sidebar_<%= sidebar.id %>" >
   <%= link_to 'X', admin_sidebar_path(sidebar), {class: 'deletion_link', remote: true, method: :delete, :'data-confirm'=>'Are you sure?'} %>
   <%= form_tag admin_sidebar_path(sidebar.id), {remote: true, method: :put} do |f| %>
     <div class="active alert <%= class_for_admin_state(sidebar, sortable_index)%>">
diff --git a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
index 7d74c3347..1ea942567 100644
--- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
+++ b/lib/archives_sidebar/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>" : "" %>

From d89a2affe5549d2729171c92a2d9176c8b35521a Mon Sep 17 00:00:00 2001
From: kranjbar <YOUR_GITHUB_EMAIL_ADDRESS>
Date: Fri, 5 Feb 2016 11:08:32 -0800
Subject: [PATCH 2/4] fixes #1

---
 app/assets/javascripts/sidebar.js             | 2 +-
 app/assets/stylesheets/sidebar_admin.css.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index 548bb6471..0ccef1b0b 100644
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -28,7 +28,7 @@ var bind_sortable = function() {
     helper: "clone",
     revert: "invalid"
   });
-  $('.sidebar_item').on('ajax:success', function(data, textStatus, xhr) {
+  $('.sidebar-item').on('ajax:success', function(data, textStatus, xhr) {
     $(this).parent().replaceWith(data);
   }
   );
diff --git a/app/assets/stylesheets/sidebar_admin.css.scss b/app/assets/stylesheets/sidebar_admin.css.scss
index 727a40f7b..9d9e495e9 100644
--- a/app/assets/stylesheets/sidebar_admin.css.scss
+++ b/app/assets/stylesheets/sidebar_admin.css.scss
@@ -22,7 +22,7 @@
   padding: 45px;
   border: 1px solid #ccc;
 }
-.sidebar_item {
+.sidebar-item {
   position: relative;
   h3 {
     margin-top: 0;

From 0033731d0907ce1646ae925827873ea48229b55f Mon Sep 17 00:00:00 2001
From: kranjbar <YOUR_GITHUB_EMAIL_ADDRESS>
Date: Fri, 5 Feb 2016 12:12:16 -0800
Subject: [PATCH 3/4] Removed changes

---
 app/assets/javascripts/sidebar.js             | 2 +-
 app/assets/stylesheets/sidebar_admin.css.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index 0ccef1b0b..548bb6471 100644
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -28,7 +28,7 @@ var bind_sortable = function() {
     helper: "clone",
     revert: "invalid"
   });
-  $('.sidebar-item').on('ajax:success', function(data, textStatus, xhr) {
+  $('.sidebar_item').on('ajax:success', function(data, textStatus, xhr) {
     $(this).parent().replaceWith(data);
   }
   );
diff --git a/app/assets/stylesheets/sidebar_admin.css.scss b/app/assets/stylesheets/sidebar_admin.css.scss
index 9d9e495e9..727a40f7b 100644
--- a/app/assets/stylesheets/sidebar_admin.css.scss
+++ b/app/assets/stylesheets/sidebar_admin.css.scss
@@ -22,7 +22,7 @@
   padding: 45px;
   border: 1px solid #ccc;
 }
-.sidebar-item {
+.sidebar_item {
   position: relative;
   h3 {
     margin-top: 0;

From ab655a33feeae67288e09ca6787d5d3f382922e0 Mon Sep 17 00:00:00 2001
From: kranjbar <YOUR_GITHUB_EMAIL_ADDRESS>
Date: Fri, 5 Feb 2016 13:38:03 -0800
Subject: [PATCH 4/4] Fixes #1, ahh I get it now

---
 app/views/admin/sidebar/_target_sidebar.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/sidebar/_target_sidebar.html.erb b/app/views/admin/sidebar/_target_sidebar.html.erb
index 671075100..62a6a9ca8 100644
--- a/app/views/admin/sidebar/_target_sidebar.html.erb
+++ b/app/views/admin/sidebar/_target_sidebar.html.erb
@@ -1,4 +1,4 @@
-<li id="sidebar_<%= sidebar.id %>" class="sidebar-item" data-sortable="sidebar_<%= sidebar.id %>" >
+<li id="sidebar_<%= sidebar.id %>" class="sidebar_item" data-sortable="sidebar_<%= sidebar.id %>" >
   <%= link_to 'X', admin_sidebar_path(sidebar), {class: 'deletion_link', remote: true, method: :delete, :'data-confirm'=>'Are you sure?'} %>
   <%= form_tag admin_sidebar_path(sidebar.id), {remote: true, method: :put} do |f| %>
     <div class="active alert <%= class_for_admin_state(sidebar, sortable_index)%>">