From e71b696a8f16bba4f03ab48ecee56dbba93ec1e3 Mon Sep 17 00:00:00 2001
From: Mark Geller <mgeller@enmasse.com>
Date: Mon, 28 Oct 2013 14:50:33 -0700
Subject: [PATCH 1/2] Merged form buttons and button pages into a single page

---
 patterns/buttons.html      | 30 ++++++++++++++++++++++++++++++
 patterns/form-buttons.html | 17 -----------------
 2 files changed, 30 insertions(+), 17 deletions(-)
 delete mode 100644 patterns/form-buttons.html

diff --git a/patterns/buttons.html b/patterns/buttons.html
index 549f169..bc627e8 100644
--- a/patterns/buttons.html
+++ b/patterns/buttons.html
@@ -1,11 +1,41 @@
 <div class="preview">
+  <h3>Link Buttons</h3>
   <a href="#" class="button-primary">Primary Button Text</a>
   <a href="#" class="button-secondary">Secondary Button Text</a>
+  <h3>Form Buttons</h3>
+    <form>
+    <fieldset>
+      <p><input type="button" value="Input type button"></p>
+      <p><input type="reset" value="Input type reset"></p>
+      <p><input type="submit" value="Input type submit"></p>
+      <p><input type="submit" value="Input type submit disabled" disabled></p>
+      <p><input type="button" value="Input type button disabled" disabled></p>
+      <p><button type="button">Button type button</button></p>
+      <p><button type="reset">Button type reset</button></p>
+      <p><button type="submit">Button type submit</button></p>
+      <p><button type="button" disabled>Button type button disabled</button></p>
+      <p><button type="submit" disabled>Button type submit disabled</button></p>
+      <p><button>Button</button></p>
+    </fieldset>
+  </form>
 </div>
 
 <div class="code">
   <textarea wrap='off'>
     <a href="#" class="button-primary">Primary Button Text</a>
     <a href="#" class="button-secondary">Secondary Button Text</a>
+    <fieldset>
+      <p><input type="button" value="Input type button"></p>
+      <p><input type="reset" value="Input type reset"></p>
+      <p><input type="submit" value="Input type submit"></p>
+      <p><input type="submit" value="Input type submit disabled" disabled></p>
+      <p><input type="button" value="Input type button disabled" disabled></p>
+      <p><button type="button">Button type button</button></p>
+      <p><button type="reset">Button type reset</button></p>
+      <p><button type="submit">Button type submit</button></p>
+      <p><button type="button" disabled>Button type button disabled</button></p>
+      <p><button type="submit" disabled>Button type submit disabled</button></p>
+      <p><button>Button</button></p>
+    </fieldset>
   </textarea>
 </div>
\ No newline at end of file
diff --git a/patterns/form-buttons.html b/patterns/form-buttons.html
deleted file mode 100644
index 46286c9..0000000
--- a/patterns/form-buttons.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="preview">
-  <form>
-    <fieldset>
-      <p><input type="button" value="Input type button"></p>
-      <p><input type="reset" value="Input type reset"></p>
-      <p><input type="submit" value="Input type submit"></p>
-      <p><input type="submit" value="Input type submit disabled" disabled></p>
-      <p><input type="button" value="Input type button disabled" disabled></p>
-      <p><button type="button">Button type button</button></p>
-      <p><button type="reset">Button type reset</button></p>
-      <p><button type="submit">Button type submit</button></p>
-      <p><button type="button" disabled>Button type button disabled</button></p>
-      <p><button type="submit" disabled>Button type submit disabled</button></p>
-      <p><button>Button</button></p>
-    </fieldset>
-  </form>
-</div>
\ No newline at end of file

From e4d8d365642bfbe1068f08a37b0b3330997b03c8 Mon Sep 17 00:00:00 2001
From: Mark Geller <mgeller@enmasse.com>
Date: Tue, 29 Oct 2013 14:20:48 -0700
Subject: [PATCH 2/2] Added some additional characters to the blockquote
 example

---
 patterns/blockquote.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/patterns/blockquote.html b/patterns/blockquote.html
index b74b6e7..f506f20 100644
--- a/patterns/blockquote.html
+++ b/patterns/blockquote.html
@@ -1,15 +1,15 @@
 <div class="preview">
   <blockquote>
-    <p>“Callout qoute block about something <strong>very interesting</strong>. Keep reading, it get better until it ends.</p>
-    <p class="author">Author’s Name</p>
+    <p>&ldquo;Callout qoute block about something <strong>very interesting</strong>. Keep reading, it get better until it ends.&rdquo;</p>
+    <p class="author">&mdash;Author’s Name, MMORPG.com</p>
   </blockquote>
 </div>
 
 <div class="code">
   <textarea wrap='off'>
     <blockquote>
-      <p>“Callout qoute block about something <strong>very interesting</strong>. Keep reading, it get better until it ends.</p>
-      <p class="author">Author’s Name</p>
+      <p>&ldquo;Callout qoute block about something <strong>very interesting</strong>. Keep reading, it get better until it ends.&rdquo;</p>
+      <p class="author">&mdash;Author’s Name, MMORPG.com</p>
     </blockquote>
   </textarea>
 </div>
\ No newline at end of file