piecss 0.1.6.2 → 0.1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64ea9e1c010a19b7869d8edcde69140a778b109
-  data.tar.gz: 59f6540b170ed197dea325a055d6d98ffcfac158
+  metadata.gz: c7d9da6dff55c521f1827264ddfe311c416ce2fc
+  data.tar.gz: 87183d8ec305214171fc283347facb23cfb66ed5
 SHA512:
-  metadata.gz: dc551e91d874c8da5a13099f252bf2a46e92602f5fe5ee41649adc4f9e318ebccc73d4a0b810dbe8142acc0eadbda8ce48d3a7ca7d913865ff37b1a12507f8bb
-  data.tar.gz: 6132f47fc1c7d76454321bb66cf4031ccb6cfb1d46f670753e37899e844ec6cb07592f24e2ace33329794beef7a9b8a5992aed55a9cdba1ad2bef506aa40d56a
+  metadata.gz: 58416f3d1429f58d5089cbb7965702cfd4f2b2d3b977b8c69204df19a38a14a2c7cdf034b0101693ff2be58cf6483944fe38a81d3a27ea52838a34fb3ffd268c
+  data.tar.gz: f0deb73c7872bc8edd5d2c2f8af96c5640ad6de5d0e5f6cb74ec55045f6e5d8874e9c97226df0a7897bf1b56b0629dabb61c71b14118a44c35d7f6b50ee1cfdc

data/sass/piecss/settings/font.scss

@@ -21,6 +21,7 @@
 @import "fonts/raleway";
 @import "fonts/righteous";
 @import "fonts/roboto";
+@import "fonts/roboto-slab";
 @import "fonts/varela-round";
 
 

data/sass/piecss/settings/fonts/_roboto-slab.scss

@@ -0,0 +1,37 @@
+// Copyright (C) 2014 Babs Gösgens. Licensed under MIT; see LICENSE.txt
+
+
+// Weight reference:
+// 100 ultra-light
+// 200 light
+// 300 book
+// 400 regular, or normal
+// 500 medium
+// 600 semi-bold
+// 700 bold
+// 800 extra-bold
+// 900 heavy, or ultra-bold
+
+
+// Roboto
+// Available styles on Google Fonts: 100,300,400,700
+$roboto-slab-fontface: "Roboto Slab";
+$roboto-slab-fallback: sans-serif;
+$roboto-slab-family: ($roboto-slab-fontface, $roboto-slab-fallback);
+
+// style, variant, weight, family
+$roboto-slab-ultra-light: normal normal 100 $roboto-slab-family;
+$roboto-slab-ultra-light-italic: normal normal 100 $roboto-slab-family;
+$roboto-slab-book: normal normal 300 $roboto-slab-family;
+$roboto-slab-book-italic: normal normal 300 $roboto-slab-family;
+$roboto-slab-regular: normal normal 400 $roboto-slab-family;
+$roboto-slab-regular-italic: normal normal 400 $roboto-slab-family;
+$roboto-slab-medium: normal normal 400 $roboto-slab-family;
+$roboto-slab-medium-italic: normal normal 400 $roboto-slab-family;
+$roboto-slab-bold: normal normal 700 $roboto-slab-family;
+$roboto-slab-bold-italic: normal normal 700 $roboto-slab-family;
+$roboto-slab-heavy: normal normal 700 $roboto-slab-family;
+$roboto-slab-heavy-italic: normal normal 700 $roboto-slab-family;
+
+$roboto-slab-thin: $roboto-slab-ultra-light;
+$roboto-slab-light: $roboto-slab-book;

data/sass/piecss/settings/fonts/_roboto.scss

@@ -32,3 +32,4 @@
 	$roboto-bold-italic						: italic normal 700 $roboto-family;
 	$roboto-heavy 							: normal normal 900 $roboto-family;
 	$roboto-heavy-italic					: italic normal 900 $roboto-family;
+	

data/sass/piecss/utilities/typography.scss

@@ -177,22 +177,46 @@
 
    // font: font-style font-variant font-weight font-size/line-height font-family;
 
-@mixin font($type, $font-size:$default-font-size, $line-height:$default-line-height)
+@mixin font($arguments...)
 {
-    @if unit($unit)==rem {
-        @include font-size($font-size, 1px);
+    $type: null;
+    $font-size: null;
+    $line-height: null;
+
+    @each $argument in $arguments {
+
+        @if type-of($argument)==list {
+            $type: $argument;
+        } @else {
+            @if not($font-size) {
+                $font-size: $argument;
+            } @elseif not($line-height) {
+                $line-height: $argument;
+            }
+        }
     }
 
-    @if $type {
-        $font-style     :   extract-type-style($type);
-        $font-variant   :   extract-type-variant($type);
-        $font-weight    :   extract-type-weight($type);
-        $font-family    :   extract-type-family($type);
+    @if not(not($type)) {
 
-        font: #{$font-style} #{$font-variant} #{$font-weight} #{$font-size}/#{$line-height} #{$font-family};
-    }
-    @else {
-        font: #{$font-size}/#{$line-height};
+        $font-style: extract-type-style($type);
+        $font-variant: extract-type-variant($type);
+        $font-weight: extract-type-weight($type);
+        $font-family: extract-type-family($type);
+
+        @if $font-size and unit($unit)==rem {
+            @include font-size($font-size, 1px);
+        }
+
+        // Build font arguments
+        $font: #{$font-style} #{$font-variant} #{$font-weight};
+        @if $font-size and $line-height {
+            $font: append($font, #{$font-size}/#{$line-height});
+        } @elseif $font-size {
+            $font: append($font, #{$font-size});
+        }
+        $font: append($font, #{$font-family});
+
+        font: #{$font};
     }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piecss
 version: !ruby/object:Gem::Version
-  version: 0.1.6.2
+  version: 0.1.6.3
 platform: ruby
 authors:
 - Babs Gosgens
@@ -70,6 +70,7 @@ files:
 - sass/piecss/settings/fonts/_pt-sans.scss
 - sass/piecss/settings/fonts/_raleway.scss
 - sass/piecss/settings/fonts/_righteous.scss
+- sass/piecss/settings/fonts/_roboto-slab.scss
 - sass/piecss/settings/fonts/_roboto.scss
 - sass/piecss/settings/fonts/_sans-serif.scss
 - sass/piecss/settings/fonts/_serif.scss