diff --git a/components/ft-concept-button/main.scss b/components/ft-concept-button/main.scss index ee085ee5b5..43336091b3 100644 --- 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 index 6c66c04b2d..d4dc0ed48a 100644 --- 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 index c7b8a9ee15..c6db22d003 100644 --- 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 index 9769c73307..6696541f45 100644 --- 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 index adaef74662..f97b8fc651 100644 --- 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 index 0408b34b8f..8518fb466a 100644 --- 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 index fecd36a17f..323562cec2 100644 --- 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 index 252723ade0..d0b77ccdf8 100644 --- 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 index 94992bb065..8224de73dc 100644 --- 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 index 9ccf940386..ddec7ee14e 100644 --- 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 index 379ce3f8fa..f5224905dd 100644 --- 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 index e1b4ca985c..2d101b0699 100644 --- 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 index eb837034f7..e29a46e0ba 100644 --- 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 index 17ca009313..0ae30fbf7f 100644 --- 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 index 0942a158a7..9e5f85aabe 100644 --- 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 index f60a9bdf13..e4f9618097 100644 --- 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(); diff --git a/components/o-multi-select/main.scss b/components/o-multi-select/main.scss index 03428a1d8b..34c334d54c 100644 --- a/components/o-multi-select/main.scss +++ b/components/o-multi-select/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-brand/main'; @import '@financial-times/o-spacing/main'; @@ -14,114 +14,114 @@ /// @example scss /// @include oMultiSelect() @mixin oMultiSelect() { - .o-multi-select__dropdown-menu { - display: none; - } - .o-multi-select__enhanced { - position: relative; - } - - .o-multi-select__visually-hidden { - @include oPrivateNormaliseVisuallyHidden; - } - - .o-multi-select__selected-options { - display: none; - list-style-type: none; - padding: $_o-multi-select-padding; - margin: 0; - position: absolute; - z-index: 1; - - li { - display: inline-block; - margin-bottom: 0; - - .o-multi-select__selected-options-button { - @include _oMultiSelectButton; - } - } - } - - .o-multi-select__combobox-wrapper { - @include oTypographySans(0); - position: relative; - background-color: oColorsByName('white'); - border: $_o-multi-select-border; - - .o-multi-select__combobox { - display: flex; - height: $_o-multi-select-height; - box-sizing: border-box; - padding: $_o-multi-select-padding; - background-image: url(https://www.ft.com/__origami/service/image/v2/images/raw/fticon-v1:arrow-down?source=origami-build-service&format=svg); - background-repeat: no-repeat; - background-size: $_o-multi-select-icon-size $_o-multi-select-icon-size; - cursor: pointer; - background-position: right 8px center; - align-items: center; - - &:focus { - @include oPrivateNormaliseFocusUnsetContent(); - } - - @supports selector(:focus-visible) { - &:focus-visible { - @include oPrivateNormaliseFocusContent(); - } - } - } - } - .o-multi-select__dropdown-menu { - @include oPrivateNormaliseBoxSizing(); - @include oTypographySans(0); - width: 100%; - background-color: oColorsByName('white'); - padding: $_o-multi-select-padding; - border: $_o-multi-select-border; - position: absolute; - left: 0; - max-height: 50vh; - overflow-y: auto; - - .o-multi-select-option { - color: oColorsByUsecase('body', 'text'); - cursor: pointer; - padding: 8px 4px; - position: relative; - - &:hover { - background-color: oColorsMix(black, white, 25); - color: initial; - } - - @media (max-width: 690px) { - padding: 12px 4px; - } - } - - .o-multi-select-option__selected { - color: initial; - background-color: oColorsMix(black, white, 15); - - span { - @include oIconsContent( - $icon-name: 'tick', - $color: oColorsByUsecase('body', 'text'), - $size: 32, - $include-base-styles: false - ); - position: absolute; - right: 0; - top: 50%; - transform: translateY(-50%); - vertical-align: middle; - } - } - - .o-multi-select-option__current { - @include oPrivateNormaliseFocusContent(); - z-index: 2; - } - } + .o-multi-select__dropdown-menu { + display: none; + } + .o-multi-select__enhanced { + position: relative; + } + + .o-multi-select__visually-hidden { + @include oPrivateNormaliseVisuallyHidden; + } + + .o-multi-select__selected-options { + display: none; + list-style-type: none; + padding: $_o-multi-select-padding; + margin: 0; + position: absolute; + z-index: 1; + + li { + display: inline-block; + margin-bottom: 0; + + .o-multi-select__selected-options-button { + @include _oMultiSelectButton; + } + } + } + + .o-multi-select__combobox-wrapper { + @include oTypographySans(0); + position: relative; + background-color: oColorsByName('white'); + border: $_o-multi-select-border; + + .o-multi-select__combobox { + display: flex; + height: $_o-multi-select-height; + box-sizing: border-box; + padding: $_o-multi-select-padding; + background-image: url(https://www.ft.com/__origami/service/image/v2/images/raw/fticon-v1:arrow-down?source=origami-build-service&format=svg); + background-repeat: no-repeat; + background-size: $_o-multi-select-icon-size $_o-multi-select-icon-size; + cursor: pointer; + background-position: right 8px center; + align-items: center; + + &:focus { + @include oPrivateNormaliseFocusUnsetContent(); + } + + @supports selector(:focus-visible) { + &:focus-visible { + @include oPrivateNormaliseFocusContent(); + } + } + } + } + .o-multi-select__dropdown-menu { + @include oPrivateNormaliseBoxSizing(); + @include oTypographySans(0); + width: 100%; + background-color: oColorsByName('white'); + padding: $_o-multi-select-padding; + border: $_o-multi-select-border; + position: absolute; + left: 0; + max-height: 50vh; + overflow-y: auto; + + .o-multi-select-option { + color: oColorsByUsecase('body', 'text'); + cursor: pointer; + padding: 8px 4px; + position: relative; + + &:hover { + background-color: oColorsMix(black, white, 25); + color: initial; + } + + @media (max-width: 690px) { + padding: 12px 4px; + } + } + + .o-multi-select-option__selected { + color: initial; + background-color: oColorsMix(black, white, 15); + + span { + @include oIconsContent( + $icon-name: 'tick', + $color: oColorsByUsecase('body', 'text'), + $size: 32, + $include-base-styles: false + ); + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + vertical-align: middle; + } + } + + .o-multi-select-option__current { + @include oPrivateNormaliseFocusContent(); + z-index: 2; + } + } } diff --git a/components/o-private-foundation/main.scss b/components/o-private-foundation/main.scss index f55460b25e..46bcc9fcc8 100644 --- a/components/o-private-foundation/main.scss +++ b/components/o-private-foundation/main.scss @@ -2,7 +2,7 @@ @import './src/scss/variables'; -@import './o-normalise/main'; +@import './src/scss/o-normalise/main'; @import './src/scss/o-buttons/main'; @font-face { diff --git a/components/o-private-foundation/o-normalise/main.scss b/components/o-private-foundation/o-normalise/main.scss deleted file mode 100644 index 548e52a9af..0000000000 --- a/components/o-private-foundation/o-normalise/main.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import './src/scss/variables'; -@import './src/scss/mixins'; diff --git a/components/o-private-foundation/package.json b/components/o-private-foundation/package.json index b5adef11ed..d61f1997b1 100644 --- a/components/o-private-foundation/package.json +++ b/components/o-private-foundation/package.json @@ -10,7 +10,6 @@ }, "license": "MIT", "type": "module", - "browser": "main.js", "scripts": { "build": "bash ../../scripts/component/build.bash", "test": "bash ../../scripts/component/test.bash", diff --git a/components/o-private-foundation/o-normalise/src/scss/_mixins.scss b/components/o-private-foundation/src/scss/o-normalise/_mixins.scss similarity index 99% rename from components/o-private-foundation/o-normalise/src/scss/_mixins.scss rename to components/o-private-foundation/src/scss/o-normalise/_mixins.scss index 31c6defd91..b5afb7d6e8 100644 --- a/components/o-private-foundation/o-normalise/src/scss/_mixins.scss +++ b/components/o-private-foundation/src/scss/o-normalise/_mixins.scss @@ -1,5 +1,5 @@ @import '@financial-times/o-colors/main'; -@import './variables'; +@import 'variables'; /// Visually hide an element while still /// allowing it to be read by a screenreader @mixin oPrivateNormaliseVisuallyHidden { diff --git a/components/o-private-foundation/o-normalise/src/scss/_variables.scss b/components/o-private-foundation/src/scss/o-normalise/_variables.scss similarity index 100% rename from components/o-private-foundation/o-normalise/src/scss/_variables.scss rename to components/o-private-foundation/src/scss/o-normalise/_variables.scss diff --git a/components/o-private-foundation/src/scss/o-normalise/main.scss b/components/o-private-foundation/src/scss/o-normalise/main.scss new file mode 100644 index 0000000000..25b4cad464 --- /dev/null +++ b/components/o-private-foundation/src/scss/o-normalise/main.scss @@ -0,0 +1,2 @@ +@import 'variables'; +@import 'mixins'; diff --git a/components/o-share/main.scss b/components/o-share/main.scss index 57d8797693..f6e914f62a 100644 --- a/components/o-share/main.scss +++ b/components/o-share/main.scss @@ -2,7 +2,7 @@ @import '@financial-times/o-brand/main'; @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 '@financial-times/o-spacing/main'; @import '@financial-times/o-typography/main'; diff --git a/components/o-social-follow/main.scss b/components/o-social-follow/main.scss index 8c269ae5bc..0fbc75deaf 100644 --- a/components/o-social-follow/main.scss +++ b/components/o-social-follow/main.scss @@ -1,9 +1,8 @@ -@import '@financial-times/o-private-foundation/o-normalise/main'; - @import '@financial-times/math'; @import '@financial-times/o-brand/main'; @import '@financial-times/o-colors/main'; @import '@financial-times/o-grid/main'; +@import '@financial-times/o-private-foundation/src/scss/o-normalise/main'; @import '@financial-times/o-spacing/main'; @import '@financial-times/o-typography/main'; diff --git a/components/o-stepped-progress/main.scss b/components/o-stepped-progress/main.scss index 32606acffa..3fdf6db83f 100644 --- a/components/o-stepped-progress/main.scss +++ b/components/o-stepped-progress/main.scss @@ -2,6 +2,7 @@ @import '@financial-times/o-spacing/main'; @import '@financial-times/o-colors/main'; @import '@financial-times/o-icons/main'; +@import '@financial-times/o-private-foundation/src/scss/o-normalise/main'; @import '@financial-times/o-typography/main'; @import 'src/scss/brand'; diff --git a/components/o-stepped-progress/src/scss/_mixins.scss b/components/o-stepped-progress/src/scss/_mixins.scss index 9da48de6e2..e05c90703b 100644 --- a/components/o-stepped-progress/src/scss/_mixins.scss +++ b/components/o-stepped-progress/src/scss/_mixins.scss @@ -1,4 +1,3 @@ -@import '@financial-times/o-private-foundation/o-normalise/main'; /// Outputs all available features and styles for stepped progress. /// /// @output The output includes the `.o-stepped-progress` class definition as well as class definitions for every available theme. diff --git a/components/o-subs-card/src/scss/_mixins.scss b/components/o-subs-card/src/scss/_mixins.scss index 6fd0540837..1f938d2570 100644 --- a/components/o-subs-card/src/scss/_mixins.scss +++ b/components/o-subs-card/src/scss/_mixins.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 oSubsCardBase { @include oTypographySans(0); diff --git a/components/o-teaser/main.scss b/components/o-teaser/main.scss index 8c84734919..ba77eeef96 100644 --- a/components/o-teaser/main.scss +++ b/components/o-teaser/main.scss @@ -2,7 +2,7 @@ @import "@financial-times/o-colors/main"; @import "@financial-times/o-grid/main"; @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 "@financial-times/o-typography/main"; @import "@financial-times/o-labels/main"; diff --git a/components/o-teaser/src/scss/_mixins.scss b/components/o-teaser/src/scss/_mixins.scss index 7a887a661d..7691b16827 100644 --- a/components/o-teaser/src/scss/_mixins.scss +++ b/components/o-teaser/src/scss/_mixins.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'; /// Includes the correct mixin for elements /// based on the group name passed /// diff --git a/components/o-tooltip/main.scss b/components/o-tooltip/main.scss index 72b68d922f..0739d047cb 100755 --- a/components/o-tooltip/main.scss +++ b/components/o-tooltip/main.scss @@ -1,5 +1,5 @@ @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 "@financial-times/o-overlay/main"; @import "@financial-times/o-visual-effects/main"; @import "@financial-times/o-typography/main"; diff --git a/components/o-video/main.scss b/components/o-video/main.scss index a977b0bced..f0191b08d9 100644 --- a/components/o-video/main.scss +++ b/components/o-video/main.scss @@ -3,7 +3,7 @@ $o-video-is-silent: true !default; @import "@financial-times/o-colors/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/ads"; diff --git a/presets/stylelint-config-origami-component/config.js b/presets/stylelint-config-origami-component/config.js index 34cfc1e44c..1f2b794e32 100644 --- a/presets/stylelint-config-origami-component/config.js +++ b/presets/stylelint-config-origami-component/config.js @@ -20,7 +20,7 @@ module.exports = { { type: "at-rule", name: "include", - parameter: "^((?!oGridRespondTo|oNormaliseFocusApply).)*$", + parameter: "^((?!oGridRespondTo|oNormaliseFocusApply|oPrivateNormaliseFocusApply).)*$", }, "declarations", ],