edge_framework 0.8.1 → 0.9.0

data/lib/edge/version.rb

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

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

@@ -14,10 +14,10 @@
 // $body-font-family   : "Helvetica", Helvetica, Arial, "sans-serif";
 // $code-font-family   : "Consolas", Courier, "monospace";
 
-// ------------------------------
+// --------------------------------
 // COLOR
 //   Two main colors of your site
-// ------------------------------
+// --------------------------------
 // $main-color    : #0173bc;
 // $sub-color     : #e9e9e9;
 
@@ -34,12 +34,12 @@
 
 // ---------------------------
 // OUTPUT CONFIG
-//   debug       - if true : disable em conversion (will add neat effect in the future)
-//   responsive  - if false: disable the grid from shrinking down
+//   debug       - if true : add debug functionality
+//   responsive  - if false: prevent the grid from shrinking down
 //   include     - if false: remove the CSS output, but can still use the mixin
 // ------------------------------------------------------------------------------
-// $debug-mode  : false;
-// $responsive  : true;
+// $debug      : false;
+// $responsive : true;
 
 // $include-typography : true;
 // $include-grid       : true;
@@ -55,12 +55,12 @@
 // ------
 // BODY
 // ------
-// $body-bg          : #fff;
+// $body-background  : #fff;
 // $body-font-color  : #222;
 // $body-font-weight : normal;
 // $body-font-style  : normal;
 
-// $body-font-size   : 16px;   // Also being used as base-value for pixel->em converter
+// $body-font-size   : 16px;   // base-value for pixel->em converter
 // $body-line-height : 1.5;
 
 // ---------------
@@ -105,8 +105,8 @@
 // -------------------
 // MEDIA QUERIES
 // -------------------
-// $small-screen  : 480px;
-// $medium-screen : 800px;
+// $mini-screen  : 480px;
+// $small-screen : 767px;
 // $large-screen  : 1440px;
 // $retina-screen : 192dpi;
 

data/template/base/config.rb

@@ -1,4 +1,4 @@
-gem "edge_framework", "= 0.8.1" # Remove this line to use the latest EDGE, beware of incompatibility
+gem "edge_framework", "= 0.9.0" # Remove this line to use the latest EDGE, beware of incompatibility
 require "edge_framework"
 
 http_path       = "/"

data/template/html/index.html

@@ -8,12 +8,12 @@
   <meta name="keywords" content="search, key, word," /> <!-- Comma-separated list for Search keyword -->
   
   <!-- FAVICON -->
-  <link rel="icon" type="image/png" href="assets/img/favicon.ico">
+  <link rel="icon" type="image/png" href="assets/img/favicon.png">
   <link rel="apple-touch-icon-precomposed" href="assets/img/favicon-big.png" />
   
   <!-- VENDOR -->
   <script type="text/javascript" src="assets/js/vendor/custom.modernizr.js"></script>
-  <link rel="stylesheet" href="assets/css/edge-framework.css">
+  <link rel="stylesheet" href="assets/css/framework.css">
 
   <!-- APP Specific -->
   <link rel="stylesheet" href="assets/css/app.css">
@@ -31,7 +31,7 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script type="text/javascript">
   // Use local jquery, if Google's one fails to load
-  if (typeof jQuery == 'undefined') {
+  if (typeof jQuery == "undefined") {
     document.write(unescape("%3Cscript src='assets/js/vendor/jquery.min.js' type='text/javascript'%3E%3C/script%3E"));
   }
 </script>

data/template/php/index.php

@@ -1,6 +1,7 @@
-<?php include "partials/_functions.php"; get("header"); ?>
+<?php include "partials/functions.php"; get("header"); ?>
+
+<!-- First thing to do is to open partials/functions.php and change the $server_url value -->
 
-<!-- Sample content to show how the $root works -->
 <div class="row">
   <div class="large-6 large-centered columns">
     <h1>Home page</h1>

data/template/php/partials/footer.php

@@ -6,7 +6,7 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script type="text/javascript">
   // Use local jquery, if Google's fails to load
-  if (typeof jQuery == 'undefined') {
+  if (typeof jQuery == "undefined") {
     document.write(unescape("%3Cscript src='<?php echo js(); ?>vendor/jquery.min.js' type='text/javascript'%3E%3C/script%3E"));
   }
 </script>

data/template/php/partials/functions.php

@@ -1,6 +1,6 @@
 <?php
 /* ------------------------------------------------
--- You must change the server_url to fit your server
+-- You must change the $server_url to fit your server
 -- 
 -- This file is exclusive to your machine,
 -- DON'T push your changes to Git
@@ -52,10 +52,10 @@ function root() {
 Echo path to assets directory
   @return = relative path to specified assets directory
 */
-function img()   { echo root().'assets/img/'; }
-function css()   { echo root().'assets/css/'; }
-function js()    { echo root().'assets/js/';  }
-function files() { echo root().'assets/files/'; }
+function img()   { echo root()."assets/img/"; }
+function css()   { echo root()."assets/css/"; }
+function js()    { echo root()."assets/js/";  }
+function files() { echo root()."assets/files/"; }
 
 /*
 Get partials
@@ -64,24 +64,20 @@ Get partials
   @return = content of the partial file
 */
 function get($file, $params = array()) {
-  // If first letter is not underscore, add it
-  if(substr($file, 0, 1) !== '_') {
-    $file = '_'.$file;
-  }
-  return (include root().'partials/'.$file.'.php');
+  return (include root()."partials/".$file.".php");
 }
 
 /*
   Get the last word from the URL, useful for Header-menu's active state
-  @return = the last word from the current page
+    @return = the last word from the current page
 */
 function get_current_page() {
-  $pageURL = 'http';
+  $pageURL = "http";
   if ($_SERVER["SERVER_PORT"] != "80") {
     $pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
   } else {
     $pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
   }
-  $url_break = explode('/', $pageURL);
+  $url_break = explode("/", $pageURL);
   return $url_break[count($url_break)-2];
 }

data/template/php/partials/header.php

@@ -8,12 +8,12 @@
   <meta name="keywords" content="search, key, word," /> <!-- Comma-separated list for Search keyword -->
   
   <!-- FAVICON -->
-  <link rel="icon" type="image/png" href="<?php echo img(); ?>favicon.ico">
+  <link rel="icon" type="image/png" href="<?php echo img(); ?>favicon.png">
   <link rel="apple-touch-icon-precomposed" href="<?php echo img(); ?>favicon-big.png" />
   
   <!-- VENDOR -->
   <script type="text/javascript" src="<?php echo js(); ?>vendor/custom.modernizr.js"></script>
-  <link rel="stylesheet" href="<?php echo css(); ?>edge-framework.css">
+  <link rel="stylesheet" href="<?php echo css(); ?>framework.css">
 
   <!-- APP Specific -->
   <link rel="stylesheet" href="<?php echo css(); ?>app.css">

data/template/wordpress/footer.php

@@ -7,8 +7,8 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script type="text/javascript">
   // Use local jquery, if Google's one fails to load
-  if (typeof jQuery == 'undefined') {
-    document.write(unescape("%3Cscript src='<?php echo js(); ?>/vendor/jquery.min.js' type='text/javascript'%3E%3C/script%3E"));
+  if (typeof jQuery == "undefined") {
+    document.write(unescape("%3Cscript src='<?php js(); ?>/vendor/jquery.min.js' type='text/javascript'%3E%3C/script%3E"));
   }
 </script>
 <script type="text/javascript" src="<?php echo js(); ?>/app.js"></script>

data/template/wordpress/header.php

@@ -7,12 +7,12 @@
   <meta name="description" content="<?php bloginfo('description'); ?>" />
   
   <!-- FAVICON -->
-  <link rel="icon" type="image/png" href="<?php img(); ?>/favicon.ico">
+  <link rel="icon" type="image/png" href="<?php img(); ?>/favicon.png">
   <link rel="apple-touch-icon-precomposed" href="<?php img(); ?>/favicon-big.png" />
   
   <!-- VENDOR -->
   <script type="text/javascript" src="<?php js(); ?>/vendor/custom.modernizr.js"></script>
-  <link rel="stylesheet" href="<?php css(); ?>/edge-framework.css">
+  <link rel="stylesheet" href="<?php css(); ?>/framework.css">
 
   <!-- APP Specific -->
   <link rel="stylesheet" href="<?php css(); ?>/app.css">

data/template/wordpress/index.php

@@ -13,16 +13,16 @@ $categories = get_categories($args);
 
 // Get list of all pages
 $page_args = array(
-  'child_of' => 0,
-  'sort_order' => 'ASC',
-  'sort_column' => 'post_title',
+  "child_of" => 0,
+  "sort_order" => "ASC",
+  "sort_column" => "post_title",
 ); 
 $pages = get_pages($args);
 ?>
 
 <p><small>index.php</small></p>
 
-<h1>Welcome to <?php bloginfo('name'); ?></h1>
+<h1>Welcome to <?php bloginfo("name"); ?></h1>
 
 <h3>Category</h3>
 <ul>
@@ -39,7 +39,7 @@ $pages = get_pages($args);
 <ul>
   <?php foreach ($pages as $page): ?>
   <li>
-    <a href="<?php echo get_page_link( $page->ID ); ?> ">
+    <a href="<?php echo get_page_link( $page->ID ); ?>">
       <?php echo $page->post_title; ?>
     </a>
   </li>
@@ -50,7 +50,7 @@ $pages = get_pages($args);
 <h3>About Us</h3>
 <?php
   $page = get_page_by_title("About Us");
-  $content = apply_filters('the_content', $page->post_content); 
+  $content = apply_filters("the_content", $page->post_content); 
   echo $content;
 ?>
 

data/template/wordpress/style.css

@@ -8,5 +8,5 @@ Version: 1.0
 License: -
 License URI: -
 */
-@import "assets/css/edge-framework.css";
+@import "assets/css/framework.css";
 @import "assets/css/app.css";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -164,7 +164,7 @@ files:
 - template/base/assets/files/.keep
 - template/base/assets/fonts/.keep
 - template/base/assets/img/favicon-big.png
-- template/base/assets/img/favicon.ico
+- template/base/assets/img/favicon.png
 - template/base/assets/js/app.js
 - template/base/assets/sass/_setting.scss
 - template/base/assets/sass/app.scss