Merge branch 'MDL-45290-26-fix2' of https://github.com/jethac/moodle …

…into MOODLE_26_STABLE

theme/bootstrapbase/less/moodle/grade.less

@@ -36,6 +36,7 @@
             .btn-large();
             display: inline-block;
             position: relative;
+            vertical-align: top;
             width: 150px;
             text-align: center;
             overflow: hidden;
@@ -51,7 +52,7 @@
             .action-text {
                 position: relative;
                 top: 0.4em;
-                font-size:16px;
+                font-size: 14px;
             }
         }
     }
@@ -85,22 +86,41 @@
                 }
                 .delete {
                     float: left;
-                    clear: right;
                     input {
                         left: 0;
                         right: auto;
                     }
                 }
             }
         }
+        .addcriterion {
+            margin-right: 5px;
+            margin-left: 0px;
+
+            input {
+                padding-right: 26px;
+                padding-left: 10px;
+                background-position: right 8px top 8px;
+            }
+        }
+        .options {
+            .option {
+                .value {
+                    margin-left: 0px;
+                    margin-right: 5px;
+                }
+                input {
+                    // margins flipped for RTL.
+                    margin-left: 12px;
+                    margin-right: 5px;
+                }
+            }
+        }
     }
 }
 
 #rubric-rubric {
     &.gradingform_rubric {
-        // Override max-width rule from core; rubrics with multiple levels can hit
-        // the previously-defined threshold easily.
-        max-width: none;
         #rubric-criteria {
             margin-bottom: 1em;
             @rubricPadding: 6px;
@@ -131,9 +151,12 @@
                     vertical-align: top;
                     padding: @rubricPadding;
                     .delete {
-                        position:relative;
+                        position: relative;
                         width: 32px;
-                        float:right;
+                        height: 32px;
+                        margin-top: -32px;
+                        clear: both;
+                        float: right;
                         input {
                             display: block;
                             position: absolute;
@@ -151,6 +174,7 @@
                 .scorevalue {
                     input {
                         // Should handle at least three chars with room to spare.
+                        float: none;
                         width: 2em;
                         &.hiddenelement,&.pseudotablink {
                             // Zero out the width if it's still in the block flow for some reason