From 4e6ee235167980febdfe9f1a3fa0c9a0b5af39c1 Mon Sep 17 00:00:00 2001
From: isangieri <isabelleangieri@gmail.com>
Date: Fri, 5 Feb 2016 10:40:58 -0800
Subject: [PATCH 1/3] resolved psql issue

---
 Gemfile             | 37 +------------------------------------
 config/database.yml |  4 +---
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/Gemfile b/Gemfile
index 563515183..d5fe91e03 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,40 +1,5 @@
 source 'https://rubygems.org'
-
-if ENV['HEROKU']
-  ruby '2.1.5'
-
-  gem 'pg'
-  gem 'thin' # Change this to another web server if you want (ie. unicorn, passenger, puma...)
-  gem 'rails_12factor'
-else
-
-  require 'yaml'
-  env = ENV['RAILS_ENV'] || 'development'
-  dbfile = File.expand_path('../config/database.yml', __FILE__)
-
-  unless File.exist?(dbfile)
-    if ENV['DB']
-      FileUtils.cp "config/database.yml.#{ENV['DB'] || 'postgres'}", 'config/database.yml'
-    else
-      raise 'You need to configure config/database.yml first'
-    end
-  end
-
-  conf = YAML.load(File.read(dbfile))
-  environment = conf[env]
-  adapter = environment['adapter'] if environment
-  raise 'You need define an adapter in your database.yml or set your RAILS_ENV variable' if adapter == '' || adapter.nil?
-  case adapter
-  when 'sqlite3'
-    gem 'sqlite3'
-  when 'postgresql'
-    gem 'pg'
-  when 'mysql2'
-    gem 'mysql2', '~> 0.3.18'
-  else
-    raise "Don't know what gem to use for adapter #{adapter}"
-  end
-end
+   gem 'pg'
 
 gem 'rails', '~> 4.2.5'
 
diff --git a/config/database.yml b/config/database.yml
index 6c387f63f..b3f1f2eb6 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,7 +1,5 @@
 login: &login
   adapter: postgresql
-  host: localhost
-  port: 5432
 
 connection: &connection
   encoding: unicode
@@ -9,7 +7,7 @@ connection: &connection
 
 
 development:
-  database: publify_dev
+  database: publify_deaaav
   <<: *login
   <<: *connection
 

From f4e53180fc0d1632e6987e784dd7df2beae7bdae Mon Sep 17 00:00:00 2001
From: isangieri <isabelleangieri@gmail.com>
Date: Fri, 5 Feb 2016 10:56:22 -0800
Subject: [PATCH 2/3] refactored inconsistent sidebar styles

---
 app/assets/stylesheets/user-styles.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/user-styles.css b/app/assets/stylesheets/user-styles.css
index 2cb22450e..05dc85cdb 100644
--- a/app/assets/stylesheets/user-styles.css
+++ b/app/assets/stylesheets/user-styles.css
@@ -35,3 +35,7 @@ img.right {
 #sidebar .sidebar-body li {
   list-style-type: circle;
 }
+
+#archives li {
+  list-style-type: circle;
+}

From c46a43bf47258fa2e2d787b287c6803f0b070491 Mon Sep 17 00:00:00 2001
From: isangieri <isabelleangieri@gmail.com>
Date: Fri, 5 Feb 2016 11:41:02 -0800
Subject: [PATCH 3/3] removed typo and redundant styles

---
 app/assets/stylesheets/user-styles.css                      | 6 +-----
 .../app/views/archives_sidebar/_content.html.erb            | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/user-styles.css b/app/assets/stylesheets/user-styles.css
index 05dc85cdb..48a514ba1 100644
--- a/app/assets/stylesheets/user-styles.css
+++ b/app/assets/stylesheets/user-styles.css
@@ -34,8 +34,4 @@ img.right {
 
 #sidebar .sidebar-body li {
   list-style-type: circle;
-}
-
-#archives li {
-  list-style-type: circle;
-}
+}
\ No newline at end of file
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>" : "" %>