Merge remote-tracking branch 'upstream/master' into GH-2939

# Conflicts:
#	assets/css/app.scss

Author: christianbeeznest

assets/css/app.scss

@@ -908,6 +908,10 @@ img.course-tool__icon {
   }
 }
 
+.ghosting { opacity: .6; }
+.chosen   { outline: 2px solid #ddd; }
+.dragging { outline: 2px solid var(--support-5, #f60); }
+
 .media-group       { border:2px solid #337ab7; background:#f5fafd; padding:1rem; margin:2rem 0; border-radius:4px; }
 .media-content     { margin-bottom:1rem; }
 .media-description { font-style:italic; margin-bottom:1rem; }

assets/css/scss/organisms/_dialog.scss

@@ -1,6 +1,10 @@
 .p-dialog {
   @apply max-h-[90%] scale-100 drop-shadow-lg rounded-lg border-0 border-none;
 
+  &-mask {
+    @apply bg-gray-30;
+  }
+
   &-header {
     @apply bg-white border-b border-solid border-gray-30 gap-4 rounded-t-lg p-4;