Merge branch 'master' into 1.0

Conflicts:
	Resources/public/css/scratch.css.map
This commit is contained in:
2016-01-05 14:17:58 +01:00
10 changed files with 146 additions and 50 deletions

View File

@@ -136,8 +136,9 @@ div.input_with_post_text {
align-items: center;
}
div.input_with_post_text span {
div.input_with_post_text span.post_text {
flex: 1;
margin-left: 0.5em;
}
div.input_with_post_text input {
width: 70%;