Permalink
Browse files

update footer logo and gems

  • Loading branch information...
1 parent 9d4e204 commit bcc2844e12f538deccd3ccd1d5a3b2fe357cda1b @sublimecoder sublimecoder committed Jul 28, 2016
Showing with 88 additions and 79 deletions.
  1. +1 −1 Gemfile
  2. +84 −71 Gemfile.lock
  3. +1 −1 app/assets/stylesheets/_beaker.scss
  4. +1 −1 app/views/layouts/install_steps.html.erb
  5. +1 −5 app/views/main/index.html.erb
View
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
-ruby "2.2.0"
+ruby "2.3.1"
gem 'rails', '4.2.0'
View
@@ -36,8 +36,9 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- arel (6.0.0)
- better_errors (2.1.0)
+ addressable (2.4.0)
+ arel (6.0.3)
+ better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
@@ -46,80 +47,89 @@ GEM
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
builder (3.2.2)
- capybara (2.4.4)
+ capybara (2.7.1)
+ addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- coderay (1.1.0)
- coffee-rails (4.1.0)
+ coderay (1.1.1)
+ coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.0)
- coffee-script (2.3.0)
+ railties (>= 4.0.0, < 5.2.x)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.8.0)
- cucumber (1.3.18)
+ coffee-script-source (1.10.0)
+ concurrent-ruby (1.0.2)
+ cucumber (2.4.0)
builder (>= 2.1.2)
+ cucumber-core (~> 1.5.0)
+ cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
- gherkin (~> 2.12)
+ gherkin (~> 4.0)
multi_json (>= 1.7.5, < 2.0)
- multi_test (>= 0.1.1)
- cucumber-rails (1.4.2)
+ multi_test (>= 0.1.2)
+ cucumber-core (1.5.0)
+ gherkin (~> 4.0)
+ cucumber-rails (1.4.3)
capybara (>= 1.1.2, < 3)
- cucumber (>= 1.3.8, < 2)
- mime-types (>= 1.16, < 3)
+ cucumber (>= 1.3.8, < 3)
+ mime-types (>= 1.16, < 4)
nokogiri (~> 1.5)
- rails (>= 3, < 5)
+ railties (>= 3, < 5)
+ cucumber-wire (0.0.1)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
erubis (2.7.0)
- execjs (2.2.2)
- factory_girl (4.5.0)
+ execjs (2.7.0)
+ factory_girl (4.7.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.5.0)
- factory_girl (~> 4.5.0)
+ factory_girl_rails (4.7.0)
+ factory_girl (~> 4.7.0)
railties (>= 3.0.0)
- figaro (1.0.0)
+ figaro (1.1.1)
thor (~> 0.14)
font-awesome-rails (3.2.1.3)
railties (>= 3.2, < 5.0)
- gherkin (2.12.2)
- multi_json (~> 1.3)
- globalid (0.3.0)
+ gherkin (4.0.0)
+ globalid (0.3.7)
activesupport (>= 4.1.0)
- hike (1.2.3)
i18n (0.7.0)
jbuilder (1.5.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
- jquery-rails (4.0.3)
- rails-dom-testing (~> 1.0)
+ jquery-rails (4.1.1)
+ rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (1.8.1)
- kgio (2.9.2)
- loofah (2.0.1)
+ json (1.8.3)
+ kgio (2.10.0)
+ loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
method_source (0.8.2)
- mime-types (2.4.3)
- mini_portile (0.6.2)
- minitest (5.5.0)
- multi_json (1.10.1)
- multi_test (0.1.1)
- nokogiri (1.6.5)
- mini_portile (~> 0.6.0)
- pry (0.10.1)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (5.9.0)
+ multi_json (1.12.1)
+ multi_test (0.1.2)
+ nokogiri (1.6.8)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
+ pkg-config (1.1.7)
+ pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- pry-rails (0.3.2)
+ pry-rails (0.3.4)
pry (>= 0.9.10)
- rack (1.6.0)
- rack-test (0.6.2)
+ rack (1.6.4)
+ rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.0)
actionmailer (= 4.2.0)
@@ -134,24 +144,24 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.5)
+ rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.1)
+ rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
- rails_serve_static_assets (0.0.3)
- rails_stdout_logging (0.0.3)
+ rails_serve_static_assets (0.0.5)
+ rails_stdout_logging (0.0.5)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.13.0)
- rake (10.4.2)
+ raindrops (0.16.0)
+ rake (11.2.2)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.4)
@@ -168,38 +178,35 @@ GEM
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
- sass (3.4.9)
- sass-rails (5.0.1)
- railties (>= 4.0.0, < 5.0)
+ sass (3.4.22)
+ sass-rails (5.0.6)
+ railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
- tilt (~> 1.1)
+ tilt (>= 1.1, < 3)
slop (3.6.0)
- sprockets (2.12.3)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.2.2)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (>= 2.8, < 4.0)
+ sprockets (3.7.0)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.1.1)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
thor (0.19.1)
- thread_safe (0.3.4)
- tilt (1.4.1)
- turbolinks (2.5.3)
- coffee-rails
+ thread_safe (0.3.5)
+ tilt (2.0.5)
+ turbolinks (5.0.0)
+ turbolinks-source (~> 5)
+ turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.6.1)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
- unicorn (4.8.3)
+ uglifier (3.0.0)
+ execjs (>= 0.3.0, < 3)
+ unicorn (5.1.0)
kgio (~> 2.6)
- rack
raindrops (~> 0.7)
- wicked (1.1.0)
+ wicked (1.1.1)
rails (>= 3.0.7)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -227,3 +234,9 @@ DEPENDENCIES
uglifier (>= 1.3.0)
unicorn
wicked (~> 1.1.0)
+
+RUBY VERSION
+ ruby 2.3.1p112
+
+BUNDLED WITH
+ 1.12.5
@@ -506,7 +506,7 @@ ul.social li:nth-child(6):before{
text-decoration: none;
}
.copyright {
- margin-top: 22px;
+ margin-top: 18px;
}
/*************************************************************
@@ -25,7 +25,7 @@
<% end %>
<% content_for(:footer) do %>
- &copy; <%= Time.zone.now.year %> <%= link_to "One Month", "https://onemonth.com/?utm_source=installrails" %>
+ <%= link_to image_tag("https://d3dcc53t14pv6.cloudfront.net/assets/one-month-@2x.png", width: 130, height: 17), "https://onemonth.com/?utm_source=installrails", id: "footer-logo-link" %> &copy; <%= Date.current.year %>
<% end %>
<%= render template: "layouts/application" %>
@@ -88,11 +88,7 @@
<div class="pull-right copyright col-sm-3">
- <!-- Javascript hover for this -->
- <p id="hide-cc">
- This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
- </p>
- <%= link_to image_tag("http://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png", :id=>"license", :alt => "Creative Commons License"),"http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" %>
+ <%= link_to image_tag("https://d3dcc53t14pv6.cloudfront.net/assets/one-month-@2x.png", :id=>"license", :alt => "One Month, inc.", width: 200),"https://onemonth.com" %>
</div>
</div>
</div>

0 comments on commit bcc2844

Please sign in to comment.