MDL-66999 theme_boost: @extend remove extends for grades

mgleeson · Dec 12, 2019 · cacf692 · cacf692
1 parent 40ea675
commit cacf692
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 400 deletions.
diff --git a/grade/grading/form/rubric/renderer.php b/grade/grading/form/rubric/renderer.php
@@ -403,7 +403,7 @@ protected function rubric_template($mode, $options, $elementname, $criteriastr)
                 'value' => $value
             );
             $input = html_writer::empty_tag('input', $criteriainputparams);
-            $rubrictemplate .= html_writer::tag('div', $input, array('class' => 'addcriterion'));
+            $rubrictemplate .= html_writer::tag('div', $input, array('class' => 'addcriterion btn btn-secondary'));
         }
         $rubrictemplate .= $this->rubric_edit_options($mode, $options);
         $rubrictemplate .= html_writer::end_tag('div');

diff --git a/grade/grading/renderer.php b/grade/grading/renderer.php
@@ -66,7 +66,7 @@ public function management_action_icon(moodle_url $url, $text, $icon) {
 
         $img = $this->output->pix_icon($icon, '');
         $txt = html_writer::tag('div', $text, array('class' => 'action-text'));
-        return html_writer::link($url, $img . $txt, array('class' => 'action'));
+        return html_writer::link($url, $img . $txt, array('class' => 'action btn btn-lg'));
     }
 
     /**

diff --git a/grade/grading/tests/behat/behat_grading.php b/grade/grading/tests/behat/behat_grading.php
@@ -66,7 +66,7 @@ public function i_go_to_advanced_grading_definition_page($activityname) {
         $editactionliteral = behat_context_helper::escape(get_string("manageactionedit", "grading"));
 
         // Working both when adding and editing.
-        $definitionxpath = "//a[@class='action']" .
+        $definitionxpath = "//a[@class='action btn btn-lg']" .
             "[./descendant::*[contains(., $newactionliteral) or contains(., $editactionliteral)]]";
 
         $this->execute('behat_grading::i_go_to_advanced_grading_page', $this->escape($activityname));

diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
@@ -70,8 +70,6 @@
         margin-bottom: 1em;
 
         .action {
-            @extend .btn;
-            @extend .btn-lg;
             display: inline-block;
             position: relative;
             vertical-align: top;
@@ -190,7 +188,6 @@
                     vertical-align: middle;
 
                     input {
-                        @extend .btn;
                         background-position: 0 0;
                         height: 30px;
                         margin-right: 5px;
@@ -201,7 +198,6 @@
 
         .addcriterion {
             margin-left: 5px;
-            @extend .btn;
             padding: 0;
 
             input {