Merge remote-tracking branch 'origin/master' into flowr

# Conflicts:
#	app/assets/javascripts/editor/evaluation.js
#	app/assets/javascripts/editor/participantsupport.js
#	app/views/exercises/_editor_output.html.slim
#	config/code_ocean.yml.example
#	config/routes.rb

app/assets/stylesheets/application.css

@@ -10,10 +10,11 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
+ *= require pagedown_bootstrap
+ *
+ * lib/assets
+ *= require flash
+ *
+ * app/assets
  *= require_tree .
- *= require_tree ../../../lib
- *= require_tree ../../../vendor/assets/stylesheets/
- *= require_self
- *= require bootstrap_pagedown
- *= require markdown
 */

app/assets/stylesheets/base.css.scss

@@ -3,6 +3,10 @@ h1 {
   margin-bottom: 0.5em;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  font-weight: 500;
+}
+
 .lead {
   font-size: 16px;
   color: rgba(70, 70, 70, 1);
@@ -15,28 +19,47 @@ i.fa {
 pre {
   background-color: #FAFAFA;
   margin: 0;
-  padding: 0;
+  padding: .25rem!important;
+  border: 1px solid #CCCCCC;
 }
 
 span.caret {
   margin-left: 0.5em;
 }
 
+.btn {
+  -webkit-font-smoothing: antialiased;
+  font-weight: 500;
+  :not(.btn-lg) {
+    font-size: 0.875rem;
+  }
+}
+
 .progress {
   margin: 0;
+  border: 1px solid #CCCCCC;
+  padding: 0.125rem !important;
+  height: 1.25rem !important;
 
   .progress-bar {
     line-height: initial;
     min-width: 2em;
+    color: white;
   }
 }
 
+.navbar {
+  -webkit-font-smoothing: antialiased;
+  font-weight: 500;
+}
+
 .attribute-row + .attribute-row {
   margin-top: 0.5em;
 }
 
-.badge {
+.badge-pill {
   font-size: 100%;
+  font-weight: 500;
 }
 
 .container[data-controller] {

app/assets/stylesheets/bootstrap-dropdown-submenu.css.scss

@@ -3,10 +3,14 @@
 }
 
 .dropdown-submenu > .dropdown-menu {
-  top: 0;
+  top: -0.2em;
   left: 100%;
 }
 
+.dropdown-submenu.open > ul.dropdown-menu  {
+  display: block;
+}
+
 .dropdown-submenu > a:after {
   display: block;
   content: " ";
@@ -25,11 +29,11 @@
   border-left-color: #ffffff;
 }
 
-.dropdown-submenu.pull-left {
+.dropdown-submenu.float-left {
   float: none;
 }
 
-.dropdown-submenu.pull-left > .dropdown-menu {
+.dropdown-submenu.float-left > .dropdown-menu {
   left: -100%;
   margin-left: 10px;
   -webkit-border-radius: 6px 0 6px 6px;

app/assets/stylesheets/editor.css.scss

@@ -45,10 +45,6 @@ button i.fa-spin {
   width: 100%;
   display: flex;
 
-  button {
-    font-size: 80%;
-  }
-
   button, .btn-group {
     flex-grow: 1;
   }
@@ -144,7 +140,8 @@ button i.fa-spin {
   min-height: 1px;
   padding-left: 15px;
   padding-right: 15px;
-  box-sizing: border-box
+  box-sizing: border-box;
+  margin-left: auto;
 }
 
 .output-col-collapsed {
@@ -155,7 +152,8 @@ button i.fa-spin {
   min-height: 1px;
   padding-left: 15px;
   padding-right: 15px;
-  box-sizing: border-box
+  box-sizing: border-box;
+  margin-left: auto;
 }
 
 .enforce-top-margin {
@@ -166,14 +164,14 @@ button i.fa-spin {
   margin-right: 10px !important;
 }
 
-.description-panel-collapsed {
+.description-card-collapsed {
   -webkit-transition: width 2s;
   transition: width 2s;
   height: 0px;
   visibility: hidden;
 }
 
-.description-panel {
+.description-card {
   height: auto;
   -webkit-transition: height 2s;
   transition: height 2s;

app/assets/stylesheets/exercise_collections.scss

@@ -57,10 +57,6 @@ rect.value-bar {
   }
 }
 
-.table-responsive#exercise-list {
-  max-height: 512px;
-}
-
 .exercise-id-tooltip {
   position: absolute;
   display: none;

app/assets/stylesheets/exercises.css.scss

@@ -35,11 +35,19 @@ input[type='file'] {
     margin: 10px 0 10px 0;
   }
 
-  .lead.description-panel-collapsed {
+  .lead.description-card-collapsed {
     margin: 0;
   }
 }
 
+[data-toggle="collapse"] .fa:before {
+  content: "\f139";
+}
+
+[data-toggle="collapse"].collapsed .fa:before {
+  content: "\f13a";
+}
+
 // Graph Settings
 
 .axis path {

app/assets/stylesheets/request-for-comments.css.scss

@@ -68,8 +68,10 @@
     .result {
       margin-right: 10px;
       margin-top: 20px;
-      width: 10px;
-      height: 10px;
+      min-width: 10px;
+      max-width: 10px;
+      min-height: 10px;
+      max-height: 10px;
     }
 
     .passed {
@@ -127,7 +129,7 @@
   background-color:#f9f9f9
 }
 
-.ace_tooltip {
+:not(.allow_ace_tooltip) > .ace_tooltip {
   display: none !important;
 }
 

app/assets/stylesheets/statistics.css.scss

@@ -76,8 +76,8 @@ tr.highlight {
   grid-gap: 10px;
 
   > a {
-    color: #fff;
-    text-decoration: none;
+    color: #fff !important;
+    text-decoration: none !important;
 
     > div {
       border: 2px solid #0055ba;