accoutrement 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c58f280d0439f22a512a7d4add29e0db4b79332a
-  data.tar.gz: 48c456f79da1d78b16eeb8ba7386ddfd7db27d40
+  metadata.gz: 515657a22a3677a305a1a6a17da217a922b0c5c9
+  data.tar.gz: 2bc5de8afc236300aee126c8a5ff84b5f52ee098
 SHA512:
-  metadata.gz: 33acba32335fd078d26193bf2fb4be950e2e79303eb9e2509907f334428d90a456e4b1db9568fd7fc0ad622f555d532737af651210f28aba00d636b17d1fe05b
-  data.tar.gz: efc9b309c97108cc2ebef32236a83d6d42412aa477436a15d8d364054e70e4d72027ee2c14d266bccaa8188a2143ff8954cc8dc281c909dfabfef41ed8c69467
+  metadata.gz: 7950ffc5d8cf37da02621a16871729f6b150e6c4d6d607728823e78869a83aea2b14a5a52e82338c3cc13c9c35457188da5ca9c07f6bde29684ef67554755d1f
+  data.tar.gz: b1e1f3607d230c7f533f925ef4926ab8cf20a203469ee81e25f24d7e3035014ecc8a329f4b0a7756cfa58fb9d2986cbff4fb741453ff75c9ed45ce227a297d1e

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/stylesheets/accoutrement/_arrows.scss

@@ -2,40 +2,13 @@
 // ======
 
 @include set(arrows, (
-  position: top,
-  offset: center,
-  direction: auto,
+  direction: down,
   size: 1em,
+  spread: auto,
   color: black,
-  border-width: null,
-  border-color: null,
 ));
 
 
-// Arrow
-// -----
-@mixin arrow(
-  $arrow: get(arrows),
-  $root: relative
-) {
-  $arrow: _build-arrow($arrow);
-  $_body: map-get($arrow, body);
-  $_border: map-get($arrow, border);
-
-  position: $root;
-
-  &::after {
-    @extend %_arrow-base;
-    @include output-map($_body);
-  }
-
-  &::before {
-    @if $_border { @extend %_arrow-base; }
-    @include output-map($_border);
-  }
-}
-
-
 // Arrow Base
 // ----------
 @mixin _arrow-base {
@@ -52,6 +25,30 @@
 }
 
 
+// Arrow
+// -----
+@mixin arrow(
+  $arrow: get(arrows),
+  $place: before,
+  $extend: true,
+  $root: relative
+) {
+  $arrow: _build-arrow($arrow);
+
+  position: $root;
+
+  &#{'::' + $place} {
+    @if $extend {
+      @extend %_arrow-base;
+    } @else {
+      @include _arrow-base;
+    }
+    @include output-map($arrow);
+    @content;
+  }
+}
+
+
 // Parse Arrow
 // -----------
 @function _parse-arrow(
@@ -59,7 +56,6 @@
 ) {
   $_return: get(arrows);
   $_numbers: ();
-  $_strings: ();
 
   @if type-of($arrow) == map {
     $_return: map-merge($_return, $arrow);
@@ -71,27 +67,20 @@
       } @else if type-of($val) == color {
         $_return: map-merge($_return, (color: $val));
       } @else if type-of($val) == string {
-        @if index(auto up down forward backward, $val) {
+        @if index(up down left right, $val) {
           $_return: map-merge($_return, (direction: $val));
-        } @else {
-          $_strings: append($_strings, $val);
+        } @else if $val == auto {
+          $_return: map-merge($_return, (spread: $val));
         }
       } @else if type-of($val) == number {
         $_numbers: append($_numbers, $val);
       }
     }
 
-    @if length($_strings) > 0 {
-      $_return: map-merge($_return, (position: nth($_strings, 1)));
-      @if length($_strings) > 1 {
-        $_return: map-merge($_return, (offset: nth($_strings, 2)));
-      }
-    }
-
     @if length($_numbers) > 0 {
       $_return: map-merge($_return, (size: nth($_numbers, 1)));
       @if length($_numbers) > 1 {
-        $_return: map-merge($_return, (offset: nth($_numbers, 2)));
+        $_return: map-merge($_return, (spread: nth($_numbers, 2)));
       }
     }
   }
@@ -106,57 +95,23 @@
   $arrow
 ) {
   $arrow: _parse-arrow($arrow);
-  $_position: map-get($arrow, position);
-  $_offset: map-get($arrow, offset);
   $_color: map-get($arrow, color);
   $_size: map-get($arrow, size);
-  $_border-color: map-get($arrow, border-color);
-  $_border-size: map-get($arrow, border-width);
-  $_opposite: opposite-position($_position);
-
-  $_offset-position: if($_position == left or $_position == right, top, left);
-
-  @if $_offset == 'bottom' or $_offset == 'right' {
-    $_offset-position: opposite-position($_offset-position);
-  } @else if type-of($_offset) == "number" and $_offset != abs($_offset) {
-    $_offset-position: opposite-position($_offset-position);
-  }
+  $_spread: map-get($arrow, spread);
+  $_direction: map-get($arrow, direction);
+  $_direction: if($_direction == up, top, if($_direction == down, bottom, $_direction));
+  $_opposite: opposite-position($_direction);
 
-  $_border: null;
-  $_body: (
-    #{$_opposite}: 100%,
-    border-#{$_opposite}-color: $_color,
-    border-width: $_size,
-  );
-
-  @if $_offset {
-    @if $_offset == 'center' {
-      $_body: map-merge($_body, (
-        #{$_offset-position}: 50%,
-        margin-#{$_offset-position}: - $_size,
-      ));
-    } @else if type-of($_offset) == 'string' {
-      $_body: map-merge($_body, (
-        #{$_offset-position}: 0,
-      ));
-    } @else {
-      $_body: map-merge($_body, (
-        #{$_offset-position}: abs($_offset),
-      ));
-    }
-  }
+  $_return: (border-#{$_opposite}: $_size solid $_color);
 
-  @if $_border-size and $_border-color {
+  $_h: left right;
+  $_v: top bottom;
+  $_sides: if(index($_h, $_direction), $_v, $_h);
+  $_spread: if($_spread == auto, $_size, $_spread / 2);
 
-    $_border: map-merge($_body, (
-      border-#{$_opposite}-color: $_border-color,
-      margin-#{$_offset-position}: if($_offset == center, 0 - $_size, null),
-      margin-#{$_opposite}: $_border-size,
-    ));
+  @each $_side in $_sides {
+    $_return: map-merge($_return, (border-#{$_side}-width: $_spread));
   }
 
-  @return (
-    body: $_body,
-    border: $_border,
-  );
+  @return $_return;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accoutrement
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Eric Meyer