rails_layout 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f4cb2d7684106cd92eafacf25404500f020a6581
4
- data.tar.gz: d8acf6da27ec2a6d3602d814e4f4653ddae60eee
3
+ metadata.gz: a8f286b5dede0a34301197d091a859c29b66b03e
4
+ data.tar.gz: 9d15042b9879a3e6d56bd4b50c1e970309ae28cc
5
5
  SHA512:
6
- metadata.gz: f71d2f02f29f4949bdc4e557e703375073eb5b3b116658c5658be2c785f32f73efa3ee5ef15ada53d1b8be5b62547fc6d74cd068ec9d75751f00831a72db32af
7
- data.tar.gz: e7d98d8105772adf776c4b353438fd254803c8c506490304c65ee351cab5b590d0ce9938ec31c876b9b224cf9133859640387657c403357572d76193b62e9c85
6
+ metadata.gz: 9ea309f056b0d64ca8994fcbef4644e2d86a8ca3b6d5319e56590860b3d36e9d51945957bc3896d81c7e38431f18a695402eb0710f1a23b615197dd8a5e321c1
7
+ data.tar.gz: 1bb1235d2c9f07941fed0df0869f2dae0609137d5b1b3756126c3d2296eb9165251781cfb606669a0e293517b076e5267a107da62bff329f85fc921e21cbca36
data/CHANGELOG.textile CHANGED
@@ -1,5 +1,10 @@
1
1
  h1. CHANGELOG
2
2
 
3
+ h3. 0.4.2 November 9, 2013
4
+
5
+ * move 'Home' link to conform to framework examples
6
+ * add responsive navbar for Twitter Bootstrap 2.3
7
+
3
8
  h3. 0.4.1 November 9, 2013
4
9
 
5
10
  * add option to generate navigation links for Devise
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/foundation_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation_and_overrides.css.scss
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 'foundation_and_overrides.css.scss', 'app/assets/stylesheets/framework_and_overrides.css.scss'
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 navbar-fixed-top">
3
- <nav class="navbar-inner">
2
+ <div class="navbar">
3
+ <div class="navbar-inner">
4
4
  <div class="container">
5
- <ul class="nav">
6
- <%= render 'layouts/navigation_links' %>
7
- </ul>
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
- </nav>
21
+ </div>
10
22
  </div>
@@ -1,6 +1,14 @@
1
1
  -# navigation styled for Twitter Bootstrap 2.3
2
- .navbar.navbar-fixed-top
3
- %nav.navbar-inner
2
+ .navbar
3
+ .navbar-inner
4
4
  .container
5
- %ul.nav
6
- = render 'layouts/navigation_links'
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,3 +1,3 @@
1
+ // import the CSS framework
1
2
  @import "bootstrap";
2
- body { padding-top: 60px; }
3
3
  @import "bootstrap-responsive";
@@ -8,6 +8,7 @@
8
8
  <span class="icon-bar"></span>
9
9
  <span class="icon-bar"></span>
10
10
  </button>
11
+ <%= link_to 'Home', root_path, class: 'navbar-brand' %>
11
12
  </div>
12
13
  <div class="collapse navbar-collapse">
13
14
  <ul class="nav navbar-nav">
@@ -7,6 +7,7 @@
7
7
  %span.icon-bar
8
8
  %span.icon-bar
9
9
  %span.icon-bar
10
+ = link_to 'Home', root_path, class: 'navbar-brand'
10
11
  .collapse.navbar-collapse
11
12
  %ul.nav.navbar-nav
12
13
  = render 'layouts/navigation_links'
@@ -1,2 +1,6 @@
1
+ // import the CSS framework
1
2
  @import "bootstrap";
2
- body { padding-top: 60px; }
3
+
4
+ // override for the 'Home' navigation link
5
+ .navbar-brand {
6
+ font-size: inherit; }
@@ -13,7 +13,7 @@
13
13
  <body>
14
14
  <%%# application layout styled for Zurb Foundation 4 %>
15
15
  <header>
16
- <%%= render 'layouts/navigation' %>>
16
+ <%%= render 'layouts/navigation' %>
17
17
  </header>
18
18
  <main role="main">
19
19
  <div class="container">
@@ -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"><!-- add site name or logo here --></li>
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">
@@ -2,7 +2,7 @@
2
2
  %nav.top-bar
3
3
  %ul.title-area
4
4
  %li.name
5
- -# add site name or logo here
5
+ = link_to 'Home', root_path
6
6
  %li.toggle-topbar.menu-icon
7
7
  %a{:href => "#"}
8
8
  %span Menu
@@ -0,0 +1,11 @@
1
+ // import the CSS framework
2
+ @import "foundation";
3
+
4
+ // override for the 'Home' navigation link
5
+ .top-bar .name {
6
+ font-size: 0.8125em;
7
+ line-height: 45px; }
8
+ .top-bar .name a {
9
+ font-weight: bold;
10
+ color: white;
11
+ padding: 0 15px; }
@@ -1,2 +1 @@
1
1
  <%# add navigation links to this file %>
2
- <li><%= link_to 'Home', root_path %></li>
@@ -1,2 +1 @@
1
1
  <%# add navigation links to this file %>
2
- <li><%= link_to 'Home', root_path %></li>
@@ -1,3 +1,3 @@
1
1
  module RailsLayout
2
- VERSION = "0.4.1"
2
+ VERSION = "0.4.2"
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.4.1
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-09 00:00:00.000000000 Z
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/foundation_and_overrides.css.scss
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
@@ -1,2 +0,0 @@
1
- // Required global settings and mixins for Foundation
2
- @import "foundation";