Merge branch 'master' into feature-file-templates

Conflicts: app/views/application/_navigation.html.slim config/locales/de.yml config/locales/en.yml db/schema.rb
2016-07-28 15:16:11 +02:00
parent 7ef401f75a 1332de950d
commit ed3526a578
60 changed files with 471 additions and 491 deletions
--- a/app/assets/stylesheets/exercises.css.scss
+++ b/app/assets/stylesheets/exercises.css.scss
@@ -49,7 +49,10 @@ div#chart_2 {
 }


-
+a.file-heading {
+  color: black !important;
+  text-decoration: none;
+}

 .bar {
  fill: orange;