Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7) 2014-01-20 23:59:27 +01:00
commit 221e6adaa5
2 changed files with 9 additions and 2 deletions

View File

@ -34,13 +34,20 @@ p.arrow_button {
}
}
#addcontrols {
margin-top: 5em;
// The margin top is equal the combination of the line-height and margin of a <p>,
// because the visual parent is a <p>.
margin-top: @baseLineHeight + (@baseLineHeight / 2);
text-align: center;
margin-bottom: 3em;
label {
display: inline;
}
}
#addcontrols input,
#removecontrols input {
.btn-block;
margin-right: auto;
margin-left: auto;
}
button,

File diff suppressed because one or more lines are too long