From 942dc9de42ca299d07c6189f63f278bc960284a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Tue, 18 May 2021 21:54:34 +0200
Subject: [PATCH] MDL-70853 theme: align submit buttons in settings forms.

---
 theme/boost/scss/moodle/forms.scss | 13 +++----------
 theme/boost/style/moodle.css       |  9 ++-------
 theme/classic/style/moodle.css     |  9 ++-------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 186f3f472fc..d3d1195d5ae 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -51,12 +51,6 @@
     border-bottom: $border-width solid $table-border-color;
 }
 
-@include media-breakpoint-up(sm) {
-    .mform > .form-group {
-        margin-left: $spacer * 1.5;
-    }
-}
-
 #adminsettings .form-control[size] {
     width: auto;
 }
@@ -421,12 +415,8 @@ textarea[data-auto-rows] {
 }
 
 @include media-breakpoint-up(sm) {
-    .mform fieldset {
-        margin-left: $spacer * 1.5;
-    }
     .mform fieldset.collapsible legend a.fheader {
         padding: 0 5px 0 ($spacer * 1.5);
-        margin-left: -($spacer * 1.5);
         background: url([[pix:t/expanded]]) 0 center no-repeat;
     }
 
@@ -437,6 +427,9 @@ textarea[data-auto-rows] {
         /*rtl:remove*/
         background-image: url([[pix:t/collapsed]]);
     }
+    .mform fieldset.collapsible .col-form-label {
+        padding-left: ($spacer * 2.5);
+    }
 
     .mform {
         .form-inline {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 236fa38729c..e13af9ff066 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -16427,10 +16427,6 @@ body.path-question-type .mform fieldset.hidden {
   margin-bottom: 0.5rem;
   border-bottom: 1px solid #dee2e6; }
 
-@media (min-width: 576px) {
-  .mform > .form-group {
-    margin-left: 1.5rem; } }
-
 #adminsettings .form-control[size] {
   width: auto; }
 
@@ -16712,11 +16708,8 @@ textarea[data-auto-rows] {
   flex-grow: 1; }
 
 @media (min-width: 576px) {
-  .mform fieldset {
-    margin-left: 1.5rem; }
   .mform fieldset.collapsible legend a.fheader {
     padding: 0 5px 0 1.5rem;
-    margin-left: -1.5rem;
     background: url([[pix:t/expanded]]) 0 center no-repeat; }
   .mform fieldset.collapsed legend a.fheader {
     /*rtl:raw:
@@ -16724,6 +16717,8 @@ textarea[data-auto-rows] {
         */
     /*rtl:remove*/
     background-image: url([[pix:t/collapsed]]); }
+  .mform fieldset.collapsible .col-form-label {
+    padding-left: 2.5rem; }
   .mform .form-inline .fdefaultcustom label {
     justify-content: initial; } }
 
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 85ea44d6da0..102be32c922 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -16660,10 +16660,6 @@ body.path-question-type .mform fieldset.hidden {
   margin-bottom: 0.5rem;
   border-bottom: 1px solid #dee2e6; }
 
-@media (min-width: 576px) {
-  .mform > .form-group {
-    margin-left: 1.5rem; } }
-
 #adminsettings .form-control[size] {
   width: auto; }
 
@@ -16947,11 +16943,8 @@ textarea[data-auto-rows] {
   flex-grow: 1; }
 
 @media (min-width: 576px) {
-  .mform fieldset {
-    margin-left: 1.5rem; }
   .mform fieldset.collapsible legend a.fheader {
     padding: 0 5px 0 1.5rem;
-    margin-left: -1.5rem;
     background: url([[pix:t/expanded]]) 0 center no-repeat; }
   .mform fieldset.collapsed legend a.fheader {
     /*rtl:raw:
@@ -16959,6 +16952,8 @@ textarea[data-auto-rows] {
         */
     /*rtl:remove*/
     background-image: url([[pix:t/collapsed]]); }
+  .mform fieldset.collapsible .col-form-label {
+    padding-left: 2.5rem; }
   .mform .form-inline .fdefaultcustom label {
     justify-content: initial; } }