chore: align o-private-foundation/o-normalise directory structure (#1874

) * chore: align file structure with confirmed convention * chore: fix lint errors * chore: add private foundation includes to sass lint config * chore: format o-multi-select/main.scss * fix: format files * fix: remove engine property from package.json * chore: remove private-foundations * chore: update normalise path * chore: fix lint rules * chore: fix lint rules
Financial-Times · Nov 27, 2024 · 3a2b910 · 3a2b910
1 parent 09ae7fd
commit 3a2b910
Show file tree

Hide file tree

Showing 33 changed files with 150 additions and 175 deletions.
diff --git a/components/ft-concept-button/main.scss b/components/ft-concept-button/main.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 @import '@financial-times/o-typography/main';
 @import '@financial-times/o-fonts/main';
 /// @access private

diff --git a/components/o-autocomplete/main.scss b/components/o-autocomplete/main.scss
@@ -6,7 +6,7 @@
 @import '@financial-times/o-grid/main';
 @import '@financial-times/o-icons/main';
 @import '@financial-times/o-loading/main';
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 @import '@financial-times/o-spacing/main';
 @import '@financial-times/o-typography/main';
 @import '@financial-times/o-visual-effects/main';

diff --git a/components/o-banner/src/scss/themes/_theme.scss b/components/o-banner/src/scss/themes/_theme.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 @mixin _oBannerTheme($theme, $include-layout-styles: true) {
 
 	// Get and default the colour-based theme properties. Link, button, and rule

diff --git a/components/o-expander/main.scss b/components/o-expander/main.scss
@@ -1,5 +1,5 @@
 @import "@financial-times/o-icons/main";
-@import "@financial-times/o-private-foundation/o-normalise/main";
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 @import 'src/scss/variables';
 
 /// @outputs All o-expander CSS, including the expander content area and toggle.

diff --git a/components/o-footer/main.scss b/components/o-footer/main.scss
@@ -2,7 +2,7 @@
 @import "@financial-times/o-spacing/main";
 @import "@financial-times/o-colors/main";
 @import "@financial-times/o-typography/main";
-@import "@financial-times/o-private-foundation/o-normalise/main";
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 @import "@financial-times/o-icons/main";
 @import "@financial-times/o-grid/main";
 

diff --git a/components/o-forms/main.scss b/components/o-forms/main.scss
@@ -5,7 +5,7 @@
 @import '@financial-times/o-grid/main';
 @import '@financial-times/o-icons/main';
 @import '@financial-times/o-loading/main';
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 @import '@financial-times/o-typography/main';
 
 @import 'src/scss/main';

diff --git a/components/o-forms/src/scss/_radio-box.scss b/components/o-forms/src/scss/_radio-box.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 
 // sass-lint:disable no-qualifying-elements
 /// @access private

diff --git a/components/o-forms/src/scss/_toggle.scss b/components/o-forms/src/scss/_toggle.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 // sass-lint:disable selector-no-qualifying-type
 /// @access private
 /// @param {Boolean} $disabled Whether to output disabled state styling

diff --git a/components/o-forms/src/scss/modifiers/_inverse.scss b/components/o-forms/src/scss/modifiers/_inverse.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 /// @access private
 /// @param {Boolean} $error-summary Whether to output inverse error summary styling
 /// @param {Boolean} $radio Whether to output inverse radio input styling
@@ -36,12 +36,10 @@
 			}
 		}
 
-		input[type='checkbox'] {
-			// stylelint-disable-line selector-no-qualifying-type
+		input[type='checkbox'] { // stylelint-disable-line selector-no-qualifying-type
 			&:focus {
 				@include oPrivateNormaliseFocusUnsetContent();
-				& + .o-forms-input__label:before {
-					// stylelint-disable-line selector-no-qualifying-type
+				& + .o-forms-input__label:before { // stylelint-disable-line selector-no-qualifying-type
 					@include oPrivateNormaliseFocusContentInverse();
 				}
 			}
@@ -52,29 +50,24 @@
 			// `:focus` fallback, however some of our supported browsers
 			// do not understand `@supports: selector()`.
 			@supports selector(:focus-visible) {
-				&:focus + .o-forms-input__label:before {
-					// stylelint-disable-line selector-no-qualifying-type
+				&:focus + .o-forms-input__label:before { // stylelint-disable-line selector-no-qualifying-type
 					@include oPrivateNormaliseFocusUnsetContent();
 				}
 
 				&:focus-visible {
-					& + .o-forms-input__label:before {
-						// stylelint-disable-line selector-no-qualifying-type
+					& + .o-forms-input__label:before { // stylelint-disable-line selector-no-qualifying-type
 						@include oPrivateNormaliseFocusContentInverse();
 					}
 				}
 			}
 		}
 
-		input[type='checkbox']:checked {
-			// stylelint-disable-line selector-no-qualifying-type
-			+ .o-forms-input__label:before {
-				// stylelint-disable-line selector-no-qualifying-type
+		input[type='checkbox']:checked { // stylelint-disable-line selector-no-qualifying-type
+			+ .o-forms-input__label:before { // stylelint-disable-line selector-no-qualifying-type
 				background-color: _oFormsGet('toggle-inverse-selected');
 			}
 
-			+ .o-forms-input__label:after {
-				// stylelint-disable-line selector-no-qualifying-type
+			+ .o-forms-input__label:after { // stylelint-disable-line selector-no-qualifying-type
 				@include oIconsContent(
 					'tick',
 					$size: null,
@@ -114,12 +107,10 @@
 				background-color: oColorsByName('white');
 			}
 
-			.o-forms-input--radio-box input[type='radio'] {
-				// stylelint-disable-line selector-no-qualifying-type
+			.o-forms-input--radio-box input[type='radio'] { // stylelint-disable-line selector-no-qualifying-type
 				&:focus {
 					@include oPrivateNormaliseFocusUnsetContent();
-					& + .o-forms-input__label {
-						// stylelint-disable-line selector-no-qualifying-type
+					& + .o-forms-input__label { // stylelint-disable-line selector-no-qualifying-type
 						@include oPrivateNormaliseFocusContentInverse();
 					}
 				}
@@ -130,14 +121,12 @@
 				// `:focus` fallback, however some of our supported browsers
 				// do not understand `@supports: selector()`.
 				@supports selector(:focus-visible) {
-					&:focus + .o-forms-input__label {
-						// stylelint-disable-line selector-no-qualifying-type
+					&:focus + .o-forms-input__label { // stylelint-disable-line selector-no-qualifying-type
 						@include oPrivateNormaliseFocusUnsetContent();
 					}
 
 					&:focus-visible {
-						& + .o-forms-input__label {
-							// stylelint-disable-line selector-no-qualifying-type
+						& + .o-forms-input__label { // stylelint-disable-line selector-no-qualifying-type
 							@include oPrivateNormaliseFocusContentInverse();
 						}
 					}

diff --git a/components/o-forms/src/scss/modifiers/_state.scss b/components/o-forms/src/scss/modifiers/_state.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 
 /// @access private
 /// @output styles for state animation for the box-styled radio inputs

diff --git a/components/o-ft-affiliate-ribbon/main.scss b/components/o-ft-affiliate-ribbon/main.scss
@@ -1,6 +1,6 @@
 @import "@financial-times/o-colors/main";
 @import "@financial-times/o-grid/main";
-@import "@financial-times/o-private-foundation/o-normalise/main";
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 
 @import "src/scss/variables";
 @import "src/scss/mixins";

diff --git a/components/o-header-services/src/scss/_base.scss b/components/o-header-services/src/scss/_base.scss
@@ -1,4 +1,4 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
+@import '@financial-times/o-private-foundation/src/scss/o-normalise/main';
 /// @access private
 /// @param {Boolean} $bleed [whether or not to make the header a bleed header. Defaults to false.]
 /// @outputs base styles for full header

diff --git a/components/o-header/src/scss/_base.scss b/components/o-header/src/scss/_base.scss
@@ -1,5 +1,3 @@
-
-
 @mixin _oHeaderBase() {
 	.o-header {
 		position: relative;

diff --git a/components/o-header/src/scss/features/_drawer.scss b/components/o-header/src/scss/features/_drawer.scss
@@ -18,11 +18,7 @@
 			border-right: 1px solid _oHeaderGet('drawer-border');
 			// use a 2D transform because 3D are unsupported by IE9
 			transform: translateX(-100%);
-			transform: translate3d(
-				-100%,
-				0,
-				0
-			); // stylelint-disable-line declaration-block-no-duplicate-properties
+			transform: translate3d(-100%, 0, 0); // stylelint-disable-line declaration-block-no-duplicate-properties
 
 			// this is literally the specification example for will-change
 			will-change: transform;
@@ -38,11 +34,7 @@
 			&.o-header__drawer--open {
 				// use a 2D transform because 3D are unsupported by IE9
 				transform: translateX(0);
-				transform: translate3d(
-					0,
-					0,
-					0
-				); // stylelint-disable-line declaration-block-no-duplicate-properties
+				transform: translate3d(0, 0, 0); // stylelint-disable-line declaration-block-no-duplicate-properties
 			}
 		}
 	}

diff --git a/components/o-header/src/scss/features/_top.scss b/components/o-header/src/scss/features/_top.scss
@@ -1,5 +1,3 @@
-@import '@financial-times/o-private-foundation/o-normalise/main';
-
 @mixin _oHeaderTop() {
 	.o-header__top-wrapper {
 		display: grid;

diff --git a/components/o-multi-select/demos/src/demo.scss b/components/o-multi-select/demos/src/demo.scss
@@ -6,7 +6,7 @@
 @include oForms();
 
 body {
-  background: oColorsByUsecase(page, background);
+	background: oColorsByUsecase(page, background);
 }
 
 @include oMultiSelect();