moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-56651-master' of git://github.com/lameze/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-11-01 09:10:08 +00:00
commit e0d5d8caed
2 changed files with 6 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/roles/define.php
View file

@ -256,9 +256,9 @@ if ($action === 'view') {
<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" /> <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
<input type="hidden" name="return" value="<?php p($return); ?>" /> <input type="hidden" name="return" value="<?php p($return); ?>" />
<input type="hidden" name="resettype" value="none" /> <input type="hidden" name="resettype" value="none" />
<div class="submit buttons"> <div class="submitbuttons">
<input type="submit" name="savechanges" value="<?php p($submitlabel); ?>" /> <input type="submit" name="savechanges" class="btn btn-primary" value="<?php p($submitlabel); ?>" />
<input type="submit" name="cancel" value="<?php print_string('cancel'); ?>" /> <input type="submit" name="cancel" class="btn btn-secondary" value="<?php print_string('cancel'); ?>" />
</div> </div>
<?php <?php
} }
@ -271,9 +271,9 @@ if ($action === 'view') {
echo '</div>'; echo '</div>';
} else { } else {
?> ?>
<div class="submit buttons"> <div class="submitbuttons">
<input type="submit" name="savechanges" value="<?php p($submitlabel); ?>" /> <input type="submit" name="savechanges" class="btn btn-primary" value="<?php p($submitlabel); ?>" />
<input type="submit" name="cancel" value="<?php print_string('cancel'); ?>" /> <input type="submit" name="cancel" class="btn btn-secondary" value="<?php print_string('cancel'); ?>" />
</div> </div>
</div></form> </div></form>
<?php <?php

24
theme/boost/scss/moodle/expendable.scss
View file

@ -43,27 +43,3 @@ table#modules,
table#permissions { table#permissions {
@extend .table-hover; @extend .table-hover;
} }
// colored buttons
input.form-submit,
input#id_submitbutton,
input#id_submitbutton2,
.path-admin .buttons input[type="submit"],
td.submit input {
@extend .btn-primary;
}
// override .btn-primary
#notice .singlebutton + .singlebutton input,
.submit.buttons input[name="cancel"] {
@extend .btn;
}
#notice .singlebutton + .singlebutton input,
.submit.buttons input[name="cancel"] {
@extend .btn-lineup;
}
input[id="_clearbutton"],
input[type="reset"] {
@extend .btn-warning;
}