edge_framework 1.2.6 → 1.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWZkYmUyYTQ1MDAwNzBlYjVmZjkyYjFkZDNlNWZlYjNhN2E0MzE4NA==
+    YzBjYjA2NmU2YjViMzk3ZmIzOWU3ZGNmZmFjZGM5YjYwYzYxYWZmZA==
   data.tar.gz: !binary |-
-    MWVjNTg5NTZjNmUxMGE0OGViMDhkNmMzMTIxZDRmMzg1YWUzMzU1Zg==
+    ZGIwMjFkMTYzNTFlM2QxMzRhMzJiNTYwZGIyM2ZjYjg5ODdhZWI3MQ==
 SHA512:
   metadata.gz: !binary |-
-    OGMyN2U0MGQ3MDZmNjBhODM0YmJhNDRmZjcxYmY4YjJlODViOWJhMzNmOGE3
-    Y2I3YWIxYWIwYWYxOWFmYjFmZWEwNjdlNmVlOTc1OTEyOGYxYmQ0NGZiNmM0
-    MWY5ZGQ4OTgwMDQ1ZTk5MDVmOTQyMWZlMDg1NDc1MDM1MmFjNTk=
+    NTM3MmI3MjJhMzU0YWY5ZjIyNTUwODJlNjY4Y2E3YjQwNzMxNDBiZmRiOTQy
+    NDA5MTE2Mjk0ZTBjYWQyNDEyZDIwY2Q4NmZkNTYzMjhjNzJkOTM2MTM4ZjYx
+    Yjc3OGVmMTk4ODk0MTNmMGJmN2E4YzA3MDg0MGI4YWViZDAyNTk=
   data.tar.gz: !binary |-
-    OWEzNDczMDdjNjRkMDEwMGViZGM3OGJmNGM3NTE1NTQyMzE5NWE3NmM2ZDZm
-    ZDE2YTA1NjZjYzNlM2IyYTdlZWM5YTNjMGM2NmFlYmRjZjk3YzI5ZmM1NTE5
-    NGEzNzUyMmFlMTA4MmRkZjI1YzY1NDRkOGMwYzQ3OTEwYjdiMTA=
+    MWRmZDU1NjVlZTYzNDllMjQzZTNlMGYxMjc3ZThjODc0YzIxNDhhMzc2ZDFi
+    NjhlMjUxMmI2ZTVkNzJmZWIzM2NjM2RkNWRmYTU1ZTk0MDdjOTg0OTAxOTNk
+    MWQ2MTc4NmRhNDRiY2QxZjkzNDQ2ZWRkZTFkZmM3YWYxYjM5ZmY=

data/README.md

@@ -467,7 +467,7 @@ Custom grid makes the markup cleaner and easier to change.
 
 **Convention**:
 
-- We need to include the base class in the markup (`.row` and `.column`).
+- Custom column must be applied to the element that has `column` class. The same goes to custom row.
 
 ### GUTTER
 
@@ -648,6 +648,13 @@ The command will give you Edge's SCSS files and append the pipeline.
 FAQ
 ===============
 
-1. Is Edge a mobile-first framework?
+1. Why should I use Edge over leading frameworks like Boostrap or Foundation?
+
+  Edge leans toward those who create website based on designer's wireframe/mockup.
+
+  Bootstrap and Foundation offer pre-styled elements which are great for quick prototyping. But when you are working with a designer, you won't use any of those styling.
+
+2. Is Edge a mobile-first framework?
+
+  No it is not.
 
-   No it is not.

data/assets/sass/edge.scss

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

data/assets/sass/edge/_base.scss

@@ -201,11 +201,13 @@ $retina-screen : 192dpi !default;
 }
 
 @mixin between($smaller-size, $larger-size) {
+  $is-in-media: true;
   $smaller-size: translateSize($smaller-size);
   $larger-size: translateSize($larger-size);
   @media only screen and (min-width: $smaller-size) and (max-width: $larger-size) {
     @content;
   }
+  $is-in-media: false;
 }
 
 // ------------

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

@@ -210,7 +210,7 @@ $column-gutter   : 20px !default;
       @include below(small) {
         @include base-column($size:$small, $total:$total);
       }
-    } @else if $responsive { // else, become 100% width on small screen (if responsive)
+    } @else if $responsive and not $is-in-media { // else, become 100% width on small screen (if responsive)
       @include below(small) {
         @include base-column($size:$total, $total:$total);
       }

data/assets/sass/kitchen-sink.scss

@@ -6,6 +6,16 @@
   @include column(3);
 }
 
+.custom-gridx {
+  @include between(mini, small) {
+    @include column(4);
+  }
+
+  @include below(small) {
+    @include column(5);
+  }
+}
+
 [data-page="animate"] {
   .box1 {
     background: red;

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
   CODENAME = "Ezalor"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Henner Setyono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass