Merge branch 'main' into enhancement/159/add-menu-button-in-new-heade…

…r-variant
ONSdigital · Jan 29, 2025 · 4d4c072 · 4d4c072
2 parents 70e9b03 + 9523d9e
commit 4d4c072
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @ONSdigital/design-team-devs
diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss
@@ -28,8 +28,9 @@ $button-shadow-size: 3px;
 
     &--search {
         .ons-icon {
-            @include mq(s, l) {
-                margin-right: 0.5rem;
+            margin: 0.125rem 0.5rem 0.125rem 0;
+            @include mq(xs, s) {
+                margin-right: 0;
             }
         }
     }

diff --git a/src/scss/base/_typography.scss b/src/scss/base/_typography.scss
@@ -1,7 +1,7 @@
 html {
     @include font-smoothing;
 
-    font-size: $base;
+    font-size: calc((100% / 16) * strip-unit($base));
 }
 
 body {

diff --git a/src/scss/helpers/_mq.scss b/src/scss/helpers/_mq.scss
@@ -57,7 +57,7 @@
 /// @return {Number} - Unitless number
 @function strip-unit($number) {
     @if meta.type-of($number) == 'number' and not math.is-unitless($number) {
-        @return $number / ($number * 0 + 1);
+        @return math.div($number, ($number * 0 + 1));
     }
 
     @return $number;