edge_framework 1.3.3 → 1.3.5

data/README.md

@@ -285,11 +285,15 @@ Generate basic template for your project. Run this command inside your project d
 
     `edge create wordpress`
 
-3. Rails (run inside Rails project)
+3. Ghost Blog
+
+    `edge create blog`
+
+4. Rails (run inside Rails project)
 
     `rails g edge:install`
 
-4. Coming soon: Sinatra and Flask
+5. Coming soon: Sinatra and Flask
 
 
 WORDPRESS
@@ -297,37 +301,9 @@ WORDPRESS
 
 ![Edge Wordpress](http://cdn.setyono.net/edge/wp-edge.jpg)
 
-Features:
-
-- Auto add header and footer.
-- Independent from any plugin.
-- Cleaner WP Query call.
-- Easily create custom post type and taxonomy.
-
-Custom WP Query
----------------------
-
-    Post::find()
-        get all posts.
-
-    Post::find($args_array)
-        get post(s) based on the arguments array.
-
-    Post::find_by($key, $value)
-        faster way of writing Post::find(array( $key => $value ))
-
-All of the functions above returns `WP_Query()` object. [Refer here](https://gist.github.com/luetkemj/2023628) for available argument.
-
-Example:
-    
-    $posts = Post::find_by("category_name", "featured");
-    
-    if( $posts->have_posts() ):
-      while( $posts->have_posts() ): $posts->the_post();
-        ...
-      endwhile;
-    endif;
+Our WordPress template requires [Timber](http://upstatement.com/timber/). It is a template engine that separates PHP and HTML into their own file.
 
+So, download and include [its plugin](https://wordpress.org/plugins/timber-library/) into your WordPress installation.
 
 Custom Post Type
 --------------------
@@ -343,37 +319,11 @@ Inside `functions.php`, add these codes:
 
 The icon name is taken from [melchoyce.github.io/dashicons/](http://melchoyce.github.io/dashicons/).
 
-To enable custom WP Query, create a class with the Post Type's name that extends `Post`.
-
-    // still inside functions.php
-
-    class Product extends Post {}
-    class Event extends Post {}
-
-Now, you can use the custom WP Query:
-
-    $products = Product::find_by("brand", "Microsoft")
-    $events = Event::find()
-
-**Alert**: If you want pagination to work, the Name cannot be the same as any page's slug.
-
-Template File
----------------
-
-The template file for custom post is `single-{slug}.php` while custom taxonomy is `taxonomy-{slug}.php`.
-
-Based on the example above, create `single-product.php` for single **Product** template. If we need to list all products within a brand, create `taxonomy-brand.php` which works the same way as `category.php`.
-
-Naming Convention
------------------
-
-All names must be **singular**.
-
-No special character except space. If contain space, the class' name should be its combined word and no camel casing.
+Tips:
 
-    add_post_type("Photo Gallery", "format-gallery");
+- If you want pagination to work, the `$name` cannot be the same as any page's slug.
 
-    class Photogallery extends Post {}
+- All type's name and taxonomy's name must be **singular** and no special character except space.
 
 COMPASS
 =================

data/assets/sass/edge/_base.scss

@@ -205,18 +205,6 @@ $retina-screen : 192dpi !default;
   $is-in-media: false;
 }
 
-// ------------
-// CONTRAST
-// ------------
-
-@function is_dark($color) {
-  @return contrast-color($color, false, true, 70%);
-}
-
-@function is_light($color) {
-  @return not is_dark($color);
-}
-
 // ----------------------------------------------
 // CLEARING FLOAT
 //   Make a container wraps floated element

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

@@ -9,14 +9,7 @@ $button-color: $main-color !default;
 // ---------------
 @mixin button-hover($color) {
   &:hover {
-    // Darken background if background is light
-    @if is_light($color) {
-      background-color: darken($color, 5%);
-    }
-    // Lighten background if background is dark
-    @else {
-      background-color: lighten($color, 5%);
-    }
+    background-color: lighten($color, 5%);
   }
 }
 
@@ -65,7 +58,7 @@ $button-color: $main-color !default;
   }
   
   background-color: $color;
-  color: contrast-color($color, $body-font-color, white, 70%);
+  color: white;
   
   @if $for-base {
     @include border-radius($g-radius);

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

@@ -70,7 +70,7 @@ $prefix-bg-color     : $passive-color !default;
     border: $input-border-style $bg-color;
     border-top: $input-border-style darken( $input-border-color, 5% );
     text-align: center;
-    color: contrast-color($bg-color, #333, white, 60%);
+    color: $body-font-color;
     background: $bg-color;
     overflow: hidden;
   }

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

@@ -92,8 +92,8 @@ $column-gutter   : 20px !default;
 // -----------------------------------
 
 @mixin row(
-  $gutter   : 0px,
-  $width    : 0px,
+  $gutter   : 0,
+  $width    : 0,
   $collapse : false) {
   
   // Nested row, only output if gutter is specified
@@ -110,8 +110,8 @@ $column-gutter   : 20px !default;
   }
   
   // Set default value if 0
-  @if $width == 0 { $width: $row-max-width; }
-  @if $gutter == 0 { $gutter: $column-gutter; }
+  @if $width == 0px { $width: $row-max-width; }
+  @if $gutter == 0px { $gutter: $column-gutter; }
   
   // Max width for outer row
   max-width: $width + $gutter;

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

@@ -96,6 +96,10 @@ $tile-gutter : 15px !default;
     @include below(small) {
       @include base-tile($size: $small, $reset-clearing: true); 
     }
+  } @else if $responsive and not $is-in-media { // else, become 100% width on small screen (if responsive)
+    @include below(small) {
+      @include base-tile($size: 1);
+    }
   }
 
   @if $mini > 0 {

data/assets/sass/edge.scss

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

data/assets/sass/edgemail/_base.scss

@@ -16,11 +16,11 @@ $row-max-width : 650px !default;
 $mini-screen   : 480px !default;
 
 // BODY
-$body-background  : #ffffff;
-$body-font-color  : #222222;
-$body-font-weight : 400;
-$body-font-size   : 16px;
-$body-line-height : 1.5;
+$body-background  : #ffffff !default;
+$body-font-color  : #222222 !default;
+$body-font-weight : 400 !default;
+$body-font-size   : 16px !default;
+$body-line-height : 1.5 !default;
 
 // TYPOGRAPHY
 $h1-font-size : 44px !default;

data/assets/sass/kitchen-sink.scss

@@ -262,7 +262,7 @@
 
 /* Custom Tile */
 .custom-tile-1 {
-  @include tile($size:7, $small:5, $gutter: 50px);
+  @include tile($size:5);
 }
 
 .custom-tile-2 {
@@ -305,8 +305,6 @@
   }
 
   .has-vr {
-    @include vertical-rhythm();
-
     blockquote {
       @include trailer(1);
     }

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-  VERSION = "1.3.3"
+  VERSION = "1.3.5"
   CODENAME = "Furion"
 end

data/template/sinatra/Gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gem "sinatra"
+gem "sinatra-contrib"
+
+gem "sass"
+gem "compass"
+gem "edge_framework", "~> 1.3"
+
+gem "puma"

data/template/sinatra/config.ru

@@ -0,0 +1,17 @@
+require "rubygems"
+require "bundler/setup"
+require "sinatra"
+require "erb"
+require "./start"
+
+require "sass"
+require "compass"
+
+set :run, false
+set :raise_errors, true
+
+use Rack::Static, urls: ["/css", "/js", "/img"], root: "assets"
+
+configure { set :server, :puma }
+
+run App

data/template/sinatra/start.rb

@@ -0,0 +1,19 @@
+require "sinatra/base"
+require "sinatra/reloader"
+
+class App < Sinatra::Base
+
+  configure :development do
+    register Sinatra::Reloader
+  end
+
+  # Home Page
+  get "/" do
+    erb :index
+  end
+
+  # 404
+  not_found do
+    erb :"errors/404"
+  end
+end

data/template/sinatra/views/errors/404.erb

@@ -0,0 +1 @@
+<h1>404 Page Not Found</h1>

data/template/sinatra/views/index.erb

@@ -0,0 +1 @@
+<h1>Home Page</h1>

data/template/sinatra/views/layout.erb

@@ -0,0 +1,44 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width">
+
+  <!-- WEBSITE DETAIL -->
+  <title>My Website</title>
+  <meta name="description" content="This is a description of your website, only first 160 characters matters">
+
+  <!-- FAVICON -->
+  <link rel="icon" href="/img/favicon.png">
+  <link rel="apple-touch-icon-precomposed" href="/img/favicon-big.png">
+  
+  <!-- JAVASCRIPT that must load first -->
+  <script src="/js/vendor/custom.modernizr.js"></script>
+  
+  <!-- STYLESHEET -->
+  <link rel="stylesheet" href="/css/framework.css">
+  <link rel="stylesheet" href="/css/app.css">
+</head>
+
+<body>
+<div id="main-wrapper">
+
+  <%= yield %>
+
+  <div id="footer-push"></div>
+</div>
+<footer class="main-footer"></footer>
+
+<!-- JAVASCRIPT LIBRARY -->
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+<script>
+  // Fallback if Google's one doesn't load
+  if (!window.jQuery) {
+    document.write("<script src='/js/vendor/jquery.min.js'><\/script>");
+  }
+</script>
+<script src="/js/vendor/fastclick.min.js"></script>
+<script src="/js/app.js"></script>
+
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -197,6 +197,12 @@ files:
 - template/ghost/tag.hbs
 - template/html/index.html
 - template/rails/application.html.erb
+- template/sinatra/Gemfile
+- template/sinatra/config.ru
+- template/sinatra/start.rb
+- template/sinatra/views/errors/404.erb
+- template/sinatra/views/index.erb
+- template/sinatra/views/layout.erb
 - template/wordpress/404.php
 - template/wordpress/archive.php
 - template/wordpress/code/cpt.php