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

Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar

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:
Thomas Blazek
2013-08-12 13:44:47 +02:00
parent 2d82aa79f6 4aca98c0f5
commit 96753c3fef
11 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ form.formtastic textarea {
width:90%;
height:20em;
}
form.formtastic .input label.control-label {
font-weight:bold;
font-size:125%;