Import dependent components without importing base

This avoids importing the base layers again when components import other components as dependencies. We need to explicitly import `accordion/index` file, rather than just importing `accordion`, as index file support has only been in LibSass since 3.6.0 and Ruby Sass since 3.6.0[1], and we support 3.3.0 and 1.0.0 respectively. [1]: https://sass-lang.com/documentation/at-rules/import#index-files
alphagov · May 12, 2020 · 3e471f8 · 3e471f8
1 parent 223ef1c
commit 3e471f8
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/src/govuk/components/character-count/_index.scss b/src/govuk/components/character-count/_index.scss
@@ -1,7 +1,7 @@
-@import "../error-message/error-message";
-@import "../hint/hint";
-@import "../label/label";
-@import "../textarea/textarea";
+@import "../error-message/index";
+@import "../hint/index";
+@import "../label/index";
+@import "../textarea/index";
 
 @include govuk-exports("govuk/component/character-count") {
   .govuk-character-count {

diff --git a/src/govuk/components/checkboxes/_index.scss b/src/govuk/components/checkboxes/_index.scss
@@ -1,7 +1,7 @@
-@import "../error-message/error-message";
-@import "../fieldset/fieldset";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../fieldset/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/checkboxes") {
 

diff --git a/src/govuk/components/date-input/_index.scss b/src/govuk/components/date-input/_index.scss
@@ -1,7 +1,7 @@
-@import "../error-message/error-message";
-@import "../input/input";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../input/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/date-input") {
   .govuk-date-input {

diff --git a/src/govuk/components/file-upload/_index.scss b/src/govuk/components/file-upload/_index.scss
@@ -1,6 +1,6 @@
-@import "../error-message/error-message";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/file-upload") {
   $component-padding: govuk-spacing(1);

diff --git a/src/govuk/components/input/_index.scss b/src/govuk/components/input/_index.scss
@@ -1,6 +1,6 @@
-@import "../error-message/error-message";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/input") {
   .govuk-input {

diff --git a/src/govuk/components/phase-banner/_index.scss b/src/govuk/components/phase-banner/_index.scss
@@ -1,4 +1,4 @@
-@import "../tag/tag";
+@import "../tag/index";
 
 @include govuk-exports("govuk/component/phase-banner") {
   .govuk-phase-banner {

diff --git a/src/govuk/components/radios/_index.scss b/src/govuk/components/radios/_index.scss
@@ -1,7 +1,7 @@
-@import "../error-message/error-message";
-@import "../fieldset/fieldset";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../fieldset/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/radios") {
 

diff --git a/src/govuk/components/select/_index.scss b/src/govuk/components/select/_index.scss
@@ -1,6 +1,6 @@
-@import "../error-message/error-message";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/select") {
   .govuk-select {

diff --git a/src/govuk/components/textarea/_index.scss b/src/govuk/components/textarea/_index.scss
@@ -1,6 +1,6 @@
-@import "../error-message/error-message";
-@import "../hint/hint";
-@import "../label/label";
+@import "../error-message/index";
+@import "../hint/index";
+@import "../label/index";
 
 @include govuk-exports("govuk/component/textarea") {
   .govuk-textarea {