Merge branch 'MDL-56649-36' of git://github.com/bmbrands/moodle into MOODLE_36_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2019-10-03 19:37:34 +02:00
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -949,9 +949,9 @@ class core_files_renderer extends plugin_renderer_base {
<div class="file-picker fp-dlg">
<p class="fp-dlg-text"></p>
<div class="fp-dlg-buttons">
<button class="fp-dlg-butoverwrite btn">'.get_string('overwrite', 'repository').'</button>
<button class="fp-dlg-butrename btn"></button>
<button class="fp-dlg-butcancel btn btn-cancel">'.get_string('cancel').'</button>
<button class="fp-dlg-butoverwrite btn mb-1">'.get_string('overwrite', 'repository').'</button>
<button class="fp-dlg-butrename btn mb-1"></button>
<button class="fp-dlg-butcancel btn btn-cancel mb-1">'.get_string('cancel').'</button>
</div>
</div>';
return $rv;
@@ -1,8 +1,8 @@
<div class="file-picker fp-dlg">
<p class="fp-dlg-text"></p>
<div class="fp-dlg-buttons">
<button class="fp-dlg-butoverwrite btn btn-primary">{{#str}}overwrite, repository{{/str}}</button>
<button class="fp-dlg-butrename btn btn-primary"></button>
<button class="fp-dlg-butcancel btn btn-secondary">{{#str}}cancel{{/str}}</button>
<button class="fp-dlg-butoverwrite btn btn-primary mb-1">{{#str}}overwrite, repository{{/str}}</button>
<button class="fp-dlg-butrename btn btn-primary mb-1"></button>
<button class="fp-dlg-butcancel btn btn-secondary mb-1">{{#str}}cancel{{/str}}</button>
</div>
</div>