Skip to content

Commit

Permalink
Merge pull request #3 from mageller/master
Browse files Browse the repository at this point in the history
Pull in blockquote and button page changes
  • Loading branch information
ZRogerson committed Oct 29, 2013
2 parents 1e56c1a + e4d8d36 commit a7df39c
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 21 deletions.
8 changes: 4 additions & 4 deletions patterns/blockquote.html
Original file line number Diff line number Diff line change
@@ -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>
30 changes: 30 additions & 0 deletions patterns/buttons.html
Original file line number Diff line number Diff line change
@@ -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>
17 changes: 0 additions & 17 deletions patterns/form-buttons.html

This file was deleted.

0 comments on commit a7df39c

Please sign in to comment.