]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Adding default split button border color and making it so the value passed actually... 6370/head
authorGeorge Connor <grgcnnr@gmail.com>
Mon, 2 Mar 2015 02:37:26 +0000 (15:37 +1300)
committerGeorge Connor <grgcnnr@gmail.com>
Fri, 6 Mar 2015 05:30:40 +0000 (18:30 +1300)
scss/foundation/_settings.scss
scss/foundation/components/_split-buttons.scss

index affe28a6424a407c8aed832551363ac29142a8fa..bc43dcc87af03b5a2b8414c301aa817cc2fdcded 100644 (file)
@@ -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);
 
index 49f0b650862e61e724ce1f2a9bb50c8d5534a5a0..0582e17dbd4236ecf45d2f4654c4d3e9f16f8d9e 100644 (file)
@@ -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;
     }
   }