Merge branch 'master' of https://github.com/achalv/pure into achalv-master

Conflicts:
	HISTORY.md
This commit is contained in:
Eric Ferraiuolo 2013-11-24 19:58:43 -05:00
commit e3127820b8
2 changed files with 4 additions and 1 deletions

View File

@ -18,6 +18,8 @@ NEXT
`font-family: inherit;` has been added to the `.pure-button` selector to
normalize the difference in height. ([#221][] @narcis-radu)
* Buttons now have uniform `padding` on all four sides. ([#191][] @achalv)
### Forms
* Added `vertical-align: top;` to `<textarea>`s within `.pure-form-aligned`
@ -26,6 +28,7 @@ NEXT
[#174]: https://github.com/yui/pure/issues/174
[#191]: https://github.com/yui/pure/issues/191
[#200]: https://github.com/yui/pure/issues/200
[#221]: https://github.com/yui/pure/issues/221

View File

@ -5,7 +5,7 @@
font-size: 100%;
*font-size: 90%; /*IE 6/7 - To reduce IE's oversized button text*/
*overflow: visible; /*IE 6/7 - Because of IE's overly large left/right padding on buttons */
padding: 0.5em 1.5em 0.5em;
padding: 0.5em;
color: #444; /* rgba not supported (IE 8) */
color: rgba(0, 0, 0, 0.80); /* rgba supported */
*color: #444; /* IE 6 & 7 */