rails_layout 1.0.13 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.textile +6 -0
  3. data/README.textile +1 -4
  4. data/lib/generators/layout/install/install_generator.rb +1 -0
  5. data/lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss +6 -0
  6. data/lib/generators/layout/navigation/navigation_generator.rb +1 -4
  7. data/lib/rails_layout/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 23cb3b2bca1250247c5826353b5bf73edca21936
4
- data.tar.gz: 2ecc76534e2316935d2df67c6d5efc5cea7391f1
3
+ metadata.gz: 8813ff21264efe36c532f1841b818f0f7721c458
4
+ data.tar.gz: 9518064270333234e5a55fbaf5eb855a372a7f09
5
5
  SHA512:
6
- metadata.gz: 679b3d28ad1cdc729d989e8254d4c1b9d6703ed7d2b64e83d951300479f715d91f5f1917984821c6b449c1738e55df1d358d7d494bc43fa3574f4f727a974092
7
- data.tar.gz: b32cc7ff17aaa0f3f6c8096faa25eaa05175d2ad1a1ec50c707dd4bb0e88a49fe8d71c822fffd9e020ec1ff6d972cdce28cb2803089c2221731df984839552be
6
+ metadata.gz: 0d710544f1cb92c8299cedb645f1dfe0130719b4092dacc761fc33d8018380cf11787ea81c214cdc13a97e7c6a7b542ac6ba9b8a24d2f2af409e0a0c71a52e51
7
+ data.tar.gz: 25034958cafe2cb631b2063b2f7b0205d1c2751b3ff86f9c781cec8fd7a3ba1e730c212886f860d5506adddb4695d4a939e2704b526771dc8beeaa326a47ae68
data/CHANGELOG.textile CHANGED
@@ -1,5 +1,11 @@
1
1
  h1. CHANGELOG
2
2
 
3
+ h3. 1.0.14 April 9, 2014
4
+
5
+ * workaround for Rails 4.1.2 pending releaase of bootstrap-sass 3.1.2 (fixes #20)
6
+ * modify 'config/application.rb' for Foundation 5 (fixes #19)
7
+ * remove unnecessary conditional on Bootstrap navlinks partial (contributed by Arnel Bucio)
8
+
3
9
  h3. 1.0.13 March 23, 2014
4
10
 
5
11
  * change quote marks around 'vendor/modernizr'
data/README.textile CHANGED
@@ -365,13 +365,10 @@ Here's an example of a file *app/views/layouts/_navigation_links.html.erb* appro
365
365
  <li><%= link_to 'About', page_path('about') %></li>
366
366
  <li><%= link_to 'Contact', new_contact_path %></li>
367
367
  <% if user_signed_in? %>
368
+ <li><%= link_to 'Edit account', edit_user_registration_path %></li>
368
369
  <li><%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %></li>
369
370
  <% else %>
370
371
  <li><%= link_to 'Login', new_user_session_path %></li>
371
- <% end %>
372
- <% if user_signed_in? %>
373
- <li><%= link_to 'Edit account', edit_user_registration_path %></li>
374
- <% else %>
375
372
  <li><%= link_to 'Sign up', new_user_registration_path %></li>
376
373
  <% end %>
377
374
  <% if user_signed_in? %>
data/lib/generators/layout/install/install_generator.rb CHANGED
@@ -47,6 +47,7 @@ module Layout
47
47
  copy_file 'foundation5-application.js', 'app/assets/javascripts/application.js'
48
48
  remove_file 'app/assets/stylesheets/simple.css'
49
49
  remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
50
+ insert_into_file('config/application.rb', "\n\n # For Foundation 5\n config.assets.precompile += %w( vendor/modernizr )\n", :after => /^ *# config.i18n.default_locale = :de/, :force => false)
50
51
  end
51
52
  if Rails::VERSION::MAJOR.to_s == "3"
52
53
  gsub_file 'app/assets/javascripts/application.js', /\/\/= require turbolinks\n/, ''
data/lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss CHANGED
@@ -1,3 +1,9 @@
1
+ // Temporary workaround for Rails 4.1.2 pending releaase of bootstrap-sass 3.1.2
2
+ //= depend_on_asset "bootstrap/glyphicons-halflings-regular.eot"
3
+ //= depend_on_asset "bootstrap/glyphicons-halflings-regular.svg"
4
+ //= depend_on_asset "bootstrap/glyphicons-halflings-regular.ttf"
5
+ //= depend_on_asset "bootstrap/glyphicons-halflings-regular.woff"
6
+
1
7
  // import the CSS framework
2
8
  @import "bootstrap";
3
9
 
data/lib/generators/layout/navigation/navigation_generator.rb CHANGED
@@ -20,13 +20,10 @@ module Layout
20
20
  if File.exists?('config/initializers/devise.rb')
21
21
  append_file 'app/views/layouts/_navigation_links.html.erb' do <<-LINKS
22
22
  <% if user_signed_in? %>
23
+ <li><%= link_to 'Edit account', edit_user_registration_path %></li>
23
24
  <li><%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %></li>
24
25
  <% else %>
25
26
  <li><%= link_to 'Login', new_user_session_path %></li>
26
- <% end %>
27
- <% if user_signed_in? %>
28
- <li><%= link_to 'Edit account', edit_user_registration_path %></li>
29
- <% else %>
30
27
  <li><%= link_to 'Sign up', new_user_registration_path %></li>
31
28
  <% end %>
32
29
  LINKS
data/lib/rails_layout/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsLayout
2
- VERSION = "1.0.13"
2
+ VERSION = "1.0.14"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_layout
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.13
4
+ version: 1.0.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Kehoe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-23 00:00:00.000000000 Z
11
+ date: 2014-04-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler