forever_style_guide 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1e98a2b5bfcd2a1840cc62a8bbba1a7ade6df2a4
-  data.tar.gz: 93326ef22ca1bb8109e85028b77d4afba7d79f1a
+SHA256:
+  metadata.gz: 7dfb56bd24fe46a7ff9b5ec38b413ba91cb8e49bf4bd96e579abf320aed2e395
+  data.tar.gz: 927b123bd47a7415a941ea0bc8958288e3ce8b0a9ca05a3b61b0609358ad890e
 SHA512:
-  metadata.gz: c3271edb8339a575358cb32396bc7e05ac77d8af16e152c26d62dc161ba03f517e86d7ecd546afe56954026b986b12621ea06a554c80a5aae3b517980a3a2616
-  data.tar.gz: 323b2b309bf5c040290dd3b46c8d3ceb54e7ac84d712022209c6eb1b85bb246ab4755dfdf39b097a5ca4ba07a2564996e44e50ae4a675d80b2a5e1d896e2eded
+  metadata.gz: 7bb76f1ce4f96d461890987736edb8615e54ce98fa2490eb5fabcb8f60377438b9455bff9b9924cca5cd46b54380ae6eb0b4746098456b6fce1032f0d283c7d0
+  data.tar.gz: e24b6a5d5aeb47a3c768beede79e175ad10a6d0fca5e0c034de8cc8e685938aae9179a6fae702723a14d4a3dbb44297e71faa2015877c3fb8b6f36c8b4dae844

data/app/assets/stylesheets/forever_style_guide/globals/_colors.scss

@@ -21,7 +21,6 @@ $color-forever_silver:      set_color('silver', #f6f7fb) !default;
 
 // Deprecated brand color declarations, colors that should eventually be removed
 $color-forever_purple:      colorify('purple', #731472) !default;
-$color-forever_beige:       set_color('beige', #ebeae6) !default;
 
 // B&W, these colors just get registered they don't have dark/light variations
 $color-white:               set_color('white', #fff) !default;
@@ -34,6 +33,10 @@ $color-gray-600:            set_color('gray-600', #666) !default;
 $color-gray-700:            set_color('gray-700', #333) !default;
 $color-gray-800:            set_color('gray-800', #222) !default;
 $color-black:               set_color('black', #000) !default;
+$color-forever_beige:       set_color('beige', #ebeae6) !default;
+$color-background:          set_color('background', $color-forever_beige) !default;
+$color-text:                set_color('text', $color-forever_gray) !default;
+
 
 // Semantic color usages, list of aliases for declared colors.
 $color-primary:             colorify('primary', $color-forever_green) !default;
@@ -41,8 +44,6 @@ $color-secondary:           colorify('secondary', $color-forever_blue) !default;
 $color-accent:              colorify('accent', $color-forever_valet) !default;
 $color-warning:             colorify('warning', $color-forever_orange) !default;
 $color-danger:              colorify('danger', $color-forever_red) !default;
-$color-background:          set_color('background', $color-forever_beige) !default;
-$color-text:                set_color('text', $color-forever_gray) !default;
 
 // Forever LIVE! 2016 brand colors
 $color-live16-green:        colorify('live16-green', #367860) !default;

data/app/assets/stylesheets/forever_style_guide/modules/_button.scss

@@ -1,26 +1,28 @@
 @mixin btn-color($color, $inverse: false) {
+  $colorified-color: color('#{$color}'); // set local variable to avoid compilation problems with 'black' and 'white' in Mars UI
   @if ($inverse) {
-    color: color('#{$color}');
+    color: $colorified-color;
     background-color: color('white');
-    border: 2px solid color('#{$color}');
+    border: 2px solid $colorified-color;
     @extend %no-shadow;
     &:hover,
     &:active,
     &:active:focus {
-      color: color('#{$color}-dark');
-      background-color: color('white');
-      text-decoration: underline;
+      color: darken($colorified-color, $darken-color-percentage);
+      border-color: darken($colorified-color, $darken-color-percentage);
+      background-color: lighten($colorified-color, 40%);
+      text-decoration: none;
     }
   } @else {
     color: color('white');
-    background-color: color('#{$color}');
-    border: 2px solid color('#{$color}');
+    background-color: $colorified-color;
+    border: 2px solid $colorified-color;
     @extend %no-shadow;
     &:hover,
     &:active,
     &:active:focus {
-      background-color: color('#{$color}-dark');
-      border-color: color('#{$color}-dark');
+      background-color: darken($colorified-color, $darken-color-percentage);
+      border-color: darken($colorified-color, $darken-color-percentage);
       text-decoration: none;
     }
   }
@@ -56,8 +58,8 @@
     }
   }
 
-  // creates a button style for each color in core color dictionary
-  @each $id, $color in $core_colors {
+  // creates a button style for each color in color dictionary
+  @each $id, $color in $colors {
     @at-root #{&}.btn-#{$id} {
       @include btn-color(#{$id});
 

data/app/assets/stylesheets/forever_style_guide/modules/_hero_simple.scss

@@ -64,9 +64,6 @@ $hero_simple-sm-height-md: 260px;
   bottom: 0;
   padding: 30px;
 
-  @media (min-width: $screen-xxl) {
-    padding: 50px;
-  }
   @media (max-width: $screen-xs) {
     padding: 25px 20px;
   }

data/app/assets/stylesheets/forever_style_guide/utils/_color-utils.scss

@@ -1,7 +1,9 @@
 /* =colors-utils
 
+
 Sass functions and color related variables beyond standard color declarations
 ---------------------------------------------------------------------------- */
+$darken-color-percentage: 10%;
 
 // map for all color declarations
 $colors: () !default;
@@ -17,7 +19,7 @@ $variations: (
   ),
   dark: (
     function: darken,
-    parameters: 10%
+    parameters: $darken-color-percentage
   )
 );
 

data/lib/forever_style_guide/version.rb

@@ -1,3 +1,3 @@
 module ForeverStyleGuide
-  VERSION = "3.4.3"
+  VERSION = "3.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forever_style_guide
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - Nicholas McClay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A live style guide and component API for the Forever brand