diff --git a/Gemfile b/Gemfile index 58de934..4e4cfa2 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'pry-rails', :group => :development gem 'acts_as_votable', '~> 0.10.0' gem 'closure_tree' -gem 'best_in_place', github: 'bernat/best_in_place' +gem 'best_in_place', '~> 3.0.1' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' @@ -45,4 +45,3 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end - diff --git a/Gemfile.lock b/Gemfile.lock index 02baacc..95f8455 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: git://github.com/bernat/best_in_place.git - revision: 57b525e487cd6ba10467b47d8bf8907c645f6917 - specs: - best_in_place (3.1.0) - actionpack (>= 3.2) - railties (>= 3.2) - GEM remote: https://rubygems.org/ specs: @@ -47,6 +39,9 @@ GEM acts_as_votable (0.10.0) arel (6.0.3) bcrypt (3.1.10) + best_in_place (3.0.3) + actionpack (>= 3.2) + railties (>= 3.2) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-sass (3.2.0.2) @@ -175,7 +170,7 @@ PLATFORMS DEPENDENCIES acts_as_votable (~> 0.10.0) bcrypt (~> 3.1.7) - best_in_place! + best_in_place (~> 3.0.1) bootstrap-sass (~> 3.2.0) bootstrap_form byebug @@ -194,4 +189,4 @@ DEPENDENCIES web-console (~> 2.0) BUNDLED WITH - 1.11.2 + 1.16.0 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 6875b85..c03ef1f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,9 +18,9 @@ //= require best_in_place //= require_tree . -$(function() { +$(document).ready(function() { + $(".best_in_place").best_in_place(); $(".stop-propagate").on("click", function(evt) { evt.stopPropagation(); - console.log("HALT!"); }); -}); +}) diff --git a/app/assets/javascripts/users.js.coffee b/app/assets/javascripts/users.js.coffee deleted file mode 100644 index b33812d..0000000 --- a/app/assets/javascripts/users.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ - -$('.best_in_place').best_in_place() diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index e8db95e..fddc63c 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -32,7 +32,6 @@ body { .center-content { text-align: center; - background-image: url('../../../bg1.jpg'); height: 720px; max-height: 100%; } diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb index 1cd68bb..7d6856f 100644 --- a/app/views/articles/index.html.erb +++ b/app/views/articles/index.html.erb @@ -1,4 +1,4 @@ -
+
<% @articles.each do |article| %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 72265e4..90a8785 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,7 +6,6 @@ <%= stylesheet_link_tag 'application', 'https://fonts.googleapis.com/css?family=Finger+Paint' %> <%= javascript_include_tag 'application' %> <%= csrf_meta_tags %> -