edge_framework 1.2.2 → 1.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTJiZTBmYzgxMTljNzM0NTBhMjYwNjZiZDc3OWVkOTFmNjRkOTQyOQ==
+    NmM1NjExZjRhOWU0NDkwMTVmMWM3NDdjMjhlNzM3MTBjN2U3MWI3Zg==
   data.tar.gz: !binary |-
-    ZTczMTRkYTA2YzZhN2MzOWZiOTQyMWI2ZGIwYTZiNTk4NmU5YTBhYQ==
+    ZjZkMzY2MzNmYWUzOTI0M2MxZTIyNmUyNjFjODk3ZjJhNzY5NTJlYw==
 SHA512:
   metadata.gz: !binary |-
-    NjI2ZGU2YTJjMjE1NzBjY2E5N2FkZmE0Y2IxNTMzNzFhYTBkYjcwMzA3YjI1
-    NjJlNGYxNTlmNjhlMjg5MTZjYjRiZGU0ODgyNWFiODRlMmE1MmFmMjNjMDNh
-    ODBiYzYzNWQyM2Q5YjIxNTE0NzZmYmZiZjhlN2FjZDgxYTVjZTk=
+    MWMwNzUzZDA1Yzc5NTViOGZhNDVmMGE1ODkzNTY1MWNmMjFlNTM1YjA5ZGIw
+    ODA5ZWU5MWExNjYzNTdjNzUyN2FlNWY4N2Q0YzlkMDU4NTc0ZDM0ZGRkMDA5
+    YmMwZjYwNDk2MTJlMTFkZjRlMTBjN2VjNjMyMzAzZGZjNzBjNTI=
   data.tar.gz: !binary |-
-    ZmM2MjViMjgwMDRkOWE0Y2M3NWIzMzZhMDBiNzRhODU2Mjc3NDRlZDhlMDZm
-    NDkyYWIwMzgwYWRjNTE1NDI0ZWNiYWJmNzM4OTA5N2FhYzM5MDcxYmFmOThi
-    ZDkyMDY2MzMzNGIzNjYxYzVmYTc1NTJlM2FmMmEyNDMyNDkxN2M=
+    Nzc2MjQ4NzJkNGZkNTE0MzlhZDI4YWI1MmYzYzM5YTAwMmRjM2NmMGE1N2E0
+    YzJlNThmNWJiMDE3ZWFiYmYxMmJiNTI3MmY4YTEyYTkyYTk2Y2Q5YTJjMDUw
+    OWY1YmUxNjdiNjZkOGRjYzA1ZDg3MmViOWMzNzNkMjE1ZGEzNTg=

data/assets/kitchen-sink.html

@@ -433,39 +433,56 @@
   </div>
 </div> -->
 
-<div class="row" data-page="grid">
-  <div class="large-12 columns">
+<!-- <div data-page="grid">
+  <div>
     <div class="demo-grid">
       <h1>Grid</h1>
         <div class="row">
-          <div class="large-6 columns"><p>6</p></div>
-          <div class="large-6 columns"><p>6</p></div>
+          <div class="large-4 small-4 columns"><p>l4 s4</p></div>
+          <div class="large-4 small-4 columns"><p>l4 s4</p></div>
+          <div class="large-4 small-4 columns"><p>l4 s4</p></div>
         </div>
         <div class="row">
-          <div class="large-8 columns"><p>8</p></div>
-          <div class="large-4 columns"><p>4</p></div>
+          <div class="large-6 small-9 columns"><p>l6</p></div>
+          <div class="large-6 small-3 columns"><p>l6</p></div>
         </div>
       
       <h1>Collapsed Grid</h1>
         <div class="row collapse">
-          <div class="large-6 columns"><p>6</p></div>
-          <div class="large-6 columns"><p>6</p></div>
+          <div class="large-6 small-6 columns"><p>l6 s6</p></div>
+          <div class="large-6 small-6 columns"><p>l6 s6</p></div>
         </div>
         <div class="row collapse">
           <div class="large-8 columns"><p>8</p></div>
           <div class="large-4 columns"><p>4</p></div>
         </div>
 
-      <h1>Responsive Grid</h1>
-        <div class="row">
-          <div class="large-4 small-4 columns"><p>large-4 small-4</p></div>
-          <div class="large-4 small-4 columns"><p>large-4 small-4</p></div>
-          <div class="large-4 small-4 columns"><p>large-4 small-4</p></div>
-        </div>
+      <h1>Nested Collapsed vs. Nested</h1>
         <div class="row">
-          <div class="large-6 small-9 columns"><p>large-6 small-9</p></div>
-          <div class="large-6 small-3 columns"><p>large-6 small-3</p></div>
+          <div class="large-6 small-6 columns">
+            <p>l6 s6</p>
+            <div class="row collapse">
+              <div class="large-9 small-6 column">
+                <p>l9 s6</p>
+              </div>
+              <div class="large-3 small-6 column">
+                <p>l3 s6</p>
+              </div>
+            </div>
+          </div>
+          <div class="large-6 small-6 columns">
+            <p>l6 s6</p>
+            <div class="row">
+              <div class="large-9 small-6 column">
+                <p>l9 s6</p>
+              </div>
+              <div class="large-3 small-6 column">
+                <p>l3 s6</p>
+              </div>
+            </div>
+          </div>
         </div>
+      
 
       <h1>Offset and Source Ordering</h1>
         <div class="row">
@@ -564,7 +581,7 @@
         
     </div>
   </div>
-</div>
+</div> -->
 
 <!-- <section class="row" data-page="visibility">
   <div class="large-12 column">
@@ -676,7 +693,7 @@
 </section>
  -->
 
-<!-- <section class="row" data-page="custom-grid">
+<section class="row" data-page="custom-grid">
   <div class="large-12 column">
     <div class="demo-grid">
       
@@ -795,7 +812,7 @@
       
     </div>
   </div>
-</section> -->
+</section>
 
 <!-- <section class="row" data-page="design-grid">
   <div class="large-12 column demo-grid">

data/assets/sass/edge/_helpers.scss

@@ -2,7 +2,6 @@
 @import "helpers/sprites";
 @import "helpers/sticky-footer";
 
-$disable-output : true;
 $user-mode  : true; // add extra feature to some Component's mixin
 
 @import "components";

data/assets/sass/edge/components/_grid.scss

@@ -68,6 +68,8 @@ $column-gutter   : 20px !default;
   // Only collapsed
   @else if $collapse {
     margin: 0 auto;
+    padding-right: $gutter / 2;
+    padding-left: $gutter / 2;
     width: 100%;
     max-width: $width;
     
@@ -84,24 +86,38 @@ $column-gutter   : 20px !default;
 
 @mixin row(
   $gutter   : 0px,
-  $width    : $row-max-width,
+  $width    : 0px,
   $collapse : false) {
   
-  // If gutter is passed as param, calculate it
-  @if $gutter != $column-gutter {
-    max-width: $width + $gutter;
-
-    @if not $responsive {
-      min-width: $width + $gutter;
-    }
-  }
-
+  // Nested row, only output if gutter is specified
   @if $gutter > 0 {
     .row & {
       margin-right: -($gutter / 2);
       margin-left: -($gutter / 2);
+      min-width: 0;
+    }
+  } @else {
+    .row & {
+      min-width: 0;
     }
   }
+  
+  // Set default value if 0
+  @if $width == 0 { $width: $row-max-width; }
+  @if $gutter == 0 { $gutter: $column-gutter; }
+  
+  // Max width for outer row
+  max-width: $width + $gutter;
+
+  @if not $responsive {
+    min-width: $width + $gutter;
+  }
+  
+  // Collapsed behavior
+  @if $collapse {
+    padding-right: $gutter / 2;
+    padding-left: $gutter / 2;
+  }
 }
 
 // ------------------------------
@@ -281,6 +297,11 @@ $column-gutter   : 20px !default;
   // Collapsed row
   &.collapse {
     @include base-row($collapse:true);
+    
+    .row {
+      @include base-row($nest:true, $collapse:true);
+    }
+
     .column,
     .columns {
       @include base-column($collapse:true);

data/assets/sass/edge.scss

@@ -1,6 +1,6 @@
 /* ------------------------------------------
 - EDGE Framework - github.com/HennerS/Edge
-- v1.2.2 (Ezalor)
+- v1.2.3 (Ezalor)
 ------------------------------------------ */
 
 @import "edge/base";

data/lib/edge/install_generator.rb

@@ -19,30 +19,33 @@ module Edge
         style_file = File.join(File.dirname(__FILE__), "..", "..", "template", "base", "assets", "sass", "app.scss")
         create_file "app/assets/stylesheets/app.scss", File.read(style_file)
 
+        script_file = File.join(File.dirname(__FILE__), "..", "..", "template", "rails", "app.js")
+        create_file "app/assets/javascripts/app.js", File.read(script_file)
+
         insert_into_file "app/assets/stylesheets/application#{detect_css_format[0]}", "#{detect_css_format[1]} require framework\n", after: "require_self\n"
       end
 
       def detect_js_format
-        return ['.coffee', '#='] if File.exist?('app/assets/javascripts/application.coffee')
-        return ['.js.coffee', '#='] if File.exist?('app/assets/javascripts/application.js.coffee')
-        return ['.js', '//='] if File.exist?('app/assets/javascripts/application.js')
+        return [".coffee", "#="] if File.exist?("app/assets/javascripts/application.coffee")
+        return [".js.coffee", "#="] if File.exist?("app/assets/javascripts/application.js.coffee")
+        return [".js", "//="] if File.exist?("app/assets/javascripts/application.js")
       end
 
       def detect_css_format
-        return ['.css', ' *='] if File.exist?('app/assets/stylesheets/application.css')
-        return ['.css.sass', ' //='] if File.exist?('app/assets/stylesheets/application.css.sass')
-        return ['.sass', ' //='] if File.exist?('app/assets/stylesheets/application.sass')
-        return ['.css.scss', ' //='] if File.exist?('app/assets/stylesheets/application.css.scss')
-        return ['.scss', ' //='] if File.exist?('app/assets/stylesheets/application.scss')
+        return [".css", " *="] if File.exist?("app/assets/stylesheets/application.css")
+        return [".css.sass", " //="] if File.exist?("app/assets/stylesheets/application.css.sass")
+        return [".sass", " //="] if File.exist?("app/assets/stylesheets/application.sass")
+        return [".css.scss", " //="] if File.exist?("app/assets/stylesheets/application.css.scss")
+        return [".scss", " //="] if File.exist?("app/assets/stylesheets/application.scss")
       end
 
       def create_layout
         if options.haml?||(defined?(Haml) && options.haml?)
-          template 'application.html.haml', "app/views/layouts/#{file_name}.html.haml"
+          template "application.html.haml", "app/views/layouts/#{file_name}.html.haml"
         elsif options.slim?||(defined?(Slim) && options.slim?)
-          template 'application.html.slim', "app/views/layouts/#{file_name}.html.slim"
+          template "application.html.slim", "app/views/layouts/#{file_name}.html.slim"
         else
-          template 'application.html.erb', "app/views/layouts/#{file_name}.html.erb"
+          template "application.html.erb", "app/views/layouts/#{file_name}.html.erb"
         end
       end
 

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
   CODENAME = "Ezalor"
 end

data/template/rails/app.js

@@ -0,0 +1,6 @@
+function ready() {
+  // Your app-specific script here
+}
+
+$(document).ready(ready);
+$(document).on("page:load", ready);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Henner Setyono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -141,6 +141,7 @@ files:
 - template/base/gitignore
 - template/base/robots.txt
 - template/html/index.html
+- template/rails/app.js
 - template/rails/application.html.erb
 - template/wordpress/404.php
 - template/wordpress/category.php