Merge branch 'master' into article-dialog

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
This commit is contained in:
wvengen 2013-12-06 14:26:50 +01:00
commit 923b579bd1
30 changed files with 451 additions and 677 deletions

View file

@ -243,6 +243,11 @@ tr.unavailable {
height: inherit;
}
// get rid of extra space on bottom of dialog with form
.modal form {
margin: 0;
}
// inputs that are "in the background" - less visible
.less-visible {
color: #ddd;
@ -261,4 +266,3 @@ tr.unavailable {
border-color: @inputBorder;
}
}