Merge branch 'MDL-57560-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE

2017-10-31 15:40:59 +13:00
parent edb84bc356 3031e3de72
commit 73b9bccd80
1 changed files with 11 additions and 4 deletions
@@ -544,13 +544,20 @@ span.editinstructions {
 }

 .dndupload-progress-outer {
-    @extend progress;
+    background-color: $progress-bg;
+    @include border-radius($progress-border-radius);
+    @include box-shadow($progress-box-shadow);
+    display: block;
+    width: 100%;
+    height: $spacer-y;
+    margin-bottom: $spacer-y;
 }

 .dndupload-progress-inner {
-    .progress {
-        @extend .progress-bar;
-    }
+    background-color: $progress-bar-color;
+    @include border-left-radius($progress-border-radius);
+    display: inline-block;
+    height: $spacer-y;
 }

 .dndupload-hidden {