From fd5d722ffbb549990d27d3c33f622b3889b2dd56 Mon Sep 17 00:00:00 2001 From: George Connor Date: Mon, 2 Mar 2015 15:37:26 +1300 Subject: [PATCH] Adding default split button border color and making it so the value passed actually affects the color of the border. --- scss/foundation/_settings.scss | 1 + scss/foundation/components/_split-buttons.scss | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scss/foundation/_settings.scss b/scss/foundation/_settings.scss index affe28a64..bc43dcc87 100644 --- a/scss/foundation/_settings.scss +++ b/scss/foundation/_settings.scss @@ -1184,6 +1184,7 @@ $include-html-global-classes: $include-html-classes; // We use these to control different shared styles for Split Buttons // $split-button-function-factor: 10%; // $split-button-pip-color: $white; +// $split-button-span-border-color: rgba(255,255,255,0.5); // $split-button-pip-color-alt: $oil; // $split-button-active-bg-tint: rgba(0,0,0,0.1); diff --git a/scss/foundation/components/_split-buttons.scss b/scss/foundation/components/_split-buttons.scss index 49f0b6508..0582e17db 100644 --- a/scss/foundation/components/_split-buttons.scss +++ b/scss/foundation/components/_split-buttons.scss @@ -22,6 +22,7 @@ $split-button-function-factor: 10% !default; $split-button-pip-color: $white !default; $split-button-pip-color-alt: $oil !default; $split-button-active-bg-tint: rgba(0,0,0,0.1) !default; +$split-button-span-border-color: rgba(255,255,255,0.5) !default; // We use these to control tiny split buttons $split-button-padding-tny: $button-pip-tny * 10 !default; @@ -60,12 +61,12 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default; // // $padding - Type of padding to apply. Default: medium. Options: tiny, small, medium, large. // $pip-color - Color of the triangle. Default: $split-button-pip-color. -// $span-border - Border color of button divider. Default: $primary-color. +// $span-border - Border color of button divider. Default: $split-button-span-border-color. // $base-style - Apply base style to split button. Default: true. @mixin split-button( $padding:medium, $pip-color:$split-button-pip-color, - $span-border:$primary-color, + $span-border:$split-button-span-border-color, $base-style:true) { // With this, we can control whether or not the base styles come through. @@ -101,7 +102,7 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default; // Control the border color for the span area of the split button @if $span-border { span { - border-#{$default-float}-color: rgba(255,255,255,0.5); + border-#{$default-float}-color: $span-border; } } -- 2.47.2