edge_framework 0.6.1 → 0.8.1

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-	VERSION = "0.6.1"
-	CODENAME = "Barathrum"
+  VERSION = "0.8.1"
+  CODENAME = "Banehallow"
 end

data/template/base/assets/sass/_setting.scss

@@ -34,22 +34,22 @@
 
 // ---------------------------
 // OUTPUT CONFIG
-//   debug      - if true : disable em conversion (will add neat effect in the future)
-//   responsive - if false: disable the grid from shrinking down
-//   include    - if false: remove the CSS output, but can still use the mixin
+//   debug       - if true : disable em conversion (will add neat effect in the future)
+//   responsive  - if false: disable the grid from shrinking down
+//   include     - if false: remove the CSS output, but can still use the mixin
 // ------------------------------------------------------------------------------
-// $debug : false;
-// $responsive : true;
+// $debug-mode  : false;
+// $responsive  : true;
 
 // $include-typography : true;
 // $include-grid       : true;
-// $include-block-grid : true;
+// $include-tile       : true;
 // $include-visibility : true;
 
 // $include-button  : true;
 // $include-form    : true;
-// $include-print   : true;
 
+// $include-print   : false;
 // $include-code    : false;
 
 // ------
@@ -72,15 +72,15 @@
 // --------
 // GRID
 // --------
-// $row-max-width   : 1140px;
-// $total-columns   : 12;
-// $column-distance : 20px;
+// $row-max-width : 1140px;
+// $total-columns : 12;
+// $column-gutter : 20px;
 
 // ------------
-// BLOCK-GRID
+// TILE
 // ------------
-// $max-blocks      : 12;
-// $block-distance  : 15px;
+// $max-tiles   : 12;
+// $tile-gutter : 15px;
 
 // ---------------
 // TYPOGRAPHY
@@ -105,9 +105,8 @@
 // -------------------
 // MEDIA QUERIES
 // -------------------
-// $phone-screen  : 480px;
-// $small-screen  : 767px;   // Right below iPad
-// $medium-screen : 1140px;
+// $small-screen  : 480px;
+// $medium-screen : 800px;
 // $large-screen  : 1440px;
 // $retina-screen : 192dpi;
 

data/template/base/config.rb

@@ -0,0 +1,16 @@
+gem "edge_framework", "= 0.8.1" # Remove this line to use the latest EDGE, beware of incompatibility
+require "edge_framework"
+
+http_path       = "/"
+css_dir         = "assets/css"
+images_dir      = "assets/img"
+sass_dir        = "assets/sass"
+javascripts_dir = "assets/js"
+fonts_dir       = "assets/fonts"
+output_style    = :nested
+# output_style = :expanded or :nested or :compact or :compressed
+
+relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+line_comments = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -118,6 +118,7 @@ files:
 - .gitattributes
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -136,18 +137,20 @@ files:
 - assets/sass/edge/_components.scss
 - assets/sass/edge/_helpers.scss
 - assets/sass/edge/components/_block-grid-margin.scss
-- assets/sass/edge/components/_block-grid.scss
 - assets/sass/edge/components/_button.scss
 - assets/sass/edge/components/_code.scss
 - assets/sass/edge/components/_form.scss
 - assets/sass/edge/components/_grid-margin.scss
+- assets/sass/edge/components/_grid-old.scss
 - assets/sass/edge/components/_grid.scss
 - assets/sass/edge/components/_normalize.scss
 - assets/sass/edge/components/_print.scss
+- assets/sass/edge/components/_tile.scss
 - assets/sass/edge/components/_typography.scss
 - assets/sass/edge/components/_visibility.scss
 - assets/sass/edge/helpers/_sprites.scss
 - assets/sass/edge/helpers/_sticky-footer.scss
+- assets/sass/for-test.scss
 - assets/test.html
 - assets/test2.html
 - bin/edge
@@ -165,7 +168,8 @@ files:
 - template/base/assets/js/app.js
 - template/base/assets/sass/_setting.scss
 - template/base/assets/sass/app.scss
-- template/base/assets/sass/edge-framework.scss
+- template/base/assets/sass/framework.scss
+- template/base/config.rb
 - template/base/robots.txt
 - template/html/index.html
 - template/php/index.php

data/assets/sass/edge/components/_block-grid.scss

@@ -1,112 +0,0 @@
-// ------------------------------------------
-// BLOCK GRID
-//   Based heavily on ZURB's Foundation
-// ------------------------------------------
-
-$max-blocks     : 12 !default;
-$block-distance : 15px !default;
-
-@mixin block-grid-calc (
-	$per-row  : false,
-	$distance : em($block-distance),
-	$collapse : false,
-	$for-base : true ) {
-
-	@if $per-row {
-		width   : 100% / $per-row;
-
-		&:nth-of-type(n) {
-			clear: none;
-		}
-		&:nth-of-type(#{$per-row}n+1) {
-			clear: both;
-		}
-	} @else {
-		@if $collapse {
-			padding : 0;
-		} @else {
-			padding : 0 ($distance / 2);
-		}
-	}
-}
-
-@mixin block-grid (
-	$per-row  : false,
-	$distance : em($block-distance),
-	$collapse : false,
-	$for-base : true ) {
-	
-	// For base class
-	@if $for-base {
-		display : block;
-		padding : 0;
-
-		@if $collapse {
-			margin  : 0;
-		} @else {
-			margin  : 0 (-$distance / 2);
-		}
-		
-		@include clearfix;
-
-		& > li {
-			position: relative;
-			display : block;
-			height  : auto;
-			float   : $default-float;
-			@include block-grid-calc($distance:$distance, $collapse:$collapse);
-		}
-	}
-
-	@if $per-row {
-		& > li {
-			@include block-grid-calc($per-row:$per-row);
-		}
-	}
-}
-
-@if $include-block-grid {
-
-/* ---------------
-EDGE Block Grid
---------------- */
-
-[class*="block-grid-"] {
-	@include block-grid();
-	
-	&.collapse {
-		@include block-grid($collapse:true);
-	}
-}
-
-@for $i from 1 through $max-blocks {
-	.large-block-grid-#{$i} {
-		@include block-grid($per-row:$i, $for-base:false );
-	}
-}
-
-@include small {
-	// Make large-block-grid 100% width, but only on responsive site
-	body:not(.not-responsive) {
-		[class*="large-block-grid-"] > li {
-			width: 100%;
-		}
-		@for $i from 1 through $max-blocks {
-			.small-block-grid-#{$i} {
-				@include block-grid($per-row:$i, $for-base:false );
-			}
-		}
-	}
-
-	// Remove large grid clearing
-	@for $i from 1 through $max-blocks {
-		.large-block-grid-#{$i} > li:nth-of-type(#{$i}n+1) {
-			clear: none;
-		}
-	}
-}
-
-
-
-
-} // include-block-grid