rails_layout 1.0.3 → 1.0.4

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 +4 -0
  3. data/lib/generators/layout/install/templates/foundation5-application.html.erb +2 -4
  4. data/lib/generators/layout/install/templates/foundation5-application.html.haml +2 -4
  5. data/lib/generators/layout/install/templates/foundation5-application.html.slim +2 -4
  6. data/lib/generators/layout/install/templates/foundation5-application.js +1 -1
  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: 87993f895006e34a5a2bf38ae14e2f1dc4cd7a71
4
- data.tar.gz: a643ec17d3863e5e31e6c745a00bbfcd3bf48693
3
+ metadata.gz: 4eb0ec10a17ea2b86d361cf3976d13efc2b9f8f4
4
+ data.tar.gz: d7402fe67cfe735389509cab42dacda674ef86de
5
5
  SHA512:
6
- metadata.gz: 8774ba64cb3ffd028f2d294a1df48d62723ca4e762173ccf50c91c7ffcf0989fac10a8cd8a9a54d300c531558ee16a7721d05fc5f65ccfe10e8a2fafbb84781d
7
- data.tar.gz: e347ebf7dbf3905b17ac6a0d3a941c0722a8e0ab6179ad8cf794de042936336fd086e81288f498f69de2256712d1657f4a6f7526a9ef004da2eebfd887509f1b
6
+ metadata.gz: 42c052e635d5636e8c46133ade9ba41bd5abb9bedb89d3b2ec80d4c0e9793d05f4e2f6f9b6817caeebc2577d878da692053507fc5227bc328d261ddfd30b89cf
7
+ data.tar.gz: 5c0b67227b631d32fc706a0033c11417a8563aab60e8ab0d4ad3543c0e3b9c8fd0a6598e75137ed81791f04a451956aef8da1ea700a57aea026ca2308e8bac29
data/CHANGELOG.textile CHANGED
@@ -1,5 +1,9 @@
1
1
  h1. CHANGELOG
2
2
 
3
+ h3. 1.0.4 January 16, 2014
4
+
5
+ * Foundation 5.0.3 is now compatible with Rails Turbolinks and the asset pipeline
6
+
3
7
  h3. 1.0.3 January 11, 2014
4
8
 
5
9
  * add missing 'autofocus' to Devise views
data/lib/generators/layout/install/templates/foundation5-application.html.erb CHANGED
@@ -4,8 +4,8 @@
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" %>
8
- <%%# Foundation 5 won't work with Rails Turbolinks %>
7
+ <%%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
8
+ <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
9
9
  <%%# Modernizr is required for Zurb Foundation %>
10
10
  <%%= javascript_include_tag "vendor/modernizr" %>
11
11
  <%%= csrf_meta_tags %>
@@ -18,7 +18,5 @@
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" %>
23
21
  </body>
24
22
  </html>
data/lib/generators/layout/install/templates/foundation5-application.html.haml CHANGED
@@ -4,8 +4,8 @@
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"
8
- -# Foundation 5 won't work with Rails Turbolinks
7
+ = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
8
+ = javascript_include_tag "application", "data-turbolinks-track" => true
9
9
  -# Modernizr is required for Zurb Foundation
10
10
  = javascript_include_tag "vendor/modernizr"
11
11
  = csrf_meta_tags
@@ -15,5 +15,3 @@
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/install/templates/foundation5-application.html.slim CHANGED
@@ -5,8 +5,8 @@ html
5
5
  title
6
6
  = content_for?(:title) ? yield(:title) : '<%= app_name.underscore.titleize %>'
7
7
  meta name="description" content="#{content_for?(:description) ? yield(:description) : '<%= app_name.underscore.titleize %>'}"
8
- = stylesheet_link_tag "application"
9
- / Foundation 5 won't work with Rails Turbolinks
8
+ == stylesheet_link_tag "application", :media => "all", "data-turbolinks-track" => true
9
+ == javascript_include_tag "application", "data-turbolinks-track" => true
10
10
  / Modernizr is required for Zurb Foundation
11
11
  == javascript_include_tag "vendor/modernizr"
12
12
  == csrf_meta_tags
@@ -16,5 +16,3 @@ html
16
16
  main[role="main"]
17
17
  == render 'layouts/messages'
18
18
  == yield
19
- / Foundation 5 won't work when application.js is included in HEAD
20
- == javascript_include_tag "application"
data/lib/generators/layout/install/templates/foundation5-application.js CHANGED
@@ -12,7 +12,7 @@
12
12
  //
13
13
  //= require jquery
14
14
  //= require jquery_ujs
15
- // Note: Foundation 5 won't work with turbolinks
15
+ //= require turbolinks
16
16
  //= require foundation
17
17
  //= require_tree .
18
18
  $(function() {
data/lib/rails_layout/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsLayout
2
- VERSION = "1.0.3"
2
+ VERSION = "1.0.4"
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.3
4
+ version: 1.0.4
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-01-11 00:00:00.000000000 Z
11
+ date: 2014-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler