From 6fb04e766d0afff446b163ff3e1051409e410378 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Tue, 26 Feb 2019 15:44:34 +0100
Subject: [PATCH] MDL-52167 admin: format dependencies in search results

---
 admin/templates/setting.mustache                |  2 +-
 theme/bootstrapbase/less/moodle/admin.less      |  4 +++-
 theme/bootstrapbase/less/moodle/forms.less      |  5 ++++-
 theme/bootstrapbase/less/moodle/responsive.less |  5 ++++-
 theme/bootstrapbase/style/moodle.css            | 15 ++++++++++++---
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/admin/templates/setting.mustache b/admin/templates/setting.mustache
index dbe89e26254..af78e7e4fbf 100644
--- a/admin/templates/setting.mustache
+++ b/admin/templates/setting.mustache
@@ -69,6 +69,6 @@
             <div class="form-defaultinfo text-muted {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
         {{/default}}
         <div class="form-description mt-3">{{{description}}}</div>
-        {{#dependenton}}<div class="form-dependenton mt-3 text-muted">{{{.}}}</div>{{/dependenton}}
+        {{#dependenton}}<div class="form-dependenton mb-4 text-muted">{{{.}}}</div>{{/dependenton}}
     </div>
 </div>
diff --git a/theme/bootstrapbase/less/moodle/admin.less b/theme/bootstrapbase/less/moodle/admin.less
index 26f41d8c2a6..b4f3feb1113 100644
--- a/theme/bootstrapbase/less/moodle/admin.less
+++ b/theme/bootstrapbase/less/moodle/admin.less
@@ -405,11 +405,13 @@ img.iconsmall {
     margin-right: 7px;
 }
 
-.form-description {
+.form-description,
+.form-dependenton {
     clear: right;
 }
 
 .form-description,
+.form-dependenton,
 .formsettingheading {
     pre {
         /* Code examples should be left aligned. */
diff --git a/theme/bootstrapbase/less/moodle/forms.less b/theme/bootstrapbase/less/moodle/forms.less
index fbca7410311..84aa42afac7 100644
--- a/theme/bootstrapbase/less/moodle/forms.less
+++ b/theme/bootstrapbase/less/moodle/forms.less
@@ -172,6 +172,7 @@ form {
 }
 .form-item .form-setting,
 .form-item .form-description,
+.form-item .form-dependenton,
 .mform .fitem .felement,
 #page-mod-forum-search .c1 {
     .form-horizontal .controls
@@ -188,11 +189,13 @@ form {
 // uneditable looks ugly, styling both as form help is fairly
 // subtle in it's impact. Going for the latter as the best option.
 .form-item .form-description,
+.form-item .form-dependenton,
 .felement.fstatic {
     .help-block;
     padding-top: 5px;
 }
-.form-item .form-description {
+.form-item .form-description,
+.form-item .form-dependenton {
     padding-top: 0;
 }
 .fitem .fstaticlabel {
diff --git a/theme/bootstrapbase/less/moodle/responsive.less b/theme/bootstrapbase/less/moodle/responsive.less
index c2b7ad518b2..13d5daf43cd 100644
--- a/theme/bootstrapbase/less/moodle/responsive.less
+++ b/theme/bootstrapbase/less/moodle/responsive.less
@@ -30,6 +30,7 @@
     }
     .form-item .form-setting,
     .form-item .form-description,
+    .form-item .form-dependenton,
     .mform .fitem .felement,
     #page-mod-forum-search .c1,
     .mform .fdescription.required,
@@ -105,6 +106,7 @@
     }
     .form-item .form-setting,
     .form-item .form-description,
+    .form-item .form-dependenton,
     .mform .fitem .felement,
     #page-mod-forum-search .c1,
     .mform .fdescription.required,
@@ -329,7 +331,8 @@
     .mform .fitem .felement,
     .path-backup .mform .fitem .felement,
     .mform .fdescription.required,
-    .form-item .form-description {
+    .form-item .form-description,
+    .form-item .form-dependenton {
         margin-left: 0;
     }
     table#form td.submit,
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 7b59b141b65..7cc16e8dce0 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -5244,10 +5244,12 @@ img.iconsmall {
 .adminsettingsflags label {
   margin-right: 7px;
 }
-.form-description {
+.form-description,
+.form-dependenton {
   clear: right;
 }
 .form-description pre,
+.form-dependenton pre,
 .formsettingheading pre {
   /* Code examples should be left aligned. */
   /*rtl:ignore*/
@@ -16715,6 +16717,7 @@ form {
 }
 .form-item .form-setting,
 .form-item .form-description,
+.form-item .form-dependenton,
 .mform .fitem .felement,
 #page-mod-forum-search .c1 {
   *display: inline-block;
@@ -16724,6 +16727,7 @@ form {
 }
 .form-item .form-setting:first-child,
 .form-item .form-description:first-child,
+.form-item .form-dependenton:first-child,
 .mform .fitem .felement:first-child,
 #page-mod-forum-search .c1:first-child {
   *padding-left: 200px;
@@ -16735,13 +16739,15 @@ form {
   margin-bottom: 0;
 }
 .form-item .form-description,
+.form-item .form-dependenton,
 .felement.fstatic {
   color: #595959;
   display: block;
   margin-bottom: 10px;
   padding-top: 5px;
 }
-.form-item .form-description {
+.form-item .form-description,
+.form-item .form-dependenton {
   padding-top: 0;
 }
 .fitem .fstaticlabel {
@@ -20779,6 +20785,7 @@ span[data-flexitour="container"][x-placement="right-start"] div[data-role="arrow
   }
   .form-item .form-setting,
   .form-item .form-description,
+  .form-item .form-dependenton,
   .mform .fitem .felement,
   #page-mod-forum-search .c1,
   .mform .fdescription.required,
@@ -20845,6 +20852,7 @@ span[data-flexitour="container"][x-placement="right-start"] div[data-role="arrow
   }
   .form-item .form-setting,
   .form-item .form-description,
+  .form-item .form-dependenton,
   .mform .fitem .felement,
   #page-mod-forum-search .c1,
   .mform .fdescription.required,
@@ -21056,7 +21064,8 @@ span[data-flexitour="container"][x-placement="right-start"] div[data-role="arrow
   .mform .fitem .felement,
   .path-backup .mform .fitem .felement,
   .mform .fdescription.required,
-  .form-item .form-description {
+  .form-item .form-description,
+  .form-item .form-dependenton {
     margin-left: 0;
   }
   table#form td.submit,
-- 
2.17.1