mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-70491-master_take2' of https://github.com/lucaboesch/moodle

Browse Source
This commit is contained in:
Sara Arjona 2022-11-17 17:25:48 +01:00
commit b47e0f8009
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/templates/form_autocomplete_selection_items.mustache
View File

@ -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}}

3
theme/boost/scss/moodle/core.scss
View File

@ -2130,6 +2130,9 @@ dd:after {
width: 330px;
vertical-align: text-bottom;
margin-bottom: 0;
&[role="combobox"] {
width: auto;
}
}
}

5
theme/boost/scss/moodle/forms.scss
View File

@ -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 {

9
theme/boost/style/moodle.css
View File

@ -11589,7 +11589,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; }
@ -17598,7 +17600,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] {
@ -17649,8 +17651,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; }

9
theme/classic/style/moodle.css
View File

@ -11589,7 +11589,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; }
@ -17598,7 +17600,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] {
@ -17649,8 +17651,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; }