edge_framework 1.3.0 → 1.3.1

data/assets/kitchen-sink.html

@@ -381,11 +381,11 @@
   </div>
 </div> -->
 
-<!-- <div class="row" data-page="custom-tile">
+<div class="row" data-page="custom-tile">
   <div class="large-12 columns">
     <div class="demo-tile">
       <h1>Custom Tile</h1>
-      <ul class="custom-tile1">
+      <ul class="custom-tile-1">
         <li><p>1</p></li>
         <li><p>1</p></li>
         <li><p>1</p></li>
@@ -400,7 +400,7 @@
         <li><p>1</p></li>
       </ul>
       <h2>Custom Tile Collapsed</h2>
-      <ul class="custom-tile2">
+      <ul class="custom-tile-2">
         <li><p>1</p></li>
         <li><p>1</p></li>
         <li><p>1</p></li>
@@ -415,7 +415,7 @@
         <li><p>1</p></li>
       </ul>
       <h2>Custom Tile Mini</h2>
-      <ul class="custom-tile3">
+      <ul class="custom-tile-3">
         <li><p>1</p></li>
         <li><p>1</p></li>
         <li><p>1</p></li>
@@ -431,7 +431,7 @@
       </ul>
     </div>
   </div>
-</div> -->
+</div>
 
 <!-- <div data-page="grid">
   <div>
@@ -693,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">
       
@@ -717,6 +717,13 @@
         </div>
       </div>
 
+      <h3>Centering and Small uncentering</h3>
+      <div class="row">
+        <div class="cgrid-center column">
+          <p>l-center s-uncenter</p>
+        </div>
+      </div>
+
       <h3>L-S-Mini (M) Collapse</h3>
       <div class="row collapse">
         <div class="cgrid-b1 column">
@@ -812,7 +819,7 @@
       
     </div>
   </div>
-</section>
+</section> -->
 
 <!-- <section class="row" data-page="design-grid">
   <div class="large-12 column demo-grid">

data/assets/sass/edge.scss

@@ -1,7 +1,7 @@
 /* --------------------
 - EDGE Framework
 - edge.setyono.net
-- v1.3.0 (Furion)
+- v1.3.1 (Furion)
 --------------------- */
 
 @import "edge/base";

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

@@ -43,7 +43,7 @@ $column-gutter   : 20px !default;
 
     @if $adaptive {
       @if $collapse {
-        min-width: $width;
+        min-width: $width + $gutter;
       } @else {
         min-width: $width + $gutter;
       }
@@ -83,11 +83,6 @@ $column-gutter   : 20px !default;
     padding-right: $gutter / 2;
     padding-left: $gutter / 2;
     width: 100%;
-    max-width: $width;
-    
-    @if not $responsive {
-      min-width: $width;
-    }
   }
 }
 
@@ -139,11 +134,11 @@ $column-gutter   : 20px !default;
 
 @mixin base-column(
   $size   : 0,
-  $offset : 0,
+  $offset : null,
   $push   : 0,
   $pull   : 0,
   $collapse : false,
-  $centered : false,
+  $centered : null,
   $gutter : 0px,
   $total  : $total-columns,
   $for-base : false) {
@@ -162,7 +157,7 @@ $column-gutter   : 20px !default;
   }
 
   // Offset, calculate margins
-  @if $offset > 0 { 
+  @if $offset {
     margin-#{$default-float}: gridCalc($offset, $total);
   }
   
@@ -178,11 +173,14 @@ $column-gutter   : 20px !default;
   }
   
   // Centered, add centered margin
-  @if $centered {
+  @if $centered == true {
     display: block;
     float: none;
-    margin-right: auto !important;
-    margin-left: auto !important;
+    margin-right: auto;
+    margin-left: auto;
+  } @else if $centered == false {
+    margin-right: 0;
+    margin-left: 0;
   }
   
   // Source Ordering
@@ -194,7 +192,7 @@ $column-gutter   : 20px !default;
   @if $pull > 0 {
     #{$default-opposite}: gridCalc($pull, $total);
     #{$default-float}: auto;
-  } 
+  }
 }
 
 // -----------------------------------
@@ -206,11 +204,11 @@ $column-gutter   : 20px !default;
   $size   : 0,
   $small  : 0,
   $mini   : 0,
-  $offset : 0,
+  $offset : null,
   $push   : 0,
   $pull   : 0,
   $collapse : false,
-  $centered : false,
+  $centered : null,
   $gutter : 0px,
   $total  : $total-columns) {
 

data/assets/sass/kitchen-sink.scss

@@ -173,8 +173,23 @@
   @include column($size:7, $small:2);
 }
 
+.cgrid-center {
+  @include column($size: 8, $centered: true);
+  @include below(small) {
+    @include column($size: 6, $centered: false);
+  }
+}
+
 .cgrid-b1 {
-  @include column($size:10, $small:8, $mini:6);
+  @include column(10, $offset: 2);
+
+  @include below(small) {
+    @include column(6, $offset: 6);
+  }
+
+  @include below(mini) {
+    @include column(4, $offset: 1)
+  }
 }
 .cgrid-b2 {
   @include column($size:2, $small:4, $mini:6);
@@ -246,15 +261,15 @@
 }
 
 /* Custom Tile */
-.custom-tile1 {
+.custom-tile-1 {
   @include tile($size:7, $small:5, $gutter: 50px);
 }
 
-.custom-tile2 {
+.custom-tile-2 {
   @include tile($size:5, $small:3, $collapse:true);
 }
 
-.custom-tile3 {
+.custom-tile-3 {
   @include tile(5, 3, 2);
 }
 

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
   CODENAME = "Furion"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass