andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'thomasb/master'

Browse Source 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
This commit is contained in:
Andreas Stephanides
2013-08-12 11:11:59 +02:00
parent a02a99b307 0736320be6
commit 4aca98c0f5
44 changed files with 791 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/formtastic-changes.css.scss
View File

@@ -5,8 +5,6 @@ form.formtastic textarea {
width:90%;
height:20em;
}
div.form-group {
border-width: 1px;
border-style: none;
@@ -17,4 +15,10 @@ div.verwalten-block {
border-width: 1px;
border-style: solid;
padding: 5px;
}
}
form.formtastic .input label.control-label {
font-weight:bold;
font-size:125%;
}