shipyard-framework 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c1f04d38253055bc768970e7bd4cab221962cd
-  data.tar.gz: b6cde186407073f394509616e6a58b8922a2917c
+  metadata.gz: 825fc52001c93f3e001233bf5a454dccc704a734
+  data.tar.gz: a42500ccb5558fb4ee0b63a11ab3d7de2763bd2e
 SHA512:
-  metadata.gz: b7a09476a9799f56ba4b2baa2fb680c438f683afb0aa75c293584f855bd5de9421c1ac31de0ef7d5e5f640ad92158aa629f311e665a180bf17543a38de078b22
-  data.tar.gz: a937446bb6a8d0a0e7eb32c3e5a6e9ecd7182d4fc0e80057e1e0b8e8426b9dd5c45367e7834bbb8fc1da398b1c84f63fdc72f022515302b39fb5668c8823ca63
+  metadata.gz: 7f7d963f9562ff0864ea17d2767f7bcc6a98de75608ae85dc6b2d3524cf251ae36b024386a3d9feb9cfbfe21283ee91f27dc0bef19e35ed9456706b86f6e98d5
+  data.tar.gz: d6b81befa4d7eb079e0b4b164d2587474adcc070b705b2a05979251edf6cbd5e277cefe78e680b98026228bbc708bdbcecc59bbc0305a6dfeabf3bae4a733219

data/assets/stylesheets/shipyard/_components.sass

@@ -3,6 +3,7 @@
 @import shipyard/components/alerts
 @import shipyard/components/boxes
 @import shipyard/components/forms
+@import shipyard/components/form-errors
 @import shipyard/components/input-switch
 @import shipyard/components/empty
 @import shipyard/components/modals

data/assets/stylesheets/shipyard/_core.sass

@@ -1,9 +1,11 @@
 @import shipyard/variables/colors
+@import shipyard/functions/map-merge-options
 @import shipyard/functions/color
 @import shipyard/variables/color_utilities
 @import shipyard/variables/typography
 @import shipyard/variables/grid
 @import shipyard/variables/misc
+@import shipyard/variables/components
 @import shipyard/mixins/box-model
 @import shipyard/mixins/selectors
 @import shipyard/mixins/responsive

data/assets/stylesheets/shipyard/components/_form-errors.sass

@@ -0,0 +1,23 @@
++component('form-error')
+
+  +sub-component('container')
+    padding: 20px
+    margin: 15px 0
+
+  +sub-component('text')
+    margin: 0 0 15px
+
+  +sub-component('list')
+    list-style: none
+
+  +sub-component('item')
+    &:before
+      content: ""
+      border: 1px solid rgba(#fff,.5)
+      margin: 0 15px 0 1px
+      display: inline-block
+      border-radius: 50%
+      +width-height(6px)
+      vertical-align: middle
+      position: relative
+      top: -1px

data/assets/stylesheets/shipyard/components/_forms.sass

@@ -99,28 +99,20 @@
     &::after
       position: absolute
     &::before
-      top: 6px
-      right: 6px
       z-index: 1
       content: "*"
-      line-height: 18px
-      font-weight: $bold
-      color: darken($purple, 13%)
+      +component-styles(required-asterisk)
       +when('error')
-        color: #fff
+        +component-styles(required-asterisk-error)
     &::after
-      top: 2px
-      right: 2px
       content: ""
       display: block
+      border-style: solid
       border-radius: 0 3px 0 0
-      border: 12px solid transparent
-      background: $border-color-light
-      border-left-color: #fff
-      border-bottom-color: #fff
+      border-color: transparent
+      +component-styles(required-corner)
       +when('error')
-        border-top-color: $red
-        border-right-color: $red
+        +component-styles(required-corner-error)
 
   &-full
     width: 100%
@@ -140,31 +132,3 @@
     border-radius: 4px
     +respond-to(padding, (x0: 10px 15px, x1: 15px 20px))
     margin: 0
-
-.form-error
-  &-container
-    background: $red
-    border-radius: 5px
-    color: #fff
-    padding: 20px
-    margin: 15px 0
-    text-shadow: 0 1px 1px rgba($gray-darkest, .1)
-  &-text
-    margin: 0 0 15px
-    font-weight: $bold
-  &-list
-    list-style: none
-    margin: 0
-  &-item
-    color: #fff
-    font-weight: $medium
-    &:before
-      content: ""
-      border: 1px solid rgba(#fff,.5)
-      margin: 0 15px 0 1px
-      display: inline-block
-      border-radius: 50%
-      +width-height(6px)
-      vertical-align: middle
-      position: relative
-      top: -1px

data/assets/stylesheets/shipyard/functions/_map-merge-options.sass

@@ -0,0 +1,10 @@
+@function map-merge-options($defaults, $options)
+	$result: $defaults
+
+	@each $key, $value in $options
+		@if (not map-has-key($result, $key)) or (type-of(map-get($result, $key)) != type-of($value)) or (not (type-of(map-get($result, $key)) == map and type-of($value) == map))
+			$result: map-merge($result, ($key: $value))
+		@else
+			$result: map-merge($result, ($key: map-merge-options(map-get($result, $key), $value)))
+
+	@return $result

data/assets/stylesheets/shipyard/mixins/_components.sass

@@ -8,6 +8,7 @@
   $sub-component: "#{$component}-#{$name}" !global
   &-#{$name}
     @content
+    +component-styles($name)
 
 @mixin extend($modifier: null)
   @if $modifier
@@ -21,6 +22,12 @@
   @else if $component && map-get($z-index, $component)
     z-index: map-get($z-index, $component)
 
+@mixin component-styles($modifier)
+  $component-styles: map-get($components, $component)
+  @if $component-styles
+    @each $property, $value in map-get($component-styles, $modifier)
+      #{$property}: $value
+
 // Uses the base component class defined earlier (e.g. "alert").
 //
 // Notes:

data/assets/stylesheets/shipyard/variables/_components.scss

@@ -0,0 +1,43 @@
+$component-defaults: (
+  input: (
+    required-asterisk: (
+      top: 6px,
+      right: 6px,
+      line-height: 18px,
+      font-weight: $bold,
+      color: darken($purple, 13%)
+    ),
+    required-asterisk-error: (
+      color: #fff
+    ),
+    required-corner: (
+      top: 2px,
+      right: 2px,
+      border-width: 12px,
+      border-top-color: $border-color-light,
+      border-right-color: $border-color-light
+    ),
+    required-corner-error: (
+      border-top-color: $red,
+      border-right-color: $red
+    )
+  ),
+  form-error: (
+    container: (
+      color: #fff,
+      background: $red,
+      border-radius: 5px,
+      text-shadow: 0 1px 1px rgba($gray-darkest, .1)
+    ),
+    text: (
+      font-weight: $bold
+    ),
+    item: (
+      color: #fff,
+      font-weight: $medium
+    )
+  )
+) !default;
+
+$component-options: () !default;
+$components: map-merge-options($component-defaults, $component-options);

data/lib/shipyard-framework/version.rb

@@ -1,3 +1,3 @@
 module Shipyard
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 end

data/styleguide/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    shipyard-framework (0.3.9)
+    shipyard-framework (0.4.0)
       actionview (~> 5.0)
 
 GEM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipyard-framework
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Shipyard
@@ -96,6 +96,7 @@ files:
 - assets/stylesheets/shipyard/components/_boxes.sass
 - assets/stylesheets/shipyard/components/_buttons.sass
 - assets/stylesheets/shipyard/components/_empty.sass
+- assets/stylesheets/shipyard/components/_form-errors.sass
 - assets/stylesheets/shipyard/components/_forms.sass
 - assets/stylesheets/shipyard/components/_hamburger.sass
 - assets/stylesheets/shipyard/components/_hero.sass
@@ -108,6 +109,7 @@ files:
 - assets/stylesheets/shipyard/core/_reset.sass
 - assets/stylesheets/shipyard/core/_type.sass
 - assets/stylesheets/shipyard/functions/_color.sass
+- assets/stylesheets/shipyard/functions/_map-merge-options.sass
 - assets/stylesheets/shipyard/mixins/_box-model.sass
 - assets/stylesheets/shipyard/mixins/_components.sass
 - assets/stylesheets/shipyard/mixins/_positioning.sass
@@ -119,6 +121,7 @@ files:
 - assets/stylesheets/shipyard/utilities/_positioning.sass
 - assets/stylesheets/shipyard/variables/_color_utilities.sass
 - assets/stylesheets/shipyard/variables/_colors.scss
+- assets/stylesheets/shipyard/variables/_components.scss
 - assets/stylesheets/shipyard/variables/_grid.sass
 - assets/stylesheets/shipyard/variables/_misc.sass
 - assets/stylesheets/shipyard/variables/_typography.sass