From 0051b08560ba25bbcca3ad1177a2c853cdafc27e Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Mon, 31 Oct 2016 10:36:42 +0800
Subject: [PATCH 1/1] MDL-56651 core_role: add styling to submit buttons

---
 admin/roles/define.php                  | 12 ++++++------
 theme/boost/scss/moodle/expendable.scss | 24 ------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/admin/roles/define.php b/admin/roles/define.php
index 5a5e6a3a005..093c6933d5a 100644
--- a/admin/roles/define.php
+++ b/admin/roles/define.php
@@ -256,9 +256,9 @@ if ($action === 'view') {
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
 <input type="hidden" name="return" value="<?php p($return); ?>" />
 <input type="hidden" name="resettype" value="none" />
-<div class="submit buttons">
-    <input type="submit" name="savechanges" value="<?php p($submitlabel); ?>" />
-    <input type="submit" name="cancel" value="<?php print_string('cancel'); ?>" />
+<div class="submitbuttons">
+    <input type="submit" name="savechanges" class="btn btn-primary" value="<?php p($submitlabel); ?>" />
+    <input type="submit" name="cancel" class="btn btn-secondary" value="<?php print_string('cancel'); ?>" />
 </div>
     <?php
 }
@@ -271,9 +271,9 @@ if ($action === 'view') {
     echo '</div>';
 } else {
     ?>
-<div class="submit buttons">
-    <input type="submit" name="savechanges" value="<?php p($submitlabel); ?>" />
-    <input type="submit" name="cancel" value="<?php print_string('cancel'); ?>" />
+<div class="submitbuttons">
+    <input type="submit" name="savechanges" class="btn btn-primary" value="<?php p($submitlabel); ?>" />
+    <input type="submit" name="cancel" class="btn btn-secondary" value="<?php print_string('cancel'); ?>" />
 </div>
 </div></form>
 <?php
diff --git a/theme/boost/scss/moodle/expendable.scss b/theme/boost/scss/moodle/expendable.scss
index 941ba2ea984..fc97402f585 100644
--- a/theme/boost/scss/moodle/expendable.scss
+++ b/theme/boost/scss/moodle/expendable.scss
@@ -43,27 +43,3 @@ table#modules,
 table#permissions {
     @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;
-}
-- 
2.17.1