From: LaurelBCodin <laurel@zurb.com>
Date: Mon, 24 Apr 2017 16:32:30 +0000 (-0700)
Subject: removed un-needed markup and file for the PR
X-Git-Tag: v6.4.0-rc1~54^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=764cd82f2c5d634897dcec7cb510fd326ebd2cdd;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

removed un-needed markup and file for the PR
---

diff --git a/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss b/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss
index 70a8d3d37..edfd399a2 100644
--- a/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss
+++ b/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss
@@ -424,7 +424,7 @@
     optgroup,
     select,
     textarea {
-      font-family: $base-font-family; /* 1 */
+      font-family: inherit; /* 1 */
       font-size: 100%; /* 1 */
       @if $normalize-vertical-rhythm {
         line-height: ($base-line-height / $base-font-size) * 1em; /* 1 */
diff --git a/docs/pages/button.md b/docs/pages/button.md
index e14ff7c9a..83e6dba40 100644
--- a/docs/pages/button.md
+++ b/docs/pages/button.md
@@ -40,7 +40,6 @@ Additional classes can be added to your button to change its size and shape.
 <a class="button large" href="#">So Large</a>
 <a class="button expanded" href="#">Such Expand</a>
 <a class="button small expanded" href="#">Wow, Small Expand</a>
-<button class="button test-button">Test button</button>
 ```
 
 
diff --git a/tmp.txt b/tmp.txt
deleted file mode 100644
index a43b38651..000000000
--- a/tmp.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-$button-padding: 4px;
-$button-padding: 4px 2px;
-$button-padding: 4px 1px 3px;
-$button-padding: 4px 5px 3px 1px;