88ba8fa1c2
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
28 lines
429 B
SCSS
28 lines
429 B
SCSS
form.formtastic .stringish input {
|
|
width:90%;
|
|
}
|
|
form.formtastic textarea {
|
|
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
|