Merge branch 'develop' into feature/form-elements-enhancement

civictheme · Oct 22, 2024 · 716c86d · 716c86d
2 parents b3a923e + e4d7c0a
commit 716c86d
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 41 deletions.
diff --git a/web/themes/contrib/civictheme/assets/sass/page/_page.scss b/web/themes/contrib/civictheme/assets/sass/page/_page.scss
@@ -0,0 +1,12 @@
+//
+// Page level configuration.
+//
+
+html {
+  // stylelint-disable property-no-vendor-prefix
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+}
diff --git a/web/themes/contrib/civictheme/assets/sass/theme.scss b/web/themes/contrib/civictheme/assets/sass/theme.scss
@@ -5,4 +5,5 @@
 // components.
 //
 // These overrides will not be visible in the Storybook.
+@import 'page/page';
 @import 'header/header';
diff --git a/web/themes/contrib/civictheme/civictheme_starter_kit/assets/sass/page/_page.scss b/web/themes/contrib/civictheme/civictheme_starter_kit/assets/sass/page/_page.scss
@@ -0,0 +1,12 @@
+//
+// Page level configuration.
+//
+
+html {
+  // stylelint-disable property-no-vendor-prefix
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+}
diff --git a/web/themes/contrib/civictheme/civictheme_starter_kit/assets/sass/theme.scss b/web/themes/contrib/civictheme/civictheme_starter_kit/assets/sass/theme.scss
@@ -6,4 +6,5 @@
 //
 // These overrides will not be visible in the Storybook.
 // @todo Refactor webpack config to use direct import from the CivicTheme theme.
+@import 'page/page';
 @import 'block/local-tasks';