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

Merge branch 'kalender' 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/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
This commit is contained in:
Thomas Blazek
2013-08-11 10:34:03 +02:00
parent 661783bcd1 a5a02e065a
commit 88ba8fa1c2
60 changed files with 1575 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,22 @@ width:90%;
height:20em;
}
<<<<<<< HEAD
form.formtastic .input label.control-label {
font-weight:bold;
font-size:125%;
}
=======
div.form-group {
border-width: 1px;
border-style: none;
padding: 10px;
// border-radius: 10px;
}
div.verwalten-block {
border-width: 1px;
border-style: solid;
padding: 5px;
}
>>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca