Merge branch 'MDL-62465-master' of git://github.com/damyon/moodle

nilo72 · Mar 5, 2019 · 02d6bfa · 02d6bfa
2 parents 754029c + f88c613
commit 02d6bfa
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
@@ -52,7 +52,6 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
-    And I open the action menu in "Submitted for grading" "table_row"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
     And I should see "Page 1 of 3"
     And I click on ".navigate-next-button" "css_element"

diff --git a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
@@ -43,7 +43,6 @@ Feature: In an assignment, teacher can view the feedback for a previous attempt.
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
-    And I open the action menu in "Submitted for grading" "table_row"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
     And I should see "Page 1 of 3"
     And I click on ".navigate-next-button" "css_element"

diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
@@ -296,7 +296,9 @@ form.popupform div {
 }
 
 // Minimum height required for a menu in a table inside a scrollable div.
+// Position required for table sizing inside a flex container.
 .no-overflow > .generaltable {
+    position: relative;
     margin-bottom: 0;
     min-height: 10em;
 }

diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
@@ -33,6 +33,7 @@
 
 .path-grade-report-grader {
     #region-main {
+        overflow-x: visible;
         min-width: 100%;
         width: auto;
         display: inline-flex;

diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
@@ -522,9 +522,6 @@ div#dock {
 .path-mod-assign [data-region="grade-actions-panel"] [data-region="grade-actions"] .collapse-buttons {
     top: auto;
 }
-.path-mod-assign .no-overflow {
-    overflow: initial;
-}
 
 // This section removes the responsiveness from the form in the grading panel
 $popout-header-font-size: 1.5 * $font-size-base;

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -9004,6 +9004,7 @@ form.popupform div {
   overflow: auto; }
 
 .no-overflow > .generaltable {
+  position: relative;
   margin-bottom: 0;
   min-height: 10em; }
 
@@ -15302,9 +15303,6 @@ div#dock {
 .path-mod-assign [data-region="grade-actions-panel"] [data-region="grade-actions"] .collapse-buttons {
   top: auto; }
 
-.path-mod-assign .no-overflow {
-  overflow: initial; }
-
 .path-mod-assign #page-content [data-region="grade-panel"] .mform:not(.unresponsive) .fcontainer .fitem.popout .felement {
   height: calc(100% - 4rem); }
 
@@ -15699,6 +15697,7 @@ p.arrow_button {
   left: 40vw; }
 
 .path-grade-report-grader #region-main {
+  overflow-x: visible;
   min-width: 100%;
   width: auto;
   display: inline-flex; }