Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Inconsistent Sidebar Styles #1 #11

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 1 addition & 36 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@isangieri Why are you changing our gem file in this commit? Is that related to the bug?


gem 'rails', '~> 4.2.5'

Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/user-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ img.right {
#sidebar .sidebar-body li {
list-style-type: circle;
}

#archives li {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please defend addition of redundant style. See lines 35-37, above.

list-style-type: circle;
}
4 changes: 1 addition & 3 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
login: &login
adapter: postgresql
host: localhost
port: 5432

connection: &connection
encoding: unicode
pool: 5


development:
database: publify_dev
database: publify_deaaav
<<: *login
<<: *connection
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused. What do these database changes have to do with the fix?


Expand Down