Merge branch 'MDL-61341-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2018-02-05 20:06:32 +01:00
commit b04811687c
2 changed files with 5 additions and 5 deletions

View File

@ -252,13 +252,13 @@ fieldset.coursesearchbox label {
margin: 0;
padding: 0;
border: 0;
margin-top: $font-size-base * $line-height-base + $tag-padding-y;
margin-top: $font-size-base * $line-height-base + $input-padding-y-sm;
vertical-align: bottom;
}
.form-autocomplete-selection {
margin: $tag-padding-y;
margin: $input-padding-y-sm;
// Padding top and bottom, plus m-b-1 and the 100% lineheight.
min-height: 2 * $tag-padding-y + 2 * $font-size-base;
min-height: 2 * $input-padding-y-sm + 2 * $font-size-base;
}
.form-autocomplete-multiple [role=listitem] {

View File

@ -24,7 +24,7 @@ div[data-flexitour="step-background"] {
@include border-radius($border-radius-lg);
// The step container, and the target background should be at the same z-index.
z-index: #{$flexitour-base-zindex} + 1;
z-index: ($flexitour-base-zindex + 1);
}
span[data-flexitour="container"],
@ -32,7 +32,7 @@ div[data-flexitour="step-background-fader"],
[data-flexitour="step-backdrop"] > td,
[data-flexitour="step-backdrop"] {
// The step container, and the target background should be at the same z-index.
z-index: #{$flexitour-base-zindex} + 2;
z-index: ($flexitour-base-zindex + 2);
}
span[data-flexitour="container"] {