From 05a2b8352e2ff76cc59f282bca91cc7eea9374fd Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 24 Sep 2024 19:56:22 -0400 Subject: [PATCH 1/6] Opt in to the new method for spaces menu --- .../spaces/public/nav_control/components/spaces_menu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss index f444b45192f8b..da1db764681d8 100644 --- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss +++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss @@ -4,7 +4,7 @@ .spcMenu__spacesList { @include euiYScrollWithShadows; - max-height: $euiSizeXL * 10; + & {max-height: $euiSizeXL * 10}; } .spcMenu__searchFieldWrapper { From 4a9bee65d3c0e7f52e9479698b51389acf31a810 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 24 Sep 2024 20:57:33 -0400 Subject: [PATCH 2/6] Opt in to the new sass method for the interactive setup logo --- src/plugins/interactive_setup/public/app.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/interactive_setup/public/app.scss b/src/plugins/interactive_setup/public/app.scss index 119a2377dd7d2..d1443f003a966 100644 --- a/src/plugins/interactive_setup/public/app.scss +++ b/src/plugins/interactive_setup/public/app.scss @@ -12,7 +12,7 @@ @include kibanaCircleLogo; @include euiBottomShadowMedium; - margin-bottom: $euiSizeXL; + &{margin-bottom: $euiSizeXL}; } .interactiveSetup__content { From 6f5d7a056782c3b955aeb99bcdf194dc4a142de4 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 24 Sep 2024 21:43:28 -0400 Subject: [PATCH 3/6] Fixing sass to opt into new method on space selector, login, access agreement --- src/plugins/interactive_setup/public/app.scss | 4 +++- .../access_agreement/access_agreement_page.scss | 6 ++++-- .../authentication_state_page.scss | 4 +++- .../login/components/login_form/login_form.scss | 6 ++++-- .../security/public/authentication/login/login_page.scss | 4 +++- .../spaces/public/nav_control/components/spaces_menu.scss | 4 +++- .../spaces/public/space_selector/space_selector.scss | 6 ++++-- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/plugins/interactive_setup/public/app.scss b/src/plugins/interactive_setup/public/app.scss index d1443f003a966..7c8f92ecd8407 100644 --- a/src/plugins/interactive_setup/public/app.scss +++ b/src/plugins/interactive_setup/public/app.scss @@ -12,7 +12,9 @@ @include kibanaCircleLogo; @include euiBottomShadowMedium; - &{margin-bottom: $euiSizeXL}; + & { + margin-bottom: $euiSizeXL; + } } .interactiveSetup__content { diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss index 08e7be248619f..2e3e80d79e3f8 100644 --- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss +++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss @@ -8,8 +8,10 @@ .secAccessAgreementPage__text { @include euiYScrollWithShadows; - max-height: 400px; - padding: $euiSize $euiSizeL 0; + & { + max-height: 400px; + padding: $euiSize $euiSizeL 0; + } } .secAccessAgreementPage__footer { diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss index 3b162dc962400..cd660846b597c 100644 --- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss +++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss @@ -12,7 +12,9 @@ @include kibanaCircleLogo; @include euiBottomShadowMedium; - margin-bottom: $euiSizeXL; + & { + margin-bottom: $euiSizeXL; + } } .secAuthenticationStatePage__content { diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss index 344cde9c7825c..875a87ac854bf 100644 --- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss +++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss @@ -25,8 +25,10 @@ &:focus { @include euiFocusRing; - border-color: transparent; - border-radius: $euiBorderRadius; + & { + border-color: transparent; + border-radius: $euiBorderRadius; + } .secLoginCard__title { text-decoration: underline; diff --git a/x-pack/plugins/security/public/authentication/login/login_page.scss b/x-pack/plugins/security/public/authentication/login/login_page.scss index cdfad55ee064a..b5de761d41dc1 100644 --- a/x-pack/plugins/security/public/authentication/login/login_page.scss +++ b/x-pack/plugins/security/public/authentication/login/login_page.scss @@ -12,7 +12,9 @@ @include kibanaCircleLogo; @include euiBottomShadowMedium; - margin-bottom: $euiSizeXL; + & { + margin-bottom: $euiSizeXL; + } } .loginWelcome__content { diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss index da1db764681d8..18f38528a3f83 100644 --- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss +++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss @@ -4,7 +4,9 @@ .spcMenu__spacesList { @include euiYScrollWithShadows; - & {max-height: $euiSizeXL * 10}; + & { + max-height: $euiSizeXL * 10; + } } .spcMenu__searchFieldWrapper { diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.scss b/x-pack/plugins/spaces/public/space_selector/space_selector.scss index 4629e92a201f5..6fb96daf70e9b 100644 --- a/x-pack/plugins/spaces/public/space_selector/space_selector.scss +++ b/x-pack/plugins/spaces/public/space_selector/space_selector.scss @@ -4,8 +4,10 @@ .spcSelectorBackground { @include kibanaFullScreenGraphics; - z-index: -1; - pointer-events: none; + & { + z-index: -1; + pointer-events: none; + } } // Fix forced focus outline on text that isn't a link to just be an underline From 4949e86b6e2b74f17e9b946735cad447aad4daab Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 25 Sep 2024 08:38:00 -0400 Subject: [PATCH 4/6] Moving declarations above mixins --- src/plugins/interactive_setup/public/app.scss | 6 ++---- .../access_agreement/access_agreement_page.scss | 7 +++---- .../authentication_state_page.scss | 6 ++---- .../login/components/login_form/login_form.scss | 8 +++----- .../security/public/authentication/login/login_page.scss | 6 ++---- .../spaces/public/nav_control/components/spaces_menu.scss | 5 ++--- .../spaces/public/space_selector/space_selector.scss | 7 +++---- 7 files changed, 17 insertions(+), 28 deletions(-) diff --git a/src/plugins/interactive_setup/public/app.scss b/src/plugins/interactive_setup/public/app.scss index 7c8f92ecd8407..837a856610a23 100644 --- a/src/plugins/interactive_setup/public/app.scss +++ b/src/plugins/interactive_setup/public/app.scss @@ -9,12 +9,10 @@ } .interactiveSetup__logo { + margin-bottom: $euiSizeXL; + @include kibanaCircleLogo; @include euiBottomShadowMedium; - - & { - margin-bottom: $euiSizeXL; - } } .interactiveSetup__content { diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss index 2e3e80d79e3f8..7a9557fb7d8d4 100644 --- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss +++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss @@ -7,11 +7,10 @@ } .secAccessAgreementPage__text { + max-height: 400px; + padding: $euiSize $euiSizeL 0; + @include euiYScrollWithShadows; - & { - max-height: 400px; - padding: $euiSize $euiSizeL 0; - } } .secAccessAgreementPage__footer { diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss index cd660846b597c..401e821aa3e76 100644 --- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss +++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss @@ -9,12 +9,10 @@ } .secAuthenticationStatePage__logo { + margin-bottom: $euiSizeXL; + @include kibanaCircleLogo; @include euiBottomShadowMedium; - - & { - margin-bottom: $euiSizeXL; - } } .secAuthenticationStatePage__content { diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss index 875a87ac854bf..a8607c4048f42 100644 --- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss +++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss @@ -23,12 +23,10 @@ } &:focus { - @include euiFocusRing; + border-color: transparent; + border-radius: $euiBorderRadius; - & { - border-color: transparent; - border-radius: $euiBorderRadius; - } + @include euiFocusRing; .secLoginCard__title { text-decoration: underline; diff --git a/x-pack/plugins/security/public/authentication/login/login_page.scss b/x-pack/plugins/security/public/authentication/login/login_page.scss index b5de761d41dc1..8930de1425d85 100644 --- a/x-pack/plugins/security/public/authentication/login/login_page.scss +++ b/x-pack/plugins/security/public/authentication/login/login_page.scss @@ -9,12 +9,10 @@ } .loginWelcome__logo { + margin-bottom: $euiSizeXL; + @include kibanaCircleLogo; @include euiBottomShadowMedium; - - & { - margin-bottom: $euiSizeXL; - } } .loginWelcome__content { diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss index 18f38528a3f83..8e14b2876f429 100644 --- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss +++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss @@ -3,10 +3,9 @@ } .spcMenu__spacesList { + max-height: $euiSizeXL * 10; + @include euiYScrollWithShadows; - & { - max-height: $euiSizeXL * 10; - } } .spcMenu__searchFieldWrapper { diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.scss b/x-pack/plugins/spaces/public/space_selector/space_selector.scss index 6fb96daf70e9b..6aabb97ace4d0 100644 --- a/x-pack/plugins/spaces/public/space_selector/space_selector.scss +++ b/x-pack/plugins/spaces/public/space_selector/space_selector.scss @@ -3,11 +3,10 @@ } .spcSelectorBackground { + z-index: -1; + pointer-events: none; + @include kibanaFullScreenGraphics; - & { - z-index: -1; - pointer-events: none; - } } // Fix forced focus outline on text that isn't a link to just be an underline From 52ba64bbae516420b3aa21b9809a570dbbac0f42 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 25 Sep 2024 15:17:53 -0400 Subject: [PATCH 5/6] Splitting into 2 classes --- .../spaces/public/space_selector/space_selector.scss | 6 ++++-- .../plugins/spaces/public/space_selector/space_selector.tsx | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.scss b/x-pack/plugins/spaces/public/space_selector/space_selector.scss index 6aabb97ace4d0..f589347e592ed 100644 --- a/x-pack/plugins/spaces/public/space_selector/space_selector.scss +++ b/x-pack/plugins/spaces/public/space_selector/space_selector.scss @@ -3,10 +3,12 @@ } .spcSelectorBackground { + @include kibanaFullScreenGraphics; +} + +.spcSelectorBackground__nonMixinAttributes { z-index: -1; pointer-events: none; - - @include kibanaFullScreenGraphics; } // Fix forced focus outline on text that isn't a link to just be an underline diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx index e90d1c4a10954..3d72392552e38 100644 --- a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx +++ b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx @@ -124,7 +124,10 @@ export class SpaceSelector extends Component { > {/* Portal the fixed background graphic so it doesn't affect page positioning or overlap on top of global banners */} -
+
From f89c1465ce091831b74b086fd3b4ea2ead81ee70 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 26 Sep 2024 17:04:52 -0400 Subject: [PATCH 6/6] Update snapshot --- .../space_selector/__snapshots__/space_selector.test.tsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap b/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap index 8dfe89ef172d4..4419707ab45f4 100644 --- a/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap +++ b/x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap @@ -8,7 +8,7 @@ exports[`it renders with custom logo 1`] = ` >
@@ -69,7 +69,7 @@ exports[`it renders without crashing 1`] = ` >