Skip to content

Move nested declarations above rule #193931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kc13greiner merged 8 commits into from
Oct 1, 2024
Merged

Move nested declarations above rule #193931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05a2b83
Opt in to the new method for spaces menu
kc13greiner Sep 24, 2024
4a9bee6
Opt in to the new sass method for the interactive setup logo
kc13greiner Sep 25, 2024
6f5d7a0
Fixing sass to opt into new method on space selector, login, access a…
kc13greiner Sep 25, 2024
4949e86
Moving declarations above mixins
kc13greiner Sep 25, 2024
52ba64b
Splitting into 2 classes
kc13greiner Sep 25, 2024
93dc164
Merge branch 'main' into feature/fix_sass_deprecations_security
kc13greiner Sep 26, 2024
f89c146
Update snapshot
kc13greiner Sep 26, 2024
b996aeb
Merge branch 'main' into feature/fix_sass_deprecations_security
kc13greiner Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/interactive_setup/public/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
}

.interactiveSetup__logo {
margin-bottom: $euiSizeXL;

@include kibanaCircleLogo;
@include euiBottomShadowMedium;

margin-bottom: $euiSizeXL;
}

.interactiveSetup__content {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
}

.secAccessAgreementPage__text {
@include euiYScrollWithShadows;
max-height: 400px;
padding: $euiSize $euiSizeL 0;

@include euiYScrollWithShadows;
}

.secAccessAgreementPage__footer {
Expand Down
4 changes: 2 additions & 2 deletions ...public/authentication/components/authentication_state_page/authentication_state_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
}

.secAuthenticationStatePage__logo {
margin-bottom: $euiSizeXL;

@include kibanaCircleLogo;
@include euiBottomShadowMedium;

margin-bottom: $euiSizeXL;
}

.secAuthenticationStatePage__content {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
}

&:focus {
@include euiFocusRing;

border-color: transparent;
border-radius: $euiBorderRadius;

@include euiFocusRing;

.secLoginCard__title {
text-decoration: underline;
}
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security/public/authentication/login/login_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
}

.loginWelcome__logo {
margin-bottom: $euiSizeXL;

@include kibanaCircleLogo;
@include euiBottomShadowMedium;

margin-bottom: $euiSizeXL;
}

.loginWelcome__content {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/spaces/public/nav_control/components/spaces_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
}

.spcMenu__spacesList {
@include euiYScrollWithShadows;
max-height: $euiSizeXL * 10;

@include euiYScrollWithShadows;
}

.spcMenu__searchFieldWrapper {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions x-pack/plugins/spaces/public/space_selector/space_selector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

.spcSelectorBackground {
@include kibanaFullScreenGraphics;
}

.spcSelectorBackground__nonMixinAttributes {
Copy link
Copy Markdown
Contributor Author

@kc13greiner kc13greiner Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Self Review: The mixin was overwriting the z index which caused only the background graphic to show up.

I should also not that the background graphic does not show up on this branch or main, so maybe we could have some design/UX help here

Copy link
Copy Markdown
Contributor Author

@kc13greiner kc13greiner Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#194193

z-index: -1;
pointer-events: none;
}
Expand Down
5 changes: 4 additions & 1 deletion x-pack/plugins/spaces/public/space_selector/space_selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ export class SpaceSelector extends Component<Props, State> {
>
{/* Portal the fixed background graphic so it doesn't affect page positioning or overlap on top of global banners */}
<EuiPortal>
<div className="spcSelectorBackground" role="presentation" />
<div
className="spcSelectorBackground spcSelectorBackground__nonMixinAttributes"
role="presentation"
/>
</EuiPortal>

<KibanaPageTemplate.Section color="transparent" paddingSize="xl">
Expand Down