From b5ba362f41f073b01180a6b55dcc8a61188b724e Mon Sep 17 00:00:00 2001 From: Gustavo Cunha Date: Thu, 5 Jan 2017 21:58:26 +0000 Subject: [PATCH] issues fixes --- .gitignore | 7 -- Gemfile | 2 +- Gemfile.lock | 119 +++++++++--------- .../bootstrap/bootstrap/_dropdowns.scss | 2 - config/deploy.rb | 4 +- public/css/404.css | 8 +- 6 files changed, 66 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 69c434b9..80bd1262 100644 --- a/.gitignore +++ b/.gitignore @@ -12,24 +12,17 @@ capybara-*.html rerun.txt pickle-email-*.html -# TODO Comment out these rules if you are OK with secrets being uploaded to the repo config/initializers/secret_token.rb config/secrets.yml config/database.yml -## Environment normalisation: /.bundle /.capistrano /vendor/bundle -# these should all be checked in to normalise the environment: .ruby-* - -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: .rvmrc -# ignore environment variables .env -# Ignore application configuration /config/application.yml diff --git a/Gemfile b/Gemfile index 4b34cb8d..910cb987 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.6' +gem 'rails', '~> 4.2.7.1' # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.3' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 05310551..d0446762 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,58 +1,58 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - airbrussh (1.0.2) + airbrussh (1.1.2) sshkit (>= 1.6.1, != 1.7.0) - arel (6.0.3) + arel (6.0.4) bcrypt (3.1.11) - brakeman (3.3.2) + brakeman (3.4.1) builder (3.2.2) - capistrano (3.5.0) + capistrano (3.7.1) airbrussh (>= 1.0.0) capistrano-harrow i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.1.4) + capistrano-bundler (1.2.0) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-harrow (0.5.1) - capistrano-rails (1.1.7) + capistrano-harrow (0.5.3) + capistrano-rails (1.2.1) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano3-puma (1.2.1) @@ -64,16 +64,16 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) erubis (2.7.0) execjs (2.7.0) figaro (1.1.1) thor (~> 0.14) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) - jquery-rails (4.1.1) + jquery-rails (4.2.2) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -86,59 +86,57 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.10.1) multi_json (1.12.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.1.1) - newrelic_rpm (3.15.2.317) - nokogiri (1.6.8) + net-ssh (4.0.0) + newrelic_rpm (3.17.2.327) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - pkg-config (1.1.7) - puma (3.4.0) + puma (3.6.2) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (1.6.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rdoc (4.2.2) - json (~> 1.4) + rake (12.0.0) + rdoc (4.3.0) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) sass (~> 3.2.2) sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - spring (1.7.1) + spring (2.0.0) + activesupport (>= 4.2) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -148,17 +146,18 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sshkit (1.10.0) + sshkit (1.11.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.5) tilt (1.4.1) - turbolinks (2.5.3) - coffee-rails + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.4) execjs (>= 0.3.0, < 3) PLATFORMS @@ -177,7 +176,7 @@ DEPENDENCIES newrelic_rpm puma quiet_assets - rails (~> 4.2.6) + rails (~> 4.2.7.1) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) spring diff --git a/app/assets/stylesheets/bootstrap/bootstrap/_dropdowns.scss b/app/assets/stylesheets/bootstrap/bootstrap/_dropdowns.scss index 526be5b8..d16914bf 100644 --- a/app/assets/stylesheets/bootstrap/bootstrap/_dropdowns.scss +++ b/app/assets/stylesheets/bootstrap/bootstrap/_dropdowns.scss @@ -175,7 +175,6 @@ // Allow for dropdowns to go bottom up (aka, dropup-menu) // // Just add .dropup after the standard .dropdown class and you're set, bro. -// TODO: abstract this so that the navbar fixed styles are not placed here? .dropup, .navbar-fixed-bottom .dropdown { @@ -210,4 +209,3 @@ } } } - diff --git a/config/deploy.rb b/config/deploy.rb index b7f2ae36..e512980f 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ -# config valid only for Capistrano 3.1 -lock '3.5.0' +# config valid only for Capistrano 3.7 +lock '3.7.1' set :application, 'gmmcal.com.br' set :repo_url, 'git@github.com:gmmcal/gmmcal.com.br.git' diff --git a/public/css/404.css b/public/css/404.css index 2eb33185..1c9a27f7 100644 --- a/public/css/404.css +++ b/public/css/404.css @@ -44,7 +44,7 @@ body { position: absolute; display: block; top: 138px; - left: 0px; + left: 0; width: 389px; height: 252px; animation: sway 20s ease infinite; @@ -54,8 +54,8 @@ body { .body404 { position: absolute; display: block; - top: 0px; - left: 0px; + top: 0; + left: 0; width: 389px; height: 253px; } @@ -66,7 +66,7 @@ body { left: 106px; width: 160px; height: 194px; - background-position: 0px -265px; + background-position: 0 -265px; transform-origin: 50% 85%; animation: headTilt 20s ease infinite; }