Merge branch 'pr/14'

Conflicts:
	app/views/exercises/_editor_file_tree.html.slim
This commit is contained in:
Jan Renz
2015-04-10 20:39:53 +02:00
47 changed files with 19493 additions and 111 deletions

View File

@@ -0,0 +1,8 @@
// Place all the styles related to the Comments controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
.ace_gutter-cell.code-ocean_comment {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wIUDTMn077U+gAAANhJREFUOMvV0jFOQkEURuEPfCFKaChwASQWhsIOaxYgW7Ci0c4VuBBM6GmsWIC2JsbCykJiRSD0GMVHMy+ZTPSBlfHvZu7NyZ1zh79O5Zu7Bi7RRz30TDHC7TbACB1UkSe1Kt5xg2FxuRc1jHFcMm0e+k/xgceCCmc4wtcOz17jCs0YMMDnL9ytcBgDVj8ILZO/jgHXiY9t2cdbLHGBFk4KcklqYcXLdAt3wXQ3kVlBhgM84AKvRTFL6O0gM8MTZuH8ggnmZaP18Ix7nO8qI0t+Wi/4yP2bbAA4rSby6Nz4AwAAAABJRU5ErkJggg==");
background-position: 2px center;
}

View File

@@ -54,7 +54,7 @@ button i.fa-spin {
}
#files {
overflow: scroll;
overflow: auto;
}
#hint {

View File

@@ -0,0 +1,4 @@
#commentitor {
margin-top: 2rem;
height: 600px;
}