Merge branch 'consistent-buttons' of github.com:msweeney/pure into msweeney-buttons

Conflicts:
	src/forms/css/forms.css
This commit is contained in:
Tilo Mitra 2013-06-06 19:04:53 -04:00
commit 0d10f77653
2 changed files with 69 additions and 27 deletions

View File

@ -1,34 +1,61 @@
@media only screen and (max-width : 480px) { @media only screen and (max-width : 480px) {
.pure-form button[type='submit'] { .pure-form button[type="submit"] {
margin: 0.7em 0 0; margin: 0.7em 0 0;
} }
.pure-form input[type='text'], .pure-form button, .pure-form label { .pure-form input[type="text"],
margin-bottom: 0.3em; .pure-form input[type="password"],
display: block; .pure-form input[type="email"],
} .pure-form input[type="url"],
.pure-form input[type="date"],
.pure-form input[type="month"],
.pure-form input[type="time"],
.pure-form input[type="datetime"],
.pure-form input[type="datetime-local"],
.pure-form input[type="week"],
.pure-form input[type="number"],
.pure-form input[type="search"],
.pure-form input[type="tel"],
.pure-form input[type="color"],
.pure-form label {
margin-bottom: 0.3em;
display: block;
}
.pure-group input[type='text'] { .pure-group input[type="text"],
margin-bottom: 0; .pure-form input[type="password"],
} .pure-form input[type="email"],
.pure-form input[type="url"],
.pure-form input[type="date"],
.pure-form input[type="month"],
.pure-form input[type="time"],
.pure-form input[type="datetime"],
.pure-form input[type="datetime-local"],
.pure-form input[type="week"],
.pure-form input[type="number"],
.pure-form input[type="search"],
.pure-form input[type="tel"],
.pure-form input[type="color"] {
margin-bottom: 0;
}
.pure-form-aligned .pure-control-group label { .pure-form-aligned .pure-control-group label {
margin-bottom: 0.3em; margin-bottom: 0.3em;
text-align: left; text-align: left;
display: block; display: block;
width: 100%; width: 100%;
} }
.pure-form-aligned .pure-controls { .pure-form-aligned .pure-controls {
margin: 1.5em 0 0 0; margin: 1.5em 0 0 0;
} }
/* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */ /* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
.pure-form .pure-help-inline, .pure-form .pure-help-inline,
.pure-form-message-inline, .pure-form-message-inline,
.pure-form-message { .pure-form-message {
display: block; display: block;
font-size: 80%; font-size: 80%;
padding: 0.2em 0 0.8em; /* increased bottom padding to make it group with its related input element */ padding: 0.2em 0 0.8em; /* increased bottom padding to make it group with its related input element */
} }
} }

View File

@ -130,6 +130,21 @@
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
.pure-form-stacked input[type="text"],
.pure-form-stacked input[type="password"],
.pure-form-stacked input[type="email"],
.pure-form-stacked input[type="url"],
.pure-form-stacked input[type="date"],
.pure-form-stacked input[type="month"],
.pure-form-stacked input[type="time"],
.pure-form-stacked input[type="datetime"],
.pure-form-stacked input[type="datetime-local"],
.pure-form-stacked input[type="week"],
.pure-form-stacked input[type="number"],
.pure-form-stacked input[type="search"],
.pure-form-stacked input[type="tel"],
.pure-form-stacked input[type="color"],
.pure-form-stacked select,
.pure-form-stacked label { .pure-form-stacked label {
display: block; display: block;
} }