Update dependencies

4 files changed, 49 insertions, 22 deletions

diff --git a/assets/scss/_primer/support/mixins/buttons.scss b/assets/scss/_primer/support/mixins/buttons.scss
index 4b6cbb3..ca8b59f 100644
--- a/assets/scss/_primer/support/mixins/buttons.scss
+++ b/assets/scss/_primer/support/mixins/buttons.scss
@@ -1,3 +1,8 @@
+
+// TODO: See if the mixins below can be deprecated
+// Might still be needed for .btn-blue
+// ------------------------------------------------------------------
+
 // Button color generator for primary and themed buttons
 
 // New button hotness
diff --git a/assets/scss/_primer/support/variables/colors.scss b/assets/scss/_primer/support/variables/colors.scss
index ffbf018..3623156 100644
--- a/assets/scss/_primer/support/variables/colors.scss
+++ b/assets/scss/_primer/support/variables/colors.scss
@@ -15,11 +15,8 @@ $border-green:       $green-400 !default;
 $border-green-light: desaturate($green-300, 40%) !default;
 $border-purple:      $purple !default;
 $border-red:         $red !default;
-$border-red-light:   desaturate($red-300, 60%) !default;
-$border-yellow:      desaturate($yellow-300, 60%) !default;
-
-// Buttons have a slightly more opaque border than $border-black-fade (15% alpha)
-$border-color-button: rgba($black, 0.2) !default;
+$border-red-light:   $red-300 !default;
+$border-yellow:      $yellow-600 !default;
 
 // Background colors
 $bg-white:          $white !default;
@@ -37,16 +34,11 @@ $bg-purple:         $purple-500 !default;
 $bg-purple-light:   $purple-000 !default;
 $bg-pink:           $pink-500 !default;
 $bg-red:            $red-500 !default;
-$bg-red-light:      $red-100 !default;
+$bg-red-light:      $red-000 !default;
 $bg-yellow:         $yellow-500 !default;
 $bg-yellow-light:   $yellow-200 !default;
 $bg-yellow-dark:    $yellow-700 !default;
 
-// diffstat background colors
-$bg-diffstat-added: darken($green-400, 5%) !default;
-$bg-diffstat-deleted: $red-600 !default;
-$bg-diffstat-neutral: $gray-300 !default;
-
 // Text colors
 $text-black:        $black !default;
 $text-white:        $white !default;
@@ -54,7 +46,7 @@ $text-blue:         $blue-500 !default;
 $text-gray-dark:    $gray-900 !default;
 $text-gray-light:   $gray-500 !default;
 $text-gray:         $gray-600 !default;
-$text-green:        $green-500 !default;
+$text-green:        $green-600 !default;
 $text-orange:       $orange-900 !default;
 $text-orange-light: $orange-600 !default;
 $text-purple:       $purple !default;
diff --git a/assets/scss/_primer/support/variables/layout.scss b/assets/scss/_primer/support/variables/layout.scss
index cec508c..227235c 100644
--- a/assets/scss/_primer/support/variables/layout.scss
+++ b/assets/scss/_primer/support/variables/layout.scss
@@ -71,6 +71,20 @@ $em-spacer-4: 0.375em !default;  // 3/8
 $em-spacer-5: 0.5em !default;    // 1/2
 $em-spacer-6: 0.75em !default;   // 3/4
 
+// Size scale
+// Used for buttons, inputs, labels, avatars etc.
+$size: 16px !default;
+
+$size-0: 0 !default;
+$size-1: $size !default;           // 16px
+$size-2: $size-1 +  4px !default;  // 20px
+$size-3: $size-2 +  4px !default;  // 24px
+$size-4: $size-3 +  4px !default;  // 28px
+$size-5: $size-4 +  4px !default;  // 32px
+$size-6: $size-5 +  8px !default;  // 40px
+$size-7: $size-6 +  8px !default;  // 48px
+$size-8: $size-7 + 16px !default;  // 64px
+
 // Fixed-width container variables
 $container-width: 980px !default;
 $grid-gutter:     10px !default;
diff --git a/assets/scss/_primer/support/variables/misc.scss b/assets/scss/_primer/support/variables/misc.scss
index 30a8363..dd74a8f 100644
--- a/assets/scss/_primer/support/variables/misc.scss
+++ b/assets/scss/_primer/support/variables/misc.scss
@@ -1,22 +1,33 @@
 // Miscellaneous variables
 
-// Border size
+// Border
 $border-width: 1px !default;
 $border-color: $border-gray !default;
 $border-style: solid !default;
 $border: $border-width $border-color $border-style !default;
-$border-radius: 3px !default;
+
+// Border Radius
+$border-radius-1:  4px !default;
+$border-radius-2:  6px !default;
+$border-radius: $border-radius-2 !default;
 
 // Box shadow
-$box-shadow: 0 1px 1px rgba($black, 0.1) !default;
-$box-shadow-medium: 0 1px 5px $black-fade-15 !default;
-$box-shadow-large: 0 1px 15px $black-fade-15 !default;
-$box-shadow-extra-large: 0 10px 50px rgba($black, 0.07) !default;
+$box-shadow: 0 1px 0 rgba($black, 0.04) !default;
+$box-shadow-medium: 0 3px 6px rgba($gray-400, 0.15) !default;
+$box-shadow-large: 0 8px 24px rgba($gray-400, 0.2) !default;
+$box-shadow-extra-large: 0 12px 48px rgba($gray-400, 0.3) !default;
+
+$box-shadow-highlight: inset 0 1px 0 rgba($white, 0.25) !default; // top highlight
+$box-shadow-inset: inset 0 1px 0 rgba($border-color, 0.2) !default; // top inner shadow
+$box-shadow-focus: 0 0 0 3px rgba($border-blue, 0.3) !default; // blue focus ring
 
-// Button and form variables
-$form-control-shadow: inset 0 1px 2px rgba($black, 0.075) !default;
-$btn-input-focus-shadow: 0 0 0 0.2em rgba($blue, 0.3) !default;
-$btn-active-shadow: inset 0 0.15em 0.3em $black-fade-15 !default;
+// Button variables
+$border-color-button: $black-fade-15 !default;
+$btn-active-shadow: inset 0 0.15em 0.3em $black-fade-15 !default; // TODO: Deprecate?
+
+// Form variables
+$form-control-shadow: inset 0 1px 2px rgba($black, 0.075) !default; // TODO: Deprecate?
+$btn-input-focus-shadow: 0 0 0 0.2em rgba($blue, 0.3) !default; // TODO: Deprecate? Replaced by $box-shadow-focus
 
 // Tooltips
 $tooltip-max-width: 250px !default;
@@ -24,3 +35,8 @@ $tooltip-background-color: $black !default;
 $tooltip-text-color: $white !default;
 $tooltip-delay: 0.4s !default;
 $tooltip-duration: 0.1s !default;
+
+// diffstat background colors
+$bg-diffstat-added: darken($green-400, 5%) !default;
+$bg-diffstat-deleted: $red-600 !default;
+$bg-diffstat-neutral: $gray-300 !default;