From: Geoff Kimball <geoff@zurb.com>
Date: Thu, 14 Jan 2016 06:00:55 +0000 (-0800)
Subject: Fix <meter> examples in docs and color palette
X-Git-Tag: v6.2.0-rc.1~74^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f5fa4b714259dade22eadbd0618a9e730b83c9;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix <meter> examples in docs and color palette
---

diff --git a/docs/pages/progress-bar.md b/docs/pages/progress-bar.md
index 81d5f1c04..73917c3d4 100644
--- a/docs/pages/progress-bar.md
+++ b/docs/pages/progress-bar.md
@@ -103,13 +103,13 @@ For the *extra* adventurous developers out there, we also provide styles for the
 If you're using the Sass version of Foundation, add this line to your main Sass file to export the `<meter>` CSS:
 
 ```scss
-@import foundation-progress-element;
+@import foundation-meter-element;
 ```
 
 The meter automatically colors itself based on the current values, and the defined low, medium, and high ranges. [Learn more about the mechanics of `<meter>` values.](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Forms/The_native_form_widgets#Meters_and_progress_bars)
 
 ```html_example
-<meter value="30" min="0" low="33" medium="66" optimum="100" max="100"></meter>
-<meter value="50" min="0" low="33" medium="66" optimum="100" max="100"></meter>
-<meter value="100" min="0" low="33" medium="66" optimum="100" max="100"></meter>
+<meter value="30" min="0" low="33" high="66" optimum="100" max="100"></meter>
+<meter value="50" min="0" low="33" high="66" optimum="100" max="100"></meter>
+<meter value="100" min="0" low="33" high="66" optimum="100" max="100"></meter>
 ```
diff --git a/scss/_global.scss b/scss/_global.scss
index 2eef7ce62..5a338f9f9 100644
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -26,8 +26,8 @@ $foundation-palette: (
   primary: #2199e8,
   secondary: #777,
   success: #3adb76,
-  alert: #ffae00,
-  warning: #ec5840,
+  warning: #ffae00,
+  alert: #ec5840,
 ) !default;
 
 /// Color used for light gray UI items.