]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Prevent Sass errors in settings file
authorGeoff Kimball <geoff@zurb.com>
Tue, 16 Feb 2016 22:19:40 +0000 (14:19 -0800)
committerGeoff Kimball <geoff@zurb.com>
Tue, 16 Feb 2016 22:19:48 +0000 (14:19 -0800)
scss/forms/_meter.scss
scss/settings/_settings.scss
scss/util/_color.scss

index e3740f210f4bacfc1715c95a22e7e50cf8df9bd9..27299323b7e12490214e03f9aa379b6fc0744e92 100644 (file)
@@ -8,15 +8,15 @@
 
 /// Height of a `<meter>` element.
 /// @type Length
-$meter-height: $progress-height !default;
+$meter-height: 1rem !default;
 
 /// Border radius of a `<meter>` element.
 /// @type Length
-$meter-radius: $progress-radius !default;
+$meter-radius: $global-radius !default;
 
 /// Background color of a `<meter>` element.
 /// @type Color
-$meter-background: $progress-background !default;
+$meter-background: $medium-gray !default;
 
 /// Meter fill for an optimal value in a `<meter>` element.
 /// @type Color
index 7b416e35b9215575b5dcce72824554852c350cec..c40f5c8dd5e8a11f1863532279954450f96cca89 100644 (file)
@@ -73,6 +73,8 @@ $global-text-direction: ltr;
 $global-flexbox: true;
 $print-transparent-backgrounds: true;
 
+@include add-foundation-colors();
+
 // 2. Breakpoints
 // --------------
 
@@ -384,9 +386,9 @@ $menu-icon-spacing: 0.25rem;
 // 23. Meter
 // ---------
 
-$meter-height: $progress-height;
-$meter-radius: $progress-radius;
-$meter-background: $progress-background;
+$meter-height: 1rem;
+$meter-radius: $global-radius;
+$meter-background: $medium-gray;
 $meter-fill-good: $success-color;
 $meter-fill-medium: $warning-color;
 $meter-fill-bad: $alert-color;
@@ -460,7 +462,7 @@ $reveal-overlay-background: rgba($black, 0.45);
 // 29. Slider
 // ----------
 
-$slider-width-vertical: $slider-height;
+$slider-width-vertical: 0.5rem;
 $slider-transition: all 0.2s ease-in-out;
 $slider-height: 0.5rem;
 $slider-background: $light-gray;
@@ -562,4 +564,3 @@ $topbar-submenu-background: $topbar-background;
 $topbar-title-spacing: 1rem;
 $topbar-input-width: 200px;
 $topbar-unstack-breakpoint: medium;
-
index 74c456b1c43e9ed064767913083fd196e0bbc3ff..1266d976be66b32c58a98cf08d19717a0990a1e0 100644 (file)
   }
   @return scale-color($color, $lightness: $scale);
 }
+
+@mixin add-foundation-colors() {
+  @if map-has-key($foundation-palette, primary) {
+    $primary-color: map-get($foundation-palette, primary) !global;
+  }
+  @if map-has-key($foundation-palette, secondary) {
+    $secondary-color: map-get($foundation-palette, secondary) !global;
+  }
+  @if map-has-key($foundation-palette, success) {
+    $success-color: map-get($foundation-palette, success) !global;
+  }
+  @if map-has-key($foundation-palette, warning) {
+    $warning-color: map-get($foundation-palette, warning) !global;
+  }
+  @if map-has-key($foundation-palette, alert) {
+    $alert-color: map-get($foundation-palette, alert) !global;
+  }
+}