piecss 0.2.0.0 → 0.3.0.1

data/sass/piecss/utilities/_typography.scss

@@ -36,7 +36,7 @@
 ///
 
 @function extract-type-style($type) {
-    @return nth($type, 1);
+  @return nth($type, 1);
 }
 
 
@@ -52,9 +52,8 @@
 /// @return {String} - font-variant property
 ///
 
-@function extract-type-variant($type)
-{
-    @return nth($type, 2);
+@function extract-type-variant($type) {
+  @return nth($type, 2);
 }
 
 
@@ -70,9 +69,8 @@
 /// @return {String} - font-weight property
 ///
 
-@function extract-type-weight($type)
-{
-    @return nth($type, 3);
+@function extract-type-weight($type) {
+  @return nth($type, 3);
 }
 
 
@@ -88,9 +86,8 @@
 /// @return {String} - font-family property
 ///
 
-@function extract-type-family($type)
-{
-    @return nth($type, 4);
+@function extract-type-family($type) {
+  @return nth($type, 4);
 }
 
 
@@ -99,32 +96,31 @@
 /// @deprecated
 ///
 
-@function font-size($target-px, $unit: $unit, $context: $default-font-size)
-{
-    @return to-unit($target-px, $unit, $context);
+@function font-size($target-px, $unit: $unit, $context: $font-size) {
+  @return to-unit($target-px, $unit, $context);
 }
 
 
 ///
-/// Convert a px value to a new unit, within the context of it's containing element
+/// Calculate the optimal line-height
 ///
 /// @since 0.1
 ///
-/// @param {Number} $target-px - the line-height in px
-/// @param {Number} $context ($default-font-size) - The context of the targeted element, for calculations to em
-/// @param {Number} $unit ($line-height-unit) - The final unit to which $target-px is converted, e.g. 1px, 1rem, 1em, 1% or 1 for unitless
+/// @param {Number} $font-size - The font-size in px
+/// @param {Number} $min-ratio (Float) - The final unit to which $target-px is converted, e.g. 1px, 1rem, 1em, 1% or 1 for unitless
 ///
 /// @return {Number} - line-height in px
 ///
 
-@function line-height($target-px, $context: $default-font-size, $unit: $line-height-unit)
-{
+@function line-height($font-size, $min-ratio: 1.5) {
+  @if  unit($font-size) != "px" {
+    @error "The line-height function expects a font-size in px. If you want the line-height in a different unit, calculate the line-height in px first, and then convert it using to-unit()";
+  }
+  @if $min-ratio == 0 {
+    $min-ratio: 1;
+  }
 
-    @if unitless($unit) {
-        @return strip-unit($target-px/$context);
-    } @else  {
-        @return to-unit($target-px, $unit, $context);
-    }
+  @return ceil($font-size * $min-ratio / $rhythm) * $rhythm;
 }
 
 
@@ -140,21 +136,20 @@
 /// @return {String} - weight, defaults to 'regular'
 ///
 
-@function weight-number-to-string($weight: regular)
-{
-    @if $weight == 100 { @return "ultra-light"; }
-    @if $weight == 200 { @return "light"; }
-    @if $weight == 300 { @return "book"; }
-    @if $weight == 400 { @return "regular"; }
-    @if $weight == 500 { @return "medium"; }
-    @if $weight == 600 { @return "semi-bold"; }
-    @if $weight == 700 { @return "bold"; }
-    @if $weight == 800 { @return "extra-bold"; }
-    @if $weight == 900 { @return "heavy"; }
-    @else {
-        @warn "Not a valid weight";
-        @return false;
-    }
+@function weight-number-to-string($weight: regular) {
+
+  @if $weight == 100 { @return "ultra-light"; }
+  @if $weight == 200 { @return "light"; }
+  @if $weight == 300 { @return "book"; }
+  @if $weight == 400 { @return "regular"; }
+  @if $weight == 500 { @return "medium"; }
+  @if $weight == 600 { @return "semi-bold"; }
+  @if $weight == 700 { @return "bold"; }
+  @if $weight == 800 { @return "extra-bold"; }
+  @if $weight == 900 { @return "heavy"; }
+
+  @warn "Not a valid weight";
+  @return false;
 }
 
 
@@ -163,58 +158,61 @@
 
 ///
 /// Mixes in the shorthand font tag. This is the only mixin that takes the font-size and line-height in their final unit of output.
-/// More info: [$default-font-size](./#variable-default-font-size), [$default-line-height](./#variable-default-line-height)
+/// More info: [$font-size](./#variable-default-font-size), [$line-height](./#variable-default-line-height)
 ///
 /// @since 0.1
 ///
 /// @todo Accept properties in the same way as the default CSS font implementation
-/// 
+///
 /// @param {List | Bool} $type - a valid type array ($style, $variant, $weight, $family) or false to only output font-size and line-height
-/// @param {Number} $font-size ($default-font-size) - font-size in the final unit of output
-/// @param {Number} $line-height ($default-line-height) - line-height in the final unit of output
-///
-
-@mixin font($arguments...)
-{
-    $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;
-            }
-        }
-    }
+/// @param {Number} $font-size ($font-size) - font-size in the final unit of output
+/// @param {Number} $line-height ($line-height) - line-height in the final unit of output
+///
 
-    @if not(not($type)) {
+@mixin font($arguments...) {
 
-        $font-style: extract-type-style($type);
-        $font-variant: extract-type-variant($type);
-        $font-weight: extract-type-weight($type);
-        $font-family: extract-type-family($type);
+  $type: null;
+  $font-size: null;
+  $line-height: null;
 
-        @if $font-size and unit($unit)==rem {
-            @include font-size($font-size, 1px);
-        }
+  @each $argument in $arguments {
 
-        // 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});
+    @if type-of($argument) == list {
+      $type: $argument;
+    }
+@else {
+      @if not($font-size) {
+        $font-size: $argument;
+      }
+@elseif not($line-height) {
+        $line-height: $argument;
+      }
+    }
+  }
+
+  @if not(not($type)) {
 
-        font: #{$font};
+    $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};
+  }
 }
 
 
@@ -226,9 +224,8 @@
 /// @param {List} $type: a valid type list ($style, $variant, $weight, $family)
 ///
 
-@mixin font-style($type)
-{
-    font-style: extract-type-style($type);
+@mixin font-style($type) {
+  font-style: extract-type-style($type);
 }
 
 
@@ -240,9 +237,8 @@
 /// @param {List} $type: a valid type list ($style, $variant, $weight, $family)
 ///
 
-@mixin font-variant($type)
-{
-    font-variant: extract-type-variant($type);
+@mixin font-variant($type) {
+  font-variant: extract-type-variant($type);
 }
 
 
@@ -254,9 +250,8 @@
 /// @param {List} $type: a valid type list ($style, $variant, $weight, $family)
 ///
 
-@mixin font-weight($type)
-{
-    font-weight: extract-type-weight($type);
+@mixin font-weight($type) {
+  font-weight: extract-type-weight($type);
 }
 
 
@@ -268,9 +263,8 @@
 /// @param {List} $type: a valid type list ($style, $variant, $weight, $family)
 ///
 
-@mixin font-family($type)
-{
-    font-family: extract-type-family($type);
+@mixin font-family($type) {
+  font-family: extract-type-family($type);
 }
 
 
@@ -281,31 +275,26 @@
 ///
 /// @param {Number} $target-px - The font-size in px
 /// @param {Number} $unit ($unit) - The final unit to which $target-px is converted, e.g.px | rem | em | %
-/// @param {Number} $context ($default-font-size) - The context of the targeted element, for calculations to em or %
+/// @param {Number} $context ($font-size) - The context of the targeted element, for calculations to em or %
 ///
 
-@mixin font-size($target-px, $unit: $unit, $context: $default-font-size)
-{
-    @if unit($unit) == rem {
-        font-size: to-unit($target-px, $rem-fallback-unit, $context);
-    }
-    font-size: to-unit($target-px, $unit, $context);
+@mixin font-size($target-px, $unit: $unit, $context: $font-size) {
+  @if unit($unit) == rem {
+    font-size: to-unit($target-px, $rem-fallback-unit, $context);
+  }
+  font-size: to-unit($target-px, $unit, $context);
 }
 
 ///
-/// Mixin for line-height, automatically converts the value to a new unit, within the context of it's containing element
+/// Mixin for line-height
 ///
 /// @since 0.1
 ///
 /// @param {Number} $target-px - the line-height in px
-/// @param {Number} $context ($default-font-size) - The context of the targeted element, for calculations to em
+/// @param {Number} $context ($font-size) - The context of the targeted element, for calculations to em
 /// @param {Number} $unit ($line-height-unit) - The final unit to which $target-px is converted, e.g. 1px, 1rem, 1em, 1% or 1 for unitless
 ///
 
-@mixin line-height($target-px, $context: $default-font-size, $unit: $line-height-unit)
-{
-    @if unit($unit)==rem {
-        line-height: line-height($target-px, $context, $unit: $rem-fallback-unit);
-    }    
-    line-height: line-height($target-px, $context, $unit);
+@mixin line-height($font-size, $min-ratio: 1.5) {
+  line-height: line-height($font-size, $min-ratio);
 }

data/sass/piecss/utilities/_unit.scss

@@ -24,7 +24,7 @@
 ///
 
 @function strip-unit($value) {
-    @return $value / ($value * 0 + 1);
+  @return $value / ($value * 0 + 1);
 }
 
 
@@ -37,66 +37,101 @@
 ///
 /// @param {Number} $target-px - The final size in px
 /// @param {Number} $unit ($unit) - The final unit to which $target-px is converted, e.g. 1px, 1rem, 1em, 1%
-/// @param {Number} $context ($default-font-size) - The context of the targeted element, for calculations to em
+/// @param {Number} $context ($font-size) - The context of the targeted element, for calculations to em
 ///
 /// @return {Number} - The value in the requested unit
 ///
 
-@function to-unit($number, $unit: $unit, $context: $default-font-size) {
-    @if not(type-of($number)==number) {
-        @warn 'Argument $number needs to be a number.';
-        @return $number;
-    }
+@function to-unit($number, $unit: $unit, $context: $font-size) {
+  @if not(type-of($number) == number) {
+    @warn "Argument $number needs to be a number.";
+    @return $number;
+  }
+
+  @if strip-unit($number) == 0 {
+    @return strip-unit($number);
+  }
+
+  @if unitless($number) and not($number == 0) {
+    // We're dealing with a rhythm number, convert to px
+    $number: -rhythm-units($number);
+  }
+
+  @if unit($number) != px {
+    // Convert the value to px first
+    $number: to-px($number);
+  }
+
+  @if unit($unit) == "px" {
+  }
+  @elseif unit($unit) == "%" {
+    $number: percentage($number / $context);
+  }
+  @elseif unit($unit) == "rem" {
+    $number: $number / $font-size * $unit;
+  }
+  @else {
+    $number: $number / $context * $unit;
+  }
+
+  @return $number;
+}
 
-    @if strip-unit($number)==0 {
-        @return strip-unit($number);
-    }
+///
+/// Convert a px value to a new unit, within the context of it's containing element
+///
+/// @throws Argument $value needs to be unitless, or set in px.
+///
+/// @since 0.1
+///
+/// @param {Number} $target-px - The final size in px
+/// @param {Number} $unit ($unit) - The final unit to which $target-px is converted, e.g. 1px, 1rem, 1em, 1%
+/// @param {Number} $context ($font-size) - The context of the targeted element, for calculations to em
+///
+/// @return {Number} - The value in the requested unit
+///
 
-    @if unitless($number) and not($number==0) {
-        /* We're dealing with a rhythm number, convert to px */
-        $number: -rhythm-units($number);
-    }
+@function px($value, $unit: $unit, $context: $font-size) {
 
-    @if unit($number) != px {
-        /* Convert the value to px first */
-        $number: to-px($number);
-    }
+  @if unit($value) != "px" {
+    @warn "Argument $value needs to be unitless, or set in px.";
+    @return $value;
+  }
 
-    @if unit($unit)=='px' {
-    } @elseif unit($unit)=='%' {
-        $number: percentage($number / $context);
-    } @elseif unit($unit)=='rem' {
-        $number: $number / $default-font-size * $unit;
-    } @else {
-        $number: $number / $context * $unit;
-    }
+  @if unitless($value) {
+    $value: $value * 1px;
+  }
 
-    @return $number;
+  @return to-unit($value, $unit, $context);
 }
 
+
 ///
-/// Convert any unit to a px value, within the context of it's containing element
+/// Convert any unit to a px value, within the context of it"s containing element
 ///
 /// @since 0.1
 ///
 /// @param {Number} $value - The value to convert, in any unit
-/// @param {Number} $context ($default-font-size) - The context of the targeted element, for calculations to em
-/// 
+/// @param {Number} $context ($font-size) - The context of the targeted element, for calculations to em
+///
 /// @return {Number} - The value in px
 ///
 
-@function to-px($value, $context: $default-font-size) {
-    @if unit($value)=='px' {
-    } @elseif unit($value)=='rem' {
-        $value: rem-to-px($value);
-    } @elseif unit($value)=='em' {
-        $value: em-to-px($value, $context);
-    } @elseif unit($value)=='%' {
-        $value: percentage-to-px($value);
-    }
+@function to-px($value, $context: $font-size) {
 
-    @return $value;
+  @if unit($value) == "px" {
+  }
+  @elseif unit($value) == "rem" {
+    $value: rem-to-px($value);
+  }
+  @elseif unit($value) == "em" {
+    $value: em-to-px($value, $context);
+  }
+  @elseif unit($value) == "%" {
+    $value: percentage-to-px($value);
+  }
 
+  @return $value;
 }
 
 ///
@@ -105,12 +140,12 @@
 /// @since 0.1
 ///
 /// @param {Number} $value - The value to convert
-/// 
+///
 /// @return {Number} - The value in px
 ///
 
 @function rem-to-px($value) {
-    @return $default-font-size * strip-unit($value);
+  @return $font-size * strip-unit($value);
 }
 
 ///
@@ -119,13 +154,13 @@
 /// @since 0.1
 ///
 /// @param {Number} $value - The value to convert
-/// @param {Number} $context ($default-font-size) - The context of the targeted element
-/// 
+/// @param {Number} $context ($font-size) - The context of the targeted element
+///
 /// @return {Number} - The value in px
 ///
 
-@function em-to-px($value, $context: $default-font-size) {
-    @return $context * strip-unit($value);
+@function em-to-px($value, $context: $font-size) {
+  @return $context * strip-unit($value);
 }
 
 ///
@@ -136,11 +171,11 @@
 /// @todo Needs to take into account the context
 ///
 /// @param {Number} $value - The value to convert
-/// @param {Number} $context ($default-font-size) - The context of the targeted element
-/// 
+/// @param {Number} $context ($font-size) - The context of the targeted element
+///
 /// @return {Number} - The value in px
 ///
 
-@function percentage-to-px($value, $context: $default-font-size) {
-    @return $value/100% * $context;
+@function percentage-to-px($value, $context: $font-size) {
+  @return $value / 100% * $context;
 }

data/templates/project/_sets/_button.scss

@@ -1,5 +1,5 @@
 /*
-/// Copyright (C) 2014 Crossing Hippos - Babs Gösgens. All rights reserved.
+/// Copyright (C) 2014 Babs Gösgens. All rights reserved.
 /// Licensed under MIT; see LICENSE.txt
 ///
 

data/templates/project/_sets/_form.scss

@@ -1,5 +1,5 @@
 /*
-/// Copyright (C) 2014 Crossing Hippos - Babs Gösgens. All rights reserved.
+/// Copyright (C) 2014 Babs Gösgens. All rights reserved.
 /// Licensed under MIT; see LICENSE.txt
 ///
 

data/templates/project/_sets.scss

@@ -1,5 +1,5 @@
 /*
-/// Copyright (C) 2014 Crossing Hippos - Babs Gösgens. All rights reserved.
+/// Copyright (C) 2014 Babs Gösgens. All rights reserved.
 /// Licensed under MIT; see LICENSE.txt
 ///
 

data/templates/project/_settings.scss

@@ -1,5 +1,5 @@
 /*
-/// Copyright (C) 2014 Crossing Hippos - Babs Gösgens. All rights reserved.
+/// Copyright (C) 2014 Babs Gösgens. All rights reserved.
 /// Licensed under MIT; see LICENSE.txt
 ///
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piecss
 version: !ruby/object:Gem::Version
-  version: 0.2.0.0
+  version: 0.3.0.1
 platform: ruby
 authors:
 - Babs Gosgens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.4'
 description: Piecss produces little to none output. The only default output that Piecss
   produces is an optimized version of Normalize.
 email: babsgosgens@gmail.com
@@ -63,38 +49,23 @@ files:
 - sass/piecss/settings/_base.scss
 - sass/piecss/settings/_breakpoint.scss
 - sass/piecss/settings/_button.scss
+- sass/piecss/settings/_colour.scss
 - sass/piecss/settings/_constants.scss
 - sass/piecss/settings/_font.scss
 - sass/piecss/settings/_form.scss
-- sass/piecss/settings/_grid.scss
+- sass/piecss/settings/_layout.scss
 - sass/piecss/settings/_list.scss
-- sass/piecss/settings/fonts/_asap.scss
-- sass/piecss/settings/fonts/_bree-serif.scss
+- sass/piecss/settings/_miscellaneous.scss
+- sass/piecss/settings/_rhythm.scss
+- sass/piecss/settings/_typography.scss
 - sass/piecss/settings/fonts/_example.scss
-- sass/piecss/settings/fonts/_lato.scss
 - sass/piecss/settings/fonts/_monospace.scss
-- 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
-- sass/piecss/settings/fonts/_sofia-pro.scss
-- sass/piecss/settings/fonts/_varela-round.scss
 - sass/piecss/settings/fonts/_verdana.scss
-- sass/piecss/settings/fonts/icon-fonts/_fontawesome.scss
-- sass/piecss/settings/fonts/icon-fonts/_foundation-accessability.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_bootstrap.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_core.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_extras.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_icons.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_mixins.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_path.scss
-- sass/piecss/settings/fonts/icon-fonts/fontawesome/_variables.scss
-- sass/piecss/settings/fonts/icon-fonts/foundation-accessability/_settings.scss
 - sass/piecss/utilities/_breakpoint.scss
 - sass/piecss/utilities/_cache.scss
+- sass/piecss/utilities/_colour.scss
 - sass/piecss/utilities/_element.scss
 - sass/piecss/utilities/_image.scss
 - sass/piecss/utilities/_layout.scss
@@ -102,6 +73,8 @@ files:
 - sass/piecss/utilities/_miscellaneous.scss
 - sass/piecss/utilities/_rhythm.scss
 - sass/piecss/utilities/_side.scss
+- sass/piecss/utilities/_string.scss
+- sass/piecss/utilities/_svg.scss
 - sass/piecss/utilities/_typography.scss
 - sass/piecss/utilities/_unit.scss
 - templates/project/_sets/_button.scss
@@ -131,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A collection of tools for building responsive websites.