edge_framework 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWQ0OWMwNzIxYzBmYjE5ZTMwYTc0YTI0MGUzYzVlOTEwZTI3NGRiNA==
+    NDJlYTlkNzkyZTdiNzI5MTk0NDk3MDQ2ZmM1NGRlNjgxZTY3MjMwZA==
   data.tar.gz: !binary |-
-    MjVlNzc3NTEyOTc4Zjg5MjViZjZlN2Y1NWVjNjExYWJkOWVkMGMxNg==
+    NWUyMjUxMzdjMTNkOWI1MTkxZmY0NjdkZWMyNjhhZDQ0NzYyYmJlNA==
 SHA512:
   metadata.gz: !binary |-
-    MDllZWVlNTc3ZWI2OGZlNTQxZTQ0OGM0NTZhYjhlOGUwYzJiMTYzYWVkMjJl
-    NjBiZjBjZDI5Y2E3NjliZjhhYmZiMjk4ODlmMTgxMGY5MmRjNzc1NzA4OGFm
-    YjBkNWViMGE1MzQ5OWU4ODY2ZGMwMGNhYzcxMGU1Y2RiNzdjZjU=
+    YzQ5N2YxOTRhMGNjODBjYzZkZGQ5ZmE3ZDY3MmQ1NGNjNTc3NTUyZGMwNzE5
+    OGRhODc2Nzg4ZTAwMjI2MzBiMTZmM2JlYzIxOTgzZjQxYWVlOTcyZjBjM2Q2
+    NmNjMDVkZjAxNTkwNmRlYmFiZTVkZGI3YjhjOTJiOGRkYzQ1Yzg=
   data.tar.gz: !binary |-
-    NmI0ZDU1OWFlYTcyZWE1NjBkMmZkNWJiZmQ1OTk5ZDMxZDQ1NzBmZWYxYjIx
-    OWZjZTVkN2U0Njc1YTYxMjhjYTY3MjU2NGU4YWViYzY4ZDEwNzhiNGVmMDgy
-    M2U4NmQ5YjE4MmM0ZDMxN2FiM2Q3MDAwYzkxNWQ0ODUwZTBjMTM=
+    MTA0OTM4ZDA2OThiNzVmZGUwZjFlMjA1MGQyMjVmMDM4NGZiNDUyNjZmZDdl
+    YzAzYWMyYTBmOGY4NDAwZWQ3YzI1OTU2OGUxMDRkMWY2YmE2NGVmYWRjZmU0
+    MjRhMjBkZThhYzgxN2Y0M2M5MDRmZmVhNGNjMjhkNWJlMDc2ZGM=

data/README.md

@@ -281,19 +281,15 @@ Generate basic template for your project. Run this command inside your project d
 
     `edge create html`
 
-2. Static PHP
-    
-    `edge create php`
-
-3. Wordpress 3.8+ (Min PHP 5.3)
+2. Wordpress 3.8+ (Min PHP 5.3)
 
     `edge create wordpress`
 
-4. Rails (run inside Rails project)
+3. Rails (run inside Rails project)
 
     `rails g edge:install`
 
-5. Coming soon: Sinatra and Flask
+4. Coming soon: Sinatra and Flask
 
 
 WORDPRESS

data/assets/kitchen-sink.html

@@ -294,7 +294,8 @@
     </div>
   </div> -->
 
-<!-- <div class="row" data-page="code">
+<!-- 
+<div class="row" data-page="code">
   <div class="large-12 columns">
     <h1>EDGE Code</h1>
     <h3>Markup</h3>
@@ -432,7 +433,7 @@
   </div>
 </div> -->
 
-<div class="row" data-page="grid">
+<!-- <div class="row" data-page="grid">
   <div class="large-12 columns">
     <div class="demo-grid">
       <h1>Grid</h1>
@@ -563,7 +564,7 @@
         
     </div>
   </div>
-</div>
+</div> -->
 
 <!-- <section class="row" data-page="visibility">
   <div class="large-12 column">
@@ -796,7 +797,7 @@
   </div>
 </section> -->
 
-<section class="row" data-page="design-grid">
+<!-- <section class="row" data-page="design-grid">
   <div class="large-12 column demo-grid">
     <h1>Demo Design Custom Grid</h1>
     <h3>325 (50) 175</h3>
@@ -809,7 +810,7 @@
       </div>
     </div>
   </div>
-</section>
+</section> -->
 
 <!-- <section class="row" data-page="button">
   <div class="large-4 column">
@@ -927,10 +928,10 @@
 <footer id="footer">
 </footer>
 
-<!--
-<script type="text/javascript" src="js/edge.js"></script>
+
+<!-- <script type="text/javascript" src="js/edge.js"></script> -->
 <script type="text/javascript" src="js/edge/edge.prism.js"></script>
-<script type="text/javascript" src="js/edge/edge.animate.js"></script>
--->
+<!-- <script type="text/javascript" src="js/edge/edge.animate.js"></script> -->
+
 </body>
 </html>

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

@@ -22,8 +22,11 @@ $code-sass-color    : #c6538c; // pink
 $code-python-color  : #376a94; // dark-blue
 
 // Add decoration to the code-block
-@mixin code-decor($color) {
+@mixin code-decor($color, $text: "") {
   &:after {
+    @if $text {
+      content: "#{$text}";
+    }
     background: $color;
   }
 
@@ -78,14 +81,12 @@ pre {
   margin-bottom: $code-margin-bottom;
   max-height: 30em;
 
-  @include code-decor($passive-color);
+  @include code-decor($main-color);
   @include box-shadow(-1px 0px 0px 0px #ddd, 0px 0px 0px 1px #ddd);
   
-  @include below(small) {
-    &:hover {
-      &:after {
-        opacity: 0;
-      }
+  &:hover {
+    &:after {
+      opacity: .2;
     }
   }
 
@@ -94,40 +95,38 @@ pre {
     position: absolute;
     top: .5em;
     right: .5em;
-
-    width: 1em;
-    height: 1em;
-
+    
     background: $passive-color;
-    @if $code-theme == dark { opacity: .5; }
-    @else { opacity: .2; }
+    opacity: 0;
+    padding: 0 10px;
 
-    padding: em(5px 10px);
     font-family: $code-font-family;
     color: white;
-    text-transform: uppercase;
 
     @include transition($g-transition);
   }
-
+  
+  &[data-lang="html"],
   &[data-lang="markup"] {
-    @include code-decor($code-markup-color);
+    @include code-decor($code-markup-color, "HTML");
   }
 
-  &[data-lang="css"] {
-    @include code-decor($code-css-color);
+  &[data-lang="css"],
+  &[data-lang="stylesheet"] {
+    @include code-decor($code-css-color, "CSS");
   }
 
+  &[data-lang="js"],
   &[data-lang="javascript"] {
-    @include code-decor($code-js-color);
+    @include code-decor($code-js-color, "JS");
   }
 
   &[data-lang="ruby"] {
-    @include code-decor($code-ruby-color);
+    @include code-decor($code-ruby-color, "Ruby");
   }
 
   &[data-lang="python"] {
-    @include code-decor($code-python-color);
+    @include code-decor($code-python-color, "Python");
   }
 
   > code {
@@ -141,7 +140,10 @@ pre {
 
 :not(pre) {
   > code {
-    @include code-block();
+    background-color: #f8f8f8;
+    border: 1px solid rgba(#ddd, .2);
+    padding: 3px 7px;
+    line-height: 1;
   }
 }
 

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

@@ -192,6 +192,10 @@ $column-gutter   : 20px !default;
       @include below(small) {
         @include base-column($size:$small, $total:$total);
       }
+    } @else { // else, become 100% width on small
+      @include below(small) {
+        @include base-column($size:$total, $total:$total);
+      }
     }
 
     @if $mini > 0 {

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

@@ -84,7 +84,7 @@ $ol-child-style   : lower-alpha !default;
   $line-height : $base-line-height) {
 
   @include background(
-    linear-gradient(to bottom, rgba(black, 0) 95%, rgba(black, .3) 100%)
+    linear-gradient(to bottom, rgba(black, 0) 95%, rgba(black, .1) 100%)
   );
   background-size: 100% em($font-size * $line-height, $font-size);
 }

data/assets/sass/edge.scss

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

data/lib/edge/version.rb

@@ -1,4 +1,4 @@
 module Edge
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
   CODENAME = "Ezalor"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_framework
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Henner Setyono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass