rails_layout 0.5.4 → 0.5.5

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.textile +4 -0
  3. data/README.textile +9 -6
  4. data/lib/generators/layout/templates/foundation5-application.html.erb +5 -3
  5. data/lib/generators/layout/templates/foundation5-application.html.haml +6 -4
  6. data/lib/generators/layout/templates/foundation5-application.js +1 -1
  7. data/lib/generators/layout/templates/foundation5-navigation.html.erb +1 -1
  8. data/lib/generators/layout/templates/foundation5-navigation.html.haml +1 -0
  9. data/lib/rails_layout/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b969f789ec6da69a52b1751b38dd60bf183debe7
4
- data.tar.gz: 87ca4674709e15dbf1c0584cc14369f12e143594
3
+ metadata.gz: aa4e4e6dfd48aff0fcdbdc9292e8d71fb7b33f98
4
+ data.tar.gz: 19365fc5aa876fe53cdec6250e24299536bcb4c2
5
5
  SHA512:
6
- metadata.gz: b3ba2b5a7ffe88116926d04388dcf7b9b45f6aacc8a61f3c5d9286ab6bdd9d468a597e0b72b6f9963f13f757b1a4b0853213f9d2bdb04bf1d9208b879678fa96
7
- data.tar.gz: a5e4e08eb9792dd36a4006250f4740bcdb9c43bdff17c9c3fa42481b7b26d654616911dcf442d935db6ec69b445d6d0973d5ce8865e9589ee287516d56bb2d31
6
+ metadata.gz: d61adaffd37265851e43024a17c588afef79f7424263851ca8d6a330ecc0ce71ebc7a64255004bd04831d40946418e85d4b1cee4e315cf5356660a35a834c417
7
+ data.tar.gz: 4f1aea71c81dd6032fb22ca3814593eb02552e1a690a7155356d69b729e046c59f7d2dd4777ea0b3acf07ccd368c83927632ef006b46b029cd02dee5ce2f1eb7
data/CHANGELOG.textile CHANGED
@@ -1,5 +1,9 @@
1
1
  h1. CHANGELOG
2
2
 
3
+ h3. 0.5.5 November 22, 2013
4
+
5
+ * fixes for Zurb Foundation 5.0
6
+
3
7
  h3. 0.5.4 November 22, 2013
4
8
 
5
9
  * support for Zurb Foundation 5.0
data/README.textile CHANGED
@@ -7,19 +7,19 @@ Use it to set up your choice of front-end framework:
7
7
  * Twitter Bootstrap 2.3
8
8
  * Twitter Bootstrap 3.0
9
9
  * Zurb Foundation 4.0
10
- * Zurb Foundation 4.0
10
+ * Zurb Foundation 5.0
11
11
 
12
12
  Add it to your Rails application Gemfile, then use the generator.
13
13
 
14
14
  It will rename *application.css* to *application.css.scss*.
15
15
 
16
- And add:
16
+ It will add:
17
17
 
18
- * framework_and_overrides.css.scss
18
+ * *framework_and_overrides.css.scss*
19
19
 
20
20
  And modify the JavaScript asset file:
21
21
 
22
- * application.js
22
+ * *application.js*
23
23
 
24
24
  It will set up a default application layout.
25
25
 
@@ -85,8 +85,6 @@ h2. Installing a Front-End Framework
85
85
 
86
86
  Instead of following the "instructions for Twitter Bootstrap":http://railsapps.github.io/twitter-bootstrap-rails.html or "Zurb Foundation":http://foundation.zurb.com/docs/rails.html to install a front-end framework, add the gems you need. Then use the RailsLayout gem. It will set up your assets files.
87
87
 
88
- h3. Install Gems for a Front-End Framework
89
-
90
88
  Add the gems you need to your Rails application Gemfile:
91
89
 
92
90
  h4. Twitter Bootstrap 2.3
@@ -114,6 +112,11 @@ h4. Zurb Foundation 5.0
114
112
  gem 'foundation-rails'
115
113
  </pre>
116
114
 
115
+ Note: Check the status of these issues before using Foundation 5.0:
116
+
117
+ * "Foundation 5 requires JavaScript included in BODY not HEAD":https://github.com/zurb/foundation/issues/3643
118
+ * "Foundation 5 topbar incompatible with Rails Turbolinks":https://github.com/zurb/foundation/issues/3642
119
+
117
120
  h4. Use Bundler
118
121
 
119
122
  Use Bundler to install the gem:
data/lib/generators/layout/templates/foundation5-application.html.erb CHANGED
@@ -4,10 +4,10 @@
4
4
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
5
5
  <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name.underscore.titleize %>" %></title>
6
6
  <meta name="description" content="<%%= content_for?(:description) ? yield(:description) : "<%= app_name.underscore.titleize %>" %>">
7
- <%%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
7
+ <%%= stylesheet_link_tag "application" %>
8
+ <%%# Foundation 5 won't work with Rails Turbolinks %>
8
9
  <%%# Modernizr is required for Zurb Foundation %>
9
- <%%= javascript_include_tag "vendor/custom.modernizr" %>
10
- <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
10
+ <%%= javascript_include_tag "vendor/modernizr" %>
11
11
  <%%= csrf_meta_tags %>
12
12
  </head>
13
13
  <body>
@@ -18,5 +18,7 @@
18
18
  <%%= render 'layouts/messages' %>
19
19
  <%%= yield %>
20
20
  </main>
21
+ <%%# Foundation 5 won't work when application.js is included in HEAD %>
22
+ <%%= javascript_include_tag "application" %>
21
23
  </body>
22
24
  </html>
data/lib/generators/layout/templates/foundation5-application.html.haml CHANGED
@@ -4,10 +4,10 @@
4
4
  %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
5
5
  %title= content_for?(:title) ? yield(:title) : '<%= app_name.underscore.titleize %>'
6
6
  %meta{:name => "description", :content => "#{content_for?(:description) ? yield(:description) : '<%= app_name.underscore.titleize %>'}"}
7
- = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
8
- -# Modernizr is required for Zurb Foundation
9
- = javascript_include_tag "vendor/custom.modernizr"
10
- = javascript_include_tag "application", "data-turbolinks-track" => true
7
+ = stylesheet_link_tag "application"
8
+ -# Foundation 5 won't work with Rails Turbolinks
9
+ -# Modernizr is required for Zurb Foundation
10
+ = javascript_include_tag "vendor/modernizr"
11
11
  = csrf_meta_tags
12
12
  %body
13
13
  %header
@@ -15,3 +15,5 @@
15
15
  %main{:role => "main"}
16
16
  = render 'layouts/messages'
17
17
  = yield
18
+ -# Foundation 5 won't work when application.js is included in HEAD
19
+ = javascript_include_tag "application"
data/lib/generators/layout/templates/foundation5-application.js CHANGED
@@ -12,7 +12,7 @@
12
12
  //
13
13
  //= require jquery
14
14
  //= require jquery_ujs
15
- //= require turbolinks
15
+ // Note: Foundation 5 won't work with turbolinks
16
16
  //= require foundation
17
17
  //= require_tree .
18
18
  $(function() {
data/lib/generators/layout/templates/foundation5-navigation.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <%# navigation styled for Zurb Foundation 5 %>
2
- <nav class="top-bar" "data-topbar">
2
+ <nav class="top-bar" data-topbar>
3
3
  <ul class="title-area">
4
4
  <li class="name"><%= link_to 'Home', root_path %></li>
5
5
  <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
data/lib/generators/layout/templates/foundation5-navigation.html.haml CHANGED
@@ -1,4 +1,5 @@
1
1
  -# navigation styled for Zurb Foundation 5
2
+ -# the syntax for data-topbar may need to change for Zurb Foundation 5
2
3
  %nav.top-bar{:data-topbar => true}
3
4
  %ul.title-area
4
5
  %li.name
data/lib/rails_layout/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsLayout
2
- VERSION = "0.5.4"
2
+ VERSION = "0.5.5"
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: 0.5.4
4
+ version: 0.5.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Kehoe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-22 00:00:00.000000000 Z
11
+ date: 2013-11-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler