From 3be4959623190f0bb6d880fe1fc2a9c187c4171e Mon Sep 17 00:00:00 2001
From: Adam Carpenter <gitlab@53hor.net>
Date: Sat, 26 Oct 2019 15:33:52 -0400
Subject: Updated Bulma!

---
 public/css/_sass/utilities/.DS_Store              | Bin 0 -> 6148 bytes
 public/css/_sass/utilities/controls.sass          |   6 +-
 public/css/_sass/utilities/derived-variables.sass |  39 ++++++++++---
 public/css/_sass/utilities/functions.sass         |  66 +++++++++++++++++-----
 public/css/_sass/utilities/initial-variables.sass |  13 +++--
 public/css/_sass/utilities/mixins.sass            |  12 ++--
 6 files changed, 99 insertions(+), 37 deletions(-)
 create mode 100644 public/css/_sass/utilities/.DS_Store

(limited to 'public/css/_sass/utilities')

diff --git a/public/css/_sass/utilities/.DS_Store b/public/css/_sass/utilities/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/public/css/_sass/utilities/.DS_Store differ
diff --git a/public/css/_sass/utilities/controls.sass b/public/css/_sass/utilities/controls.sass
index 7ca0521..cc7672a 100644
--- a/public/css/_sass/utilities/controls.sass
+++ b/public/css/_sass/utilities/controls.sass
@@ -3,11 +3,11 @@ $control-radius-small: $radius-small !default
 
 $control-border-width: 1px !default
 
-$control-height: 2.25em !default
+$control-height: 2.5em !default
 $control-line-height: 1.5 !default
 
-$control-padding-vertical: calc(0.375em - #{$control-border-width}) !default
-$control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default
+$control-padding-vertical: calc(0.5em - #{$control-border-width}) !default
+$control-padding-horizontal: calc(0.75em - #{$control-border-width}) !default
 
 =control
   -moz-appearance: none
diff --git a/public/css/_sass/utilities/derived-variables.sass b/public/css/_sass/utilities/derived-variables.sass
index c464814..18a7f46 100644
--- a/public/css/_sass/utilities/derived-variables.sass
+++ b/public/css/_sass/utilities/derived-variables.sass
@@ -19,20 +19,39 @@ $blue-invert: findColorInvert($blue) !default
 $purple-invert: findColorInvert($purple) !default
 $red-invert: findColorInvert($red) !default
 
-$primary-invert: $turquoise-invert !default
-$info-invert: $cyan-invert !default
-$success-invert: $green-invert !default
-$warning-invert: $yellow-invert !default
-$danger-invert: $red-invert !default
-$light-invert: $dark !default
-$dark-invert: $light !default
+$primary-invert: findColorInvert($primary) !default
+$primary-light: findLightColor($primary) !default
+$primary-dark: findDarkColor($primary) !default
+$info-invert: findColorInvert($info) !default
+$info-light: findLightColor($info) !default
+$info-dark: findDarkColor($info) !default
+$success-invert: findColorInvert($success) !default
+$success-light: findLightColor($success) !default
+$success-dark: findDarkColor($success) !default
+$warning-invert: findColorInvert($warning) !default
+$warning-light: findLightColor($warning) !default
+$warning-dark: findDarkColor($warning) !default
+$danger-invert: findColorInvert($danger) !default
+$danger-light: findLightColor($danger) !default
+$danger-dark: findDarkColor($danger) !default
+$light-invert: findColorInvert($light) !default
+$dark-invert: findColorInvert($dark) !default
 
 // General colors
 
+$scheme-main: $white !default
+$scheme-main-bis: $white-bis !default
+$scheme-main-ter: $white-ter !default
+$scheme-invert: $black !default
+$scheme-invert-bis: $black-bis !default
+$scheme-invert-ter: $black-ter !default
+
 $background: $white-ter !default
 
 $border: $grey-lighter !default
 $border-hover: $grey-light !default
+$border-light: $grey-lightest !default
+$border-light-hover: $grey-light !default
 
 // Text colors
 
@@ -52,7 +71,9 @@ $pre-background: $background !default
 // Link colors
 
 $link: $blue !default
-$link-invert: $blue-invert !default
+$link-invert: findColorInvert($link) !default
+$link-light: findLightColor($link) !default
+$link-dark: findDarkColor($link) !default
 $link-visited: $purple !default
 
 $link-hover: $grey-darker !default
@@ -79,7 +100,7 @@ $size-large: $size-4 !default
 $custom-colors: null !default
 $custom-shades: null !default
 
-$colors: mergeColorMaps(("white": ($white, $black), "black": ($black, $white), "light": ($light, $light-invert), "dark": ($dark, $dark-invert), "primary": ($primary, $primary-invert), "link": ($link, $link-invert), "info": ($info, $info-invert), "success": ($success, $success-invert), "warning": ($warning, $warning-invert), "danger": ($danger, $danger-invert)), $custom-colors) !default
+$colors: mergeColorMaps(("white": ($white, $black), "black": ($black, $white), "light": ($light, $light-invert), "dark": ($dark, $dark-invert), "primary": ($primary, $primary-invert, $primary-light, $primary-dark), "link": ($link, $link-invert, $link-light, $link-dark), "info": ($info, $info-invert, $info-light, $info-dark), "success": ($success, $success-invert, $success-light, $success-dark), "warning": ($warning, $warning-invert, $warning-light, $warning-dark), "danger": ($danger, $danger-invert, $danger-light, $danger-dark)), $custom-colors) !default
 $shades: mergeColorMaps(("black-bis": $black-bis, "black-ter": $black-ter, "grey-darker": $grey-darker, "grey-dark": $grey-dark, "grey": $grey, "grey-light": $grey-light, "grey-lighter": $grey-lighter, "white-ter": $white-ter, "white-bis": $white-bis), $custom-shades) !default
 
 $sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 $size-7 !default
diff --git a/public/css/_sass/utilities/functions.sass b/public/css/_sass/utilities/functions.sass
index acd3e83..481ab95 100644
--- a/public/css/_sass/utilities/functions.sass
+++ b/public/css/_sass/utilities/functions.sass
@@ -1,34 +1,53 @@
 @function mergeColorMaps($bulma-colors, $custom-colors)
-  // we return at least bulma hardcoded colors
+  // We return at least Bulma's hard-coded colors
   $merged-colors: $bulma-colors
 
-  // we want a map as input
+  // We want a map as input
   @if type-of($custom-colors) == 'map'
     @each $name, $components in $custom-colors
-      // color name should be a string and colors pair a list with at least one element
+      // The color name should be a string
+      // and the components either a single color
+      // or a colors list with at least one element
       @if type-of($name) == 'string' and (type-of($components) == 'list' or type-of($components) == 'color') and length($components) >= 1
         $color-base: null
+        $color-invert: null
+        $color-light: null
+        $color-dark: null
+        $value: null
 
-        // the param can either be a single color
+        // The param can either be a single color
         // or a list of 2 colors
         @if type-of($components) == 'color'
           $color-base: $components
+          $color-invert: findColorInvert($color-base)
+          $color-light: findLightColor($color-base)
+          $color-dark: findDarkColor($color-base)
         @else if type-of($components) == 'list'
           $color-base: nth($components, 1)
+          // If Invert, Light and Dark are provided
+          @if length($components) > 3
+            $color-invert: nth($components, 2)
+            $color-light: nth($components, 3)
+            $color-dark: nth($components, 4)
+            // If only Invert and Light are provided
+          @else if length($components) > 2
+            $color-invert: nth($components, 2)
+            $color-light: nth($components, 3)
+            $color-dark: findDarkColor($color-base)
+            // If only Invert is provided
+          @else
+            $color-invert: nth($components, 2)
+            $color-light: findLightColor($color-base)
+            $color-dark: findDarkColor($color-base)
 
-        $color-invert: null
-        // is an inverted color provided in the list
-        @if length($components) > 1
-          $color-invert: nth($components, 2)
+        $value: ($color-base, $color-invert, $color-light, $color-dark)
 
-        // we only want a color as base color
+        // We only want to merge the map if the color base is an actual color
         @if type-of($color-base) == 'color'
-          // if inverted color is not provided or is not a color we compute it
-          @if type-of($color-invert) != 'color'
-            $color-invert: findColorInvert($color-base)
-
-          // we merge this colors elements as map with bulma colors (we can override them this way, no multiple definition for the same name)
-          $merged-colors: map_merge($merged-colors, ($name: ($color-base, $color-invert)))
+          // We merge this colors elements as map with Bulma's colors map
+          // (we can override them this way, no multiple definition for the same name)
+          // $merged-colors: map_merge($merged-colors, ($name: ($color-base, $color-invert, $color-light, $color-dark)))
+          $merged-colors: map_merge($merged-colors, ($name: $value))
 
   @return $merged-colors
 
@@ -60,3 +79,20 @@
     @return rgba(#000, 0.7)
   @else
     @return #fff
+
+@function findLightColor($color)
+  @if type-of($color) == 'color'
+    $l: 96%
+    @if lightness($color) > 96%
+      $l: lightness($color)
+    @return change-color($color, $lightness: $l)
+  @return $background
+
+@function findDarkColor($color)
+  @if type-of($color) == 'color'
+    $base-l: 29%
+    $luminance: colorLuminance($color)
+    $luminance-delta: (0.53 - $luminance)
+    $target-l: round($base-l + ($luminance-delta * 53))
+    @return change-color($color, $lightness: max($base-l, $target-l))
+  @return $text-strong
diff --git a/public/css/_sass/utilities/initial-variables.sass b/public/css/_sass/utilities/initial-variables.sass
index 421bd3d..03bbc12 100644
--- a/public/css/_sass/utilities/initial-variables.sass
+++ b/public/css/_sass/utilities/initial-variables.sass
@@ -9,6 +9,7 @@ $grey-dark:    hsl(0, 0%, 29%) !default
 $grey:         hsl(0, 0%, 48%) !default
 $grey-light:   hsl(0, 0%, 71%) !default
 $grey-lighter: hsl(0, 0%, 86%) !default
+$grey-lightest: hsl(0, 0%, 93%) !default
 
 $white-ter:    hsl(0, 0%, 96%) !default
 $white-bis:    hsl(0, 0%, 98%) !default
@@ -16,12 +17,12 @@ $white:        hsl(0, 0%, 100%) !default
 
 $orange:       hsl(14,  100%, 53%) !default
 $yellow:       hsl(48,  100%, 67%) !default
-$green:        hsl(141, 71%,  48%) !default
+$green:        hsl(141, 53%,  53%) !default
 $turquoise:    hsl(171, 100%, 41%) !default
-$cyan:         hsl(204, 86%,  53%) !default
+$cyan:         hsl(204, 71%,  53%) !default
 $blue:         hsl(217, 71%,  53%) !default
 $purple:       hsl(271, 100%, 71%) !default
-$red:          hsl(348, 100%, 61%) !default
+$red:          hsl(348, 86%, 61%) !default
 
 // Typography
 
@@ -43,10 +44,14 @@ $weight-medium: 500 !default
 $weight-semibold: 600 !default
 $weight-bold: 700 !default
 
+// Spacing
+
+$block-spacing: 1.5rem !default
+
 // Responsiveness
 
 // The container horizontal gap, which acts as the offset for breakpoints
-$gap: 64px !default
+$gap: 32px !default
 // 960, 1152, and 1344 have been chosen because they are divisible by both 12 and 16
 $tablet: 769px !default
 // 960px container + 4rem
diff --git a/public/css/_sass/utilities/mixins.sass b/public/css/_sass/utilities/mixins.sass
index 5623e3c..4ef2985 100644
--- a/public/css/_sass/utilities/mixins.sass
+++ b/public/css/_sass/utilities/mixins.sass
@@ -159,9 +159,9 @@
 %arrow
   +arrow
 
-=block
+=block($spacing: $block-spacing)
   &:not(:last-child)
-    margin-bottom: 1.5rem
+    margin-bottom: $spacing
 
 %block
   +block
@@ -170,7 +170,7 @@
   @extend %unselectable
   -moz-appearance: none
   -webkit-appearance: none
-  background-color: rgba($black, 0.2)
+  background-color: rgba($scheme-invert, 0.2)
   border: none
   border-radius: $radius-rounded
   cursor: pointer
@@ -190,7 +190,7 @@
   width: 20px
   &::before,
   &::after
-    background-color: $white
+    background-color: $scheme-main
     content: ""
     display: block
     left: 50%
@@ -206,9 +206,9 @@
     width: 2px
   &:hover,
   &:focus
-    background-color: rgba($black, 0.3)
+    background-color: rgba($scheme-invert, 0.3)
   &:active
-    background-color: rgba($black, 0.4)
+    background-color: rgba($scheme-invert, 0.4)
   // Sizes
   &.is-small
     height: 16px
-- 
cgit v1.2.3