Merge branch 'AurelioDeRosa-patch-1'

Conflicts:
	HISTORY.md
This commit is contained in:
Eric Ferraiuolo 2013-07-17 08:35:58 -07:00
commit 293b850d16
3 changed files with 19 additions and 8 deletions

View File

@ -7,6 +7,10 @@ NEXT
!!TODO: This needs a lot of work: Missing issue numbers, and more details,
written in past tense.
* Added `.pure-form input.pure-input-rounded` in forms.css to have more specificity for `<input>`s [#109](https://github.com/yui/pure/issues/109)
* Removed `white-space: nowrap` from `.pure-table thead` to fix issue [#95](https://github.com/yui/pure/issues/95)
* Removed `white-space: nowrap` from `.pure-table thead`. ([#95][])
* Removed the gray color of forms' labels. ([#89][])
@ -25,6 +29,9 @@ written in past tense.
* Pure Buttons no longer inherit from `a:visited` style rules on a page.
([#87][])
* `[readonly]` inputs look visually different to `[disabled]` inputs and
regular inputs. `[readonly]` inputs do not have any `:focus` styles. (Issue [#102](https://github.com/yui/pure/issues/102)) (jaseg)
[#87]: https://github.com/yui/pure/issues/87
[#89]: https://github.com/yui/pure/issues/89
@ -32,8 +39,6 @@ written in past tense.
[#94]: https://github.com/yui/pure/issues/94
[#95]: https://github.com/yui/pure/issues/95
* `[readonly]` inputs look visually different to `[disabled]` inputs and
regular inputs. `[readonly]` inputs do not have any `:focus` styles. (Issue [#102](https://github.com/yui/pure/issues/102)) (jaseg)
0.2.0 (2013-06-11)
------------------

View File

@ -155,6 +155,7 @@
.pure-form-stacked label,
.pure-form-stacked textarea {
display: block;
margin: 0.25em 0;
}
.pure-form-aligned input,
@ -185,9 +186,10 @@
}
/* Rounded Inputs */
.pure-form input.pure-input-rounded,
.pure-form .pure-input-rounded {
border-radius: 20px;
padding-left: 1em;
border-radius: 2em;
padding: 0.5em 1em;
}
/* Grouped Inputs */

View File

@ -262,9 +262,13 @@
<h2>Rounded Form</h2>
<p>Add the pure-input-rounded classname to any form control.</p>
<form class="pure-form">
<input type="text" class="pure-input-rounded">
<button type="submit" class='pure-button'>Search</button>
<form class="pure-form pure-form-stacked">
<label>Subject</label>
<input type="text" class="pure-input-rounded" placeholder="Subject" />
<label>Message</label>
<textarea class="pure-input-rounded" rows="5" cols="40" placeholder="Message..."></textarea>
<button type="submit" class="pure-button pure-input-rounded">Search</button>
<input type="reset" class="pure-button pure-input-rounded" value="Reset" />
</form>