rails_layout 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f286b5dede0a34301197d091a859c29b66b03e
-  data.tar.gz: 9d15042b9879a3e6d56bd4b50c1e970309ae28cc
+  metadata.gz: 013fe55249e20e74336135399feb15ea57f8e1c7
+  data.tar.gz: b0ca5c2409d5545430624e4f88306af221d91e8f
 SHA512:
-  metadata.gz: 9ea309f056b0d64ca8994fcbef4644e2d86a8ca3b6d5319e56590860b3d36e9d51945957bc3896d81c7e38431f18a695402eb0710f1a23b615197dd8a5e321c1
-  data.tar.gz: 1bb1235d2c9f07941fed0df0869f2dae0609137d5b1b3756126c3d2296eb9165251781cfb606669a0e293517b076e5267a107da62bff329f85fc921e21cbca36
+  metadata.gz: 334535fb11d3220fcf229a68e867eecbbd3aa1aacfa4d2272973ff8266ac985c6672c1635441c405e5e969ea6385b167f7da64850cea2e70a6f041c4df27564a
+  data.tar.gz: c9fd68db7d1d2a80d1306af25da226d6262ad4ee5ed57f286f510de8b63f21facdf4a0409c2becd816282b4cb2edc0b529d692233805f4227c59565d7bf891f8

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 0.5.0 November 11, 2013
+
+* use mixins for uniform layout across frameworks
+
 h3. 0.4.2 November 9, 2013
 
 * move 'Home' link to conform to framework examples

data/README.textile

@@ -185,7 +185,7 @@ See the files that are generated:
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/bootstrap_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
 
 and modify the file:
 
@@ -213,7 +213,7 @@ See the files that are generated:
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/bootstrap_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap3_and_overrides.css.scss
 
 and modify the file:
 

data/lib/generators/layout/USAGE

@@ -1,20 +1,35 @@
 Description:
     Creates Rails layout files suitable for various front-end frameworks.
 
+    Create simple layout files when no front-end framework is used:
+      rails generate layout simple
+
+    Create layout files suitable for Twitter Bootstrap 2.3:
+      rails generate layout bootstrap2
+
+    Create layout files suitable for Twitter Bootstrap 3.0:
+      rails generate layout bootstrap3
+
+    Create layout files suitable for Zurb Foundation 4.0:
+      rails generate layout foundation4
+
+    Remove layout files:
+      rails generate layout none
+
 Creates files:
   * app/views/layouts/application.html.erb
   * app/views/layouts/_messages.html.erb
   * app/views/layouts/_navigation.html.erb
+  * app/views/layouts/_navigation_links.html.erb
   * app/assets/stylesheets/simple.css (only for simple option)
 
-Create simple layout files when no front-end framework is used:
-  rails generate layout simple
-
-Create layout files suitable for Twitter Bootstrap 2.3:
-  rails generate layout bootstrap2
+Renames the file:
+  * app/assets/stylesheets/application.css
+to:
+  * app/assets/stylesheets/application.css.scss
 
-Create layout files suitable for Twitter Bootstrap 3.0:
-  rails generate layout bootstrap3
+Modifies the file:
+  * app/assets/javascripts/application.js
 
-Create layout files suitable for Zurb Foundation 4.0:
-  rails generate layout foundation4
+Adds the file:
+  * app/assets/stylesheets/framework_and_overrides.css.scss

data/lib/generators/layout/templates/application.css.scss

@@ -11,14 +11,3 @@
  *= require_self
  *= require_tree .
  */
-.content {
-  background-color: #eee;
-  padding: 20px;
-  margin: 0 -20px;
-  -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-  -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-  box-shadow: 0 1px 2px rgba(0,0,0,.15);
-}

data/lib/generators/layout/templates/bootstrap3-application.html.erb

@@ -9,19 +9,12 @@
     <%%= csrf_meta_tags %>
   </head>
   <body>
-    <%%# application layout styled for Twitter Bootstrap 3.0 %>
     <header>
       <%%= render 'layouts/navigation' %>
     </header>
     <main role="main">
-      <div class="container">
-         <div class="row">
-           <div class="col-md-12">
-             <%%= render 'layouts/messages' %>
-             <%%= yield %>
-           </div>
-         </div>
-      </div>
+       <%%= render 'layouts/messages' %>
+       <%%= yield %>
     </main>
   </body>
 </html>

data/lib/generators/layout/templates/bootstrap3-application.html.haml

@@ -8,15 +8,8 @@
     = javascript_include_tag "application", "data-turbolinks-track" => true
     = csrf_meta_tags
   %body
-    -# application layout styled for Twitter Bootstrap 3.0
     %header
       = render 'layouts/navigation'
     %main{:role => "main"}
-      .container
-        .container
-          .content
-            .row
-              .col-md-12
-                = render 'layouts/messages'
-                = yield
-            %footer
+      = render 'layouts/messages'
+      = yield

data/lib/generators/layout/templates/bootstrap3-navigation.html.erb

@@ -1,5 +1,5 @@
 <%# navigation styled for Twitter Bootstrap 3.0 %>
-<nav class="navbar navbar-default navbar-fixed-top">
+<nav class="navbar navbar-inverse navbar-fixed-top">
   <div class="container">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">

data/lib/generators/layout/templates/bootstrap3_and_overrides.css.scss

@@ -3,4 +3,39 @@
 
 // override for the 'Home' navigation link
 .navbar-brand {
-  font-size: inherit; }
+  font-size: inherit;
+  }
+// make all images responsive by default
+img {
+  @extend .img-responsive;
+  margin: 0 auto;
+  }
+
+// use mixins to create semantic classes
+main {
+  @extend .container;
+  background-color: #eee;
+  padding-bottom: 80px;
+  width: 100%;
+  margin-top: 51px; // accommodate the navbar
+  }
+section {
+  @extend .row;
+  margin-top: 20px;
+  }
+.column {
+  @extend .col-md-6;
+  @extend .text-center;
+  }
+.form {
+  @extend .col-md-6;
+  }
+.form-centered {
+  @extend .col-md-6;
+  @extend .text-center;
+  }
+.submit {
+  @extend .btn;
+  @extend .btn-primary;
+  @extend .btn-lg;
+  }

data/lib/generators/layout/templates/foundation4-application.html.erb

@@ -11,23 +11,12 @@
     <%%= csrf_meta_tags %>
   </head>
   <body>
-    <%%# application layout styled for Zurb Foundation 4 %>
     <header>
       <%%= render 'layouts/navigation' %>
     </header>
     <main role="main">
-      <div class="container">
-        <div class="content">
-          <div class="row">
-            <div class="twelve columns">
-              <%%= render 'layouts/messages' %>
-              <%%= yield %>
-            </div>
-          </div>
-          <footer>
-          </footer>
-        </div>
-      </div>
+       <%%= render 'layouts/messages' %>
+       <%%= yield %>
     </main>
   </body>
 </html>

data/lib/generators/layout/templates/foundation4-application.html.haml

@@ -10,14 +10,8 @@
     = javascript_include_tag "application", "data-turbolinks-track" => true
     = csrf_meta_tags
   %body
-    -# application layout styled for Zurb Foundation 4
     %header
       = render 'layouts/navigation'
     %main{:role => "main"}
-      .container
-        .content
-          .row
-            .twelve.columns
-              = render 'layouts/messages'
-              = yield
-          %footer
+      = render 'layouts/messages'
+      = yield

data/lib/generators/layout/templates/foundation4-navigation.html.erb

@@ -4,9 +4,9 @@
     <li class="name"><%= link_to 'Home', root_path %></li>
     <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
   </ul>
-  <section class="top-bar-section">
+  <div class="top-bar-section">
     <ul>
       <%= render 'layouts/navigation_links' %>
     </ul>
-  </section>
+  </div>
 </nav>

data/lib/generators/layout/templates/foundation4-navigation.html.haml

@@ -6,6 +6,6 @@
     %li.toggle-topbar.menu-icon
       %a{:href => "#"}
         %span Menu
-  %section.top-bar-section
+  .top-bar-section
     %ul
       = render 'layouts/navigation_links'

data/lib/generators/layout/templates/foundation4_and_overrides.css.scss

@@ -9,3 +9,35 @@
   font-weight: bold;
   color: white;
   padding: 0 15px; }
+
+// use mixins to create semantic classes
+@mixin large12-columns {
+  @extend .large-12;
+  @extend .columns;
+  }
+@mixin large6-columns-centered {
+  @extend .large-6;
+  @extend .columns;
+  @extend .text-center;
+  }
+main {
+  @include large12-columns;
+  background-color: #eee;
+  }
+section {
+  @extend .row;
+  margin-top: 20px;
+  }
+.column {
+  @include large6-columns-centered;
+  }
+.form {
+  @include grid-column(6);
+  }
+.form-centered {
+  @include large6-columns-centered;
+  }
+.submit {
+  @extend .button;
+  @extend .radius;
+  }

data/lib/generators/layout/templates/simple-application.html.erb

@@ -9,18 +9,12 @@
     <%%= csrf_meta_tags %>
   </head>
   <body>
-    <div class="container">
-      <header>
-        <%%= render 'layouts/navigation' %>
-      </header>
-      <main role="main">
-        <div class="content">
-          <%%= render 'layouts/messages' %>
-          <%%= yield %>
-        </div>
-      </main>
-      <footer>
-      </footer>
-    </div>
+    <header>
+      <%%= render 'layouts/navigation' %>
+    </header>
+    <main role="main">
+      <%%= render 'layouts/messages' %>
+      <%%= yield %>
+    </main>
   </body>
 </html>

data/lib/generators/layout/templates/simple-application.html.haml

@@ -8,11 +8,8 @@
     = javascript_include_tag "application", "data-turbolinks-track" => true
     = csrf_meta_tags
   %body
-    .container
-      %header
-        = render 'layouts/navigation'
-      %main{:role => "main"}
-        .content
-          = render 'layouts/messages'
-          = yield
-      %footer
+    %header
+      = render 'layouts/navigation'
+    %main{:role => "main"}
+      = render 'layouts/messages'
+      = yield

data/lib/generators/layout/templates/simple-navigation.html.erb

@@ -1,3 +1,4 @@
 <ul class="nav">
+  <li><%= link_to 'Home', root_path %></li>
   <%= render 'layouts/navigation_links' %>
 </ul>

data/lib/generators/layout/templates/simple-navigation.html.haml

@@ -1,2 +1,3 @@
 %ul.nav
+  %li= link_to 'Home', root_path
   = render 'layouts/navigation_links'

data/lib/generators/layout/templates/simple.css

@@ -1,6 +1,11 @@
 /*
  * Simple CSS stylesheet for a navigation bar and flash messages.
  */
+main {
+  background-color: #eee;
+  padding-bottom: 80px;
+  width: 100%;
+  }
 header {
   border: 1px solid #d4d4d4;
   background-image: linear-gradient(to bottom, white, #f2f2f2);

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler