Merge branch 'MDL-70491-400_take2' of https://github.com/lucaboesch/m…

…oodle into MOODLE_400_STABLE
moodle · Nov 17, 2022 · 40d67d2 · 40d67d2
2 parents 2700e9b + 1085ea4
commit 40d67d2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/lib/templates/form_autocomplete_selection_items.mustache b/lib/templates/form_autocomplete_selection_items.mustache
@@ -38,10 +38,10 @@
     ], "noSelectionString": "No selection" }
 }}
 {{#items}}
-    <span role="option" data-value="{{value}}" aria-selected="true" class="badge badge-info mb-3 mr-1" style="font-size: 100%">
+    <span role="option" data-value="{{value}}" aria-selected="true" class="badge badge-secondary m-1" style="font-size: 100%">
         <span aria-hidden="true">× </span>{{{label}}}
     </span>
 {{/items}}
 {{^items}}
-    <span class="mb-3 mr-1">{{noSelectionString}}</span>
+    <span class="m-1 h-5">{{noSelectionString}}</span>
 {{/items}}
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
@@ -2131,6 +2131,9 @@ dd:after {
                 width: 330px;
                 vertical-align: text-bottom;
                 margin-bottom: 0;
+                &[role="combobox"] {
+                    width: auto;
+                }
             }
         }
 

diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
@@ -264,7 +264,7 @@ fieldset.coursesearchbox label {
     vertical-align: bottom;
 }
 .form-autocomplete-selection {
-    margin: $input-padding-y-sm;
+    margin: $input-padding-y-sm 0;
     // Padding top and bottom, plus mb-1 and the 100% lineheight.
     min-height: 2 * $input-padding-y-sm + 2 * $font-size-base;
 }
@@ -327,8 +327,7 @@ fieldset.coursesearchbox label {
 }
 
 .form-autocomplete-selection [data-active-selection=true] {
-    padding: 0.5em;
-    font-size: large;
+    box-shadow: $input-btn-focus-box-shadow;
 }
 
 select.form-control {

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -11590,7 +11590,9 @@ dd:after {
     .inplaceeditable.inplaceeditingon input {
       width: 330px;
       vertical-align: text-bottom;
-      margin-bottom: 0; } }
+      margin-bottom: 0; }
+      .inplaceeditable.inplaceeditingon input[role="combobox"] {
+        width: auto; } }
   .inplaceeditable.inplaceeditingon select {
     margin-bottom: 0; }
 
@@ -17559,7 +17561,7 @@ fieldset.coursesearchbox label {
   vertical-align: bottom; }
 
 .form-autocomplete-selection {
-  margin: 0.25rem;
+  margin: 0.25rem 0;
   min-height: 2.375rem; }
 
 .form-autocomplete-selection [role=option] {
@@ -17610,8 +17612,7 @@ fieldset.coursesearchbox label {
   vertical-align: middle; }
 
 .form-autocomplete-selection [data-active-selection=true] {
-  padding: 0.5em;
-  font-size: large; }
+  box-shadow: 0 0 0 0.2rem rgba(15, 108, 191, 0.75); }
 
 select.form-control[size], select.form-control[multiple] {
   padding-right: 0; }

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -11590,7 +11590,9 @@ dd:after {
     .inplaceeditable.inplaceeditingon input {
       width: 330px;
       vertical-align: text-bottom;
-      margin-bottom: 0; } }
+      margin-bottom: 0; }
+      .inplaceeditable.inplaceeditingon input[role="combobox"] {
+        width: auto; } }
   .inplaceeditable.inplaceeditingon select {
     margin-bottom: 0; }
 
@@ -17559,7 +17561,7 @@ fieldset.coursesearchbox label {
   vertical-align: bottom; }
 
 .form-autocomplete-selection {
-  margin: 0.25rem;
+  margin: 0.25rem 0;
   min-height: 2.375rem; }
 
 .form-autocomplete-selection [role=option] {
@@ -17610,8 +17612,7 @@ fieldset.coursesearchbox label {
   vertical-align: middle; }
 
 .form-autocomplete-selection [data-active-selection=true] {
-  padding: 0.5em;
-  font-size: large; }
+  box-shadow: 0 0 0 0.2rem rgba(15, 108, 191, 0.75); }
 
 select.form-control[size], select.form-control[multiple] {
   padding-right: 0; }