Merge branch 'master' into calendar

Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb
This commit is contained in:
Thomas Blazek
2013-08-11 11:44:58 +02:00
6 changed files with 117 additions and 43 deletions

View File

@@ -9,4 +9,19 @@ margin: 1px;
padding: 5px;
border-color: green;
border-radius: 5px;
}
div.lva-sidebar {
border:solid;
border-width: 1px;
margin: 2px;
padding:5px;
border-radius:5px;
}
div.lva-beispiele {
border:solid;
border-width: 1px;
margin: 2px;
padding:5px;
border-radius:5px;
border-color: green;
}