rails_layout 0.4.1 → 0.4.2
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.
- checksums.yaml +4 -4
- data/CHANGELOG.textile +5 -0
- data/README.textile +2 -1
- data/lib/generators/layout/layout_generator.rb +1 -1
- data/lib/generators/layout/templates/bootstrap2-navigation.html.erb +18 -6
- data/lib/generators/layout/templates/bootstrap2-navigation.html.haml +12 -4
- data/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss +1 -1
- data/lib/generators/layout/templates/bootstrap3-navigation.html.erb +1 -0
- data/lib/generators/layout/templates/bootstrap3-navigation.html.haml +1 -0
- data/lib/generators/layout/templates/bootstrap3_and_overrides.css.scss +5 -1
- data/lib/generators/layout/templates/foundation4-application.html.erb +1 -1
- data/lib/generators/layout/templates/foundation4-navigation.html.erb +1 -1
- data/lib/generators/layout/templates/foundation4-navigation.html.haml +1 -1
- data/lib/generators/layout/templates/foundation4_and_overrides.css.scss +11 -0
- data/lib/generators/layout/templates/navigation_links.html.erb +0 -1
- data/lib/generators/navigation/templates/navigation_links.html.erb +0 -1
- data/lib/rails_layout/version.rb +1 -1
- metadata +3 -3
- data/lib/generators/layout/templates/foundation_and_overrides.css.scss +0 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a8f286b5dede0a34301197d091a859c29b66b03e
|
|
4
|
+
data.tar.gz: 9d15042b9879a3e6d56bd4b50c1e970309ae28cc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9ea309f056b0d64ca8994fcbef4644e2d86a8ca3b6d5319e56590860b3d36e9d51945957bc3896d81c7e38431f18a695402eb0710f1a23b615197dd8a5e321c1
|
|
7
|
+
data.tar.gz: 1bb1235d2c9f07941fed0df0869f2dae0609137d5b1b3756126c3d2296eb9165251781cfb606669a0e293517b076e5267a107da62bff329f85fc921e21cbca36
|
data/CHANGELOG.textile
CHANGED
data/README.textile
CHANGED
|
@@ -241,7 +241,7 @@ See the files that are generated:
|
|
|
241
241
|
|
|
242
242
|
The RailsLayout gem will create the file:
|
|
243
243
|
|
|
244
|
-
* "app/assets/stylesheets/
|
|
244
|
+
* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4_and_overrides.css.scss
|
|
245
245
|
|
|
246
246
|
and modify the file:
|
|
247
247
|
|
|
@@ -262,6 +262,7 @@ The RailsLayout gem will remove files it may have added:
|
|
|
262
262
|
* app/assets/stylesheets/simple.css
|
|
263
263
|
* app/assets/stylesheets/bootstrap_and_overrides.css.scss
|
|
264
264
|
* app/assets/stylesheets/foundation_and_overrides.css.scss
|
|
265
|
+
* app/assets/stylesheets/framework_and_overrides.css.scss
|
|
265
266
|
|
|
266
267
|
Additionally, it will restore these files to the default versions:
|
|
267
268
|
|
|
@@ -36,7 +36,7 @@ module Layout
|
|
|
36
36
|
remove_file 'app/assets/stylesheets/simple.css'
|
|
37
37
|
remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
|
|
38
38
|
when 'foundation4'
|
|
39
|
-
copy_file '
|
|
39
|
+
copy_file 'foundation4_and_overrides.css.scss', 'app/assets/stylesheets/framework_and_overrides.css.scss'
|
|
40
40
|
copy_file 'foundation4-application.js', 'app/assets/javascripts/application.js'
|
|
41
41
|
remove_file 'app/assets/stylesheets/simple.css'
|
|
42
42
|
remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
|
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
<%# navigation styled for Twitter Bootstrap 2.3 %>
|
|
2
|
-
<div class="navbar
|
|
3
|
-
<
|
|
2
|
+
<div class="navbar">
|
|
3
|
+
<div class="navbar-inner">
|
|
4
4
|
<div class="container">
|
|
5
|
-
<
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
|
6
|
+
<span class="icon-bar"></span>
|
|
7
|
+
<span class="icon-bar"></span>
|
|
8
|
+
<span class="icon-bar"></span>
|
|
9
|
+
</a>
|
|
10
|
+
<div class="nav-collapse collapse">
|
|
11
|
+
<div class="navbar navbar-fixed-top">
|
|
12
|
+
<nav class="navbar-inner">
|
|
13
|
+
<ul class="nav">
|
|
14
|
+
<li><%= link_to 'Home', root_path %><li>
|
|
15
|
+
<%= render 'layouts/navigation_links' %>
|
|
16
|
+
</ul>
|
|
17
|
+
</nav>
|
|
18
|
+
</div>
|
|
19
|
+
</div>
|
|
8
20
|
</div>
|
|
9
|
-
</
|
|
21
|
+
</div>
|
|
10
22
|
</div>
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
-# navigation styled for Twitter Bootstrap 2.3
|
|
2
|
-
.navbar
|
|
3
|
-
|
|
2
|
+
.navbar
|
|
3
|
+
.navbar-inner
|
|
4
4
|
.container
|
|
5
|
-
%
|
|
6
|
-
|
|
5
|
+
%a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
|
|
6
|
+
%span.icon-bar
|
|
7
|
+
%span.icon-bar
|
|
8
|
+
%span.icon-bar
|
|
9
|
+
.nav-collapse.collapse
|
|
10
|
+
.navbar.navbar-fixed-top
|
|
11
|
+
%nav.navbar-inner
|
|
12
|
+
%ul.nav
|
|
13
|
+
= link_to 'Home', root_path, class: 'brand'
|
|
14
|
+
= render 'layouts/navigation_links'
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<%# navigation styled for Zurb Foundation 4 %>
|
|
2
2
|
<nav class="top-bar">
|
|
3
3
|
<ul class="title-area">
|
|
4
|
-
<li class="name"
|
|
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>
|
|
6
6
|
</ul>
|
|
7
7
|
<section class="top-bar-section">
|
data/lib/rails_layout/version.rb
CHANGED
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.4.
|
|
4
|
+
version: 0.4.2
|
|
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-
|
|
11
|
+
date: 2013-11-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -78,7 +78,7 @@ files:
|
|
|
78
78
|
- lib/generators/layout/templates/foundation4-messages.html.haml
|
|
79
79
|
- lib/generators/layout/templates/foundation4-navigation.html.erb
|
|
80
80
|
- lib/generators/layout/templates/foundation4-navigation.html.haml
|
|
81
|
-
- lib/generators/layout/templates/
|
|
81
|
+
- lib/generators/layout/templates/foundation4_and_overrides.css.scss
|
|
82
82
|
- lib/generators/layout/templates/navigation_links.html.erb
|
|
83
83
|
- lib/generators/layout/templates/none-application.html.erb
|
|
84
84
|
- lib/generators/layout/templates/none-application.html.haml
|