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

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

Browse Source 
Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb
This commit is contained in:
HausdorffHimself
2013-08-13 19:05:26 +02:00
parent c73984e81d d988c22e29
commit c7d63c4c19
94 changed files with 2318 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/calendars.js.coffee Normal file
View File

@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/calentries.js.coffee Normal file
View File

@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

5
app/assets/stylesheets/application.css.scss
View File

@@ -10,7 +10,7 @@
*
*= require_self
*= require_tree .
* require 'bootstrap'
* require 'bootstrap'
*/
$linkColor: #03006E;
@import 'bootstrap';
@@ -30,7 +30,8 @@ border-bottom:1px solid black;
height:60px;
padding-left:160px;
padding-top:0px;
overflow:hidden
overflow:hidden;
margin-bottom: 20px
}
#menudiv

5
app/assets/stylesheets/bootstrap-responsive.scss vendored Normal file
View File

@@ -0,0 +1,5 @@
@import "bootstrap/responsive";
@media (max-width: 979px){
.earlymax {
min-width: 100%;
}}

3
app/assets/stylesheets/calendars.css.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the calendars controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/calentries.css.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the calentries controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

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

@@ -0,0 +1,15 @@
form.formtastic .stringish input {
width:90%;
}
form.formtastic select {
width:90%
}
form.formtastic textarea {
width:90%;
height:20em;
}
form.formtastic .input label.control-label {
font-weight:bold;
font-size:125%;
}

24
app/assets/stylesheets/lvas.css.scss
View File

@@ -1,3 +1,27 @@
// Place all the styles related to the lvas controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
div.lva-semester {
border: solid;
border-width: 1px;
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;
}

15
app/assets/stylesheets/studien.css.scss
View File

@@ -1,3 +1,18 @@
// Place all the styles related to the studia controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
div.verwalten-block {
border-width: 1px;
border-style: solid;
padding: 5px;
border-radius:10px;
margin: 2px;
}
div.studien-semester {
border-width: 1px;
border-style: solid;
padding: 5px;
border-radius:10px;
border-color: blue;
margin: 2px;
}