Merge branch 'formtastic_input' of github.com:johnbintz/cocoon into formtastic_input

This commit is contained in:
John Bintz 2012-10-21 13:46:00 -04:00
commit 215b31cb59

View File

@ -1,18 +1,18 @@
li.cocoon {
& > label {
display: block;
width: 100%;
float: none;
display: block !important;
width: 100% !important;
float: none !important;
}
ol {
padding: 0;
width: auto;
float: none;
padding: 0 !important;
width: auto !important;
float: none !important;
}
fieldset {
padding: 1em;
padding: 1em !important;
}
.links a {