From 2bc3246f9300f4f9f4dd4ba52fe3b5ba4df00c95 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 2 Feb 2018 11:29:33 +0800
Subject: [PATCH 1/2] MDL-61341 theme_boost: Modify variables used for
 calculations

Variables must be of the same type for Math to take place. We cannot
mix REM and EM because they have different relative roots.
---
 theme/boost/scss/moodle/forms.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index a23abd8aeb4..7d1c68fea96 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -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] {

From 139dfc8b8a83f9f7e65910e48eee7aa50bff3255 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 2 Feb 2018 11:31:12 +0800
Subject: [PATCH 2/2] MDL-61341 theme_boost: Fix usertour zindex calculations

---
 theme/boost/scss/moodle/tool_usertours.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/boost/scss/moodle/tool_usertours.scss b/theme/boost/scss/moodle/tool_usertours.scss
index de780f8dccc..eebf19c8345 100644
--- a/theme/boost/scss/moodle/tool_usertours.scss
+++ b/theme/boost/scss/moodle/tool_usertours.scss
@@ -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"] {